Merge branch 'main_dev' into fix/teambition/10-16/2024

@@ -14,6 +14,7 @@ import { useI18n } from '/@/hooks/web/useI18n';
 enum SysDictApi {
 enum SysDictApi {
   CONFIG_URL = '/dict',
   CONFIG_URL = '/dict',
   CONFIG_ITEM_URL = '/dict_item',
   CONFIG_ITEM_URL = '/dict_item',
+  CONFIG_LIST_DICT = '/dict/all',
 }
 }
 
 
 /**
 /**
@@ -45,6 +46,17 @@ export const sysDictPage = (params: SysDictParams) =>
   });
   });
 
 
 /**
 /**
+ * 获取字典list 用于查询
+ */
+
+export const getDictList = (_params?: string) => {
+  return defHttp.get<{ code: number; data: SysDict[]; message: string }>({
+    url: SysDictApi.CONFIG_LIST_DICT,
+    // params,
+  });
+};
+
+/**
  * 获取SysDictItem列表
  * 获取SysDictItem列表
  * @param params 查询参数
  * @param params 查询参数
  */
  */

+import { getDictList } from '/@/api/system/dict';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
@@ -36,26 +37,46 @@ export const columns: BasicColumn[] = [
 ];
 ];
 
 
 export const searchFormSchema: FormSchema[] = [
 export const searchFormSchema: FormSchema[] = [
+  // {
+  //   field: 'dictName',
+  //   label: t('system.dict.dictName'),
+  //   component: 'Input',
+  //   colProps: { span: 6 },
+  //   componentProps: {
+  //     maxLength: 32,
+  //   },
+  //   dynamicRules: () => {
+  //     return [
+  //       {
+  //         required: false,
+  //         validator: (_, value) => {
+  //           if (String(value).length > 32) {
+  //             return Promise.reject(t('system.dict.textRule32'));
+  //           }
+  //           return Promise.resolve();
+  //         },
+  //       },
+  //     ];
+  //   },
+  // },
   {
   {
     field: 'dictName',
     field: 'dictName',
     label: t('system.dict.dictName'),
     label: t('system.dict.dictName'),
-    component: 'Input',
+    component: 'ApiSelect',
     colProps: { span: 6 },
     colProps: { span: 6 },
     componentProps: {
     componentProps: {
-      maxLength: 32,
-    },
-    dynamicRules: () => {
-      return [
-        {
-          required: false,
-          validator: (_, value) => {
-            if (String(value).length > 32) {
-              return Promise.reject(t('system.dict.textRule32'));
-            }
-            return Promise.resolve();
-          },
-        },
-      ];
+      api: async () => {
+        const { data: values } = await getDictList();
+        return (values || []).map((item) => ({
+          label: t(item.dictName) ? t(item.dictName) : item.dictName,
+          value: item.dictName,
+        }));
+      },
+
+      showSearch: true,
+      filterOption: (inputValue: string, options: Record<'label', string>) => {
+        return options.label.includes(inputValue);
+      },
     },
     },
   },
   },
   {
   {