leave over tree select code

ideal-world · Aug 2, 2024 · 2c76a7b · 2c76a7b
1 parent a093aae
commit 2c76a7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Skeleton.vue b/src/Skeleton.vue
@@ -220,7 +220,7 @@ function showLayoutTableSetting(e: MouseEvent) {
       <div v-show="currentLayoutId === layout.id" :id="`iw-tt-layout-${layout.id}`" class="iw-tt-layout">
         <div
           v-if="!tableConf.mini && (layout.sort || layout.filter)"
-          class="iw-tt-toolbar flex items-center h-8 p-0.5"
+          class="iw-tt-toolbar flex items-center h-8 p-0.5 my-2"
         >
           <RowSortSettingComp v-if="layout.sort" :layout-id="layout.id" :sort="layout.sort" :columns-conf="getCurrentLayoutColumnConf()" />
           <div class="iw-divider iw-divider-horizontal m-0.5" />

diff --git a/src/props/kernelProps.ts b/src/props/kernelProps.ts
@@ -5,7 +5,7 @@
 import { getRandomString } from '../utils/basic'
 import type { ChangeAllOptional, ChangeOptionalExcept } from '../utils/tsHelper'
 import type { DictItemProps } from './basicProps'
-import { DataKind, LayoutKind, SizeKind, SubDataShowKind, getDefaultIconByDataKind, getDefaultIconByLayoutKind } from './enumProps'
+import { DataKind, DictKind, LayoutKind, SizeKind, SubDataShowKind, getDefaultIconByDataKind, getDefaultIconByLayoutKind } from './enumProps'
 
 import type { TableEventProps } from './eventProps'
 import type { ActionColumnProps, AggDataProps, ContextMenuProps, DataSliceProps, EditDataProps, FilterDataProps, GanttLayoutProps, GroupDataProps, QuickSearchProps, SimpleAggDataProps, SimpleContextMenuProps, SimpleDataSliceProps, SimpleEditDataProps, SimpleFilterDataProps, SimpleGanttLayoutProps, SimpleGroupDataProps, SimpleSortDataProps, SortDataProps } from './functionProps'
@@ -709,6 +709,16 @@ export interface TableColumnProps extends CommonColumnProps {
    * When there are fixed dictionary items, the dictionary items will not be obtained from the backend.
    */
   fixedDictItems?: DictItemProps[]
+  /**
+   * 字典类型
+   *
+   * dictionary type
+   *
+   * 存在树形结构等数据显示
+   *
+   * Data such as a tree structure is displayed
+   */
+  dictKind?: DictKind
   /**
    * 日期时间格式
    *
@@ -738,6 +748,7 @@ function generateTableColumnProps(simple: SimpleTableColumnProps): TableColumnPr
     useDict: simple.useDict ?? false,
     multiValue: simple.multiValue ?? false,
     fixedDictItems: simple.fixedDictItems,
+    dictKind: simple.useDict ? simple.dictKind || DictKind.SELECT : undefined,
     ...generateCommonColumnProps(simple),
   }
 }