From 956ab62df477b4b211ab9291c8b6e4dd0d476a0f Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Mon, 9 May 2022 00:21:14 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=A3=20=E7=BC=96=E5=86=99=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E6=A8=A1=E5=9D=97=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/dict/DictDataModal.vue   |  4 ++-
 .../src/views/system/dict/DictDataTable.vue   | 26 ++++++++++++-------
 .../src/views/system/dict/dictdata.data.ts    |  8 +++---
 kicc-ui/src/views/system/dict/index.vue       |  3 ++-
 kicc-ui/src/views/system/role/RoleDrawer.vue  |  2 +-
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/kicc-ui/src/views/system/dict/DictDataModal.vue b/kicc-ui/src/views/system/dict/DictDataModal.vue
index 8783fe9b..3b8e446a 100644
--- a/kicc-ui/src/views/system/dict/DictDataModal.vue
+++ b/kicc-ui/src/views/system/dict/DictDataModal.vue
@@ -36,16 +36,18 @@
     await clearValidate();
     // 处理设置数据
     tag.value = data._tag;
+    const dictType = data.dictType;
     const dictDataId = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
     switch (unref(tag)) {
       case 'add':
         props.title = '新增字典数据';
+        await setFieldsValue({ dictType });
         break;
       case 'edit':
         props.title = '编辑字典数据';
-        await setFieldsValue(await getDictData(dictDataId));
+        await setFieldsValue( Object.assign({}, { dictType },  await getDictData(dictDataId)));
         break;
     }
     // 尾部:设置处理后的最终配置数据
diff --git a/kicc-ui/src/views/system/dict/DictDataTable.vue b/kicc-ui/src/views/system/dict/DictDataTable.vue
index a7b25e94..d46663f3 100644
--- a/kicc-ui/src/views/system/dict/DictDataTable.vue
+++ b/kicc-ui/src/views/system/dict/DictDataTable.vue
@@ -7,9 +7,15 @@
     <BasicTable @register="registerTable"
                 @selection-change="handleSelectionChange"
     >
+      <template #tableTitle>
+        <ATag color="red"
+              style="font-size: 14px;font-weight: 700;"
+        >>>字典数据列表[{{state.dictType}}]</ATag>
+      </template>
       <template #toolbar>
         <a-button v-auth="['dictData_add']"
                   type="primary"
+                  :disabled="!state.dictType"
                   @click="handleAdd()"
         >新增字典数据</a-button>
         <a-button v-auth="['dictData_edit']"
@@ -51,7 +57,7 @@
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-  import {defineComponent, ref, reactive, toRaw} from 'vue';
+  import { defineComponent, reactive, toRaw } from 'vue';
   import { PageWrapper } from '/@/components/Page';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { columns, searchFormSchema } from './dictdata.data';
@@ -59,17 +65,18 @@
   import { useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import DictDataModal from './DictDataModal.vue';
+  import { Tag } from 'ant-design-vue';
 
   /** 类型规范统一声明定义区域 */
   interface TableState {
-    dictType: String;
+    dictType: string;
     single: boolean;
     multiple: boolean;
   }
 
   export default defineComponent({
     name: 'DictDataManagement',
-    components: { BasicTable, PageWrapper, DictDataModal, TableAction },
+    components: { BasicTable, PageWrapper, DictDataModal, TableAction, ATag: Tag },
     setup() {
 
       /** 通用变量统一声明区域 */
@@ -83,8 +90,7 @@
       });
       const { createConfirm, createMessage } = useMessage();
       const [registerModal, { openModal }] = useModal();
-      const [registerTable, { reload, setProps, clearSelectedRowKeys, getSelectRowKeys }] = useTable({
-        title: '>>字典项列表',
+      const [registerTable, { reload, clearSelectedRowKeys, getSelectRowKeys, getForm, setProps }] = useTable({
         api: listDictData,
         rowKey: 'id',
         columns,
@@ -98,6 +104,7 @@
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
+        clickToRowSelect: false,
         actionColumn: {
           width: 220,
           title: '操作',
@@ -105,14 +112,13 @@
           slots: { customRender: 'action' },
           fixed: false
         },
-        handleSearchInfoFn: () => clearSelectedRowKeys(),
-        immediate: false
+        handleSearchInfoFn: () => clearSelectedRowKeys()
       });
 
       /** 根据字典类型查找字典数据 */
       function filterByDictType(dictType: string) {
-        setProps({ searchInfo: { dictType } });
         state.dictType = dictType;
+        getForm().setFieldsValue({ dictType: state.dictType });
         reload();
       }
 
@@ -125,13 +131,13 @@
 
       /** 新增按钮操作,行内新增与工具栏局域新增通用 */
       function handleAdd() {
-        openModal(true,{ _tag: 'add' });
+        openModal(true,{ _tag: 'add', dictType: state.dictType });
       }
 
       /** 编辑按钮操作,行内编辑 */
       function handleEdit(record?: Recordable) {
         record = record || { id: getSelectRowKeys() };
-        openModal(true, { _tag: 'edit', record });
+        openModal(true, { _tag: 'edit', record, dictType: state.dictType });
       }
 
       /** 删除按钮操作,行内删除 */
diff --git a/kicc-ui/src/views/system/dict/dictdata.data.ts b/kicc-ui/src/views/system/dict/dictdata.data.ts
index 8592f14f..ad7fbf03 100644
--- a/kicc-ui/src/views/system/dict/dictdata.data.ts
+++ b/kicc-ui/src/views/system/dict/dictdata.data.ts
@@ -31,16 +31,16 @@ export const columns: BasicColumn[] = [
 /** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-    field: 'dataType',
-    label: '字典类型',
+    field: 'dictType',
+    label: '字典数据类型',
     component: 'Input',
     componentProps: {
-      placeholder: '请输入字典类型'
+      placeholder: '请输入字典数据类型'
     },
     colProps: { span: 12 }
   },
   {
-    field: 'dataType',
+    field: 'label',
     label: '字典数据标签',
     component: 'Input',
     componentProps: {
diff --git a/kicc-ui/src/views/system/dict/index.vue b/kicc-ui/src/views/system/dict/index.vue
index 11b403bd..d2dd0d82 100644
--- a/kicc-ui/src/views/system/dict/index.vue
+++ b/kicc-ui/src/views/system/dict/index.vue
@@ -101,6 +101,7 @@
         showTableSetting: true,
         bordered: true,
         showIndexColumn: false,
+        clickToRowSelect: false,
         actionColumn: {
           width: 220,
           title: '操作',
@@ -146,7 +147,7 @@
 
       /** 处理点击字典子表 */
       function handleClickSubTable(record: Recordable) {
-        dictSubRef.value.filterByDictType(record);
+        dictSubRef.value.filterByDictType(record?.type);
       }
 
       /** 处理表格刷新 */
diff --git a/kicc-ui/src/views/system/role/RoleDrawer.vue b/kicc-ui/src/views/system/role/RoleDrawer.vue
index 04652518..cd81f8f3 100644
--- a/kicc-ui/src/views/system/role/RoleDrawer.vue
+++ b/kicc-ui/src/views/system/role/RoleDrawer.vue
@@ -78,7 +78,7 @@
         const result = await getRoleMenuIds(roleId);
         const role  = await getRole(roleId);
         state.checkedKeys = result.extend;
-        await setFieldsValue(Object.assign(role, { menuIds: result.extend }));
+        await setFieldsValue(Object.assign({}, role, { menuIds: result.extend }));
         break;
     }
     // 尾部:设置处理后的最终配置数据