From 4fd5fcfd2f7508b8e3eb8d336236844e721de750 Mon Sep 17 00:00:00 2001
From: Oliver <1069035666@qq.com>
Date: Thu, 15 Dec 2022 02:00:33 +0000
Subject: [PATCH 1/2] =?UTF-8?q?DictType=20=20dataIndex=20=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97=E8=B7=AF=E5=BE=84=E6=97=B6=E5=80=99=20=20=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Oliver <1069035666@qq.com>
---
 src/components/Table/src/BasicTable.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index e7e5999..5f55c1f 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -46,7 +46,7 @@
             <DictLabel
               v-else-if="data.column.slot === 'dictLabelColumn'"
               :dictType="data.column.dictType"
-              :dictValue="data.record[data.column.dataIndex]"
+              :dictValue="getColumnValue(data)"
               :defaultValue="data.column.defaultValue"
             />
             <slot v-else-if="data.column.slot" :name="data.column.slot" v-bind="data || {}"></slot>
@@ -93,7 +93,7 @@
 
   import { omit } from 'lodash-es';
   import { basicProps } from './props';
-  import { isFunction } from '/@/utils/is';
+  import { isFunction, isArray } from '/@/utils/is';
   import { warn } from '/@/utils/log';
 
   export default defineComponent({
@@ -340,6 +340,16 @@
         innerPropsRef.value = { ...unref(innerPropsRef), ...props };
       }
 
+      function getColumnValue(data: any) {
+        const dataIndex = data.column.dataIndex;
+        if (isArray(dataIndex)) {
+          return dataIndex.reduce((pre, cur) => {
+            return pre[cur];
+          }, data.record);
+        }
+        return data.record[dataIndex];
+      }
+
       const tableAction: TableActionType = {
         reload,
         getSelectRows,
-- 
Gitee


From 09180d66db9a193a2c4e2b893b0d6f1f63f962e1 Mon Sep 17 00:00:00 2001
From: Oliver <1069035666@qq.com>
Date: Thu, 15 Dec 2022 02:03:48 +0000
Subject: [PATCH 2/2] =?UTF-8?q?Table=20filters=20=E7=94=A8dictType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Oliver <1069035666@qq.com>
---
 src/components/Table/src/hooks/useColumns.ts | 9 +++++++++
 src/components/Table/src/types/table.ts      | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/src/components/Table/src/hooks/useColumns.ts b/src/components/Table/src/hooks/useColumns.ts
index dc3477e..9b1da22 100644
--- a/src/components/Table/src/hooks/useColumns.ts
+++ b/src/components/Table/src/hooks/useColumns.ts
@@ -5,6 +5,7 @@ import { computed, Ref, ref, reactive, toRaw, unref, watch } from 'vue';
 import { renderEditCell } from '../components/editable';
 import { usePermission } from '/@/hooks/web/usePermission';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { useDict } from '/@/components/Dict';
 import { isObject, isArray, isBoolean, isFunction, isMap, isString } from '/@/utils/is';
 import { deepMerge } from '/@/utils';
 import { error } from '/@/utils/log';
@@ -32,6 +33,14 @@ function handleItem(item: BasicColumn, ellipsis: boolean, dictTypes: Set<string>
   if (children && children.length) {
     handleChildren(children, !!ellipsis, dictTypes);
   }
+  if (item.filterDictType) {
+    const { getDictList } = useDict();
+    dictTypes.add(item.filterDictType);
+    const filterList = getDictList(item.filterDictType);
+    item.filters = filterList.map((item) => {
+      return { text: item.name, value: item.value };
+    });
+  }
   if (item.dictType) {
     dictTypes.add(item.dictType);
     // if (!item.slots?.customRender) {
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 854ae11..5366e2a 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -480,6 +480,9 @@ export interface BasicColumn extends ColumnProps<Recordable> {
   // JeeSite的字典类型
   dictType?: string;
 
+  // JeeSite的字典类型
+  filterDictType?: string;
+
   // 没有找到字典标签的时候显示的默认值
   defaultValue?: string;
 
-- 
Gitee