feat: 优化 dict

2025-06-20 18:32:05 +08:00
parent 7c3a2b7aa4
commit 9283d58ce9
11 changed files with 158 additions and 124 deletions
--- a/apps/web-antd/src/views/ai/workflow/form/modules/basic-info.vue
+++ b/apps/web-antd/src/views/ai/workflow/form/modules/basic-info.vue
@@ -5,7 +5,7 @@ import { ref } from 'vue';

 import { Form, Input, Select } from 'ant-design-vue';

-import { DICT_TYPE, getIntDictOptions } from '#/utils';
+import { DICT_TYPE, getDictOptions } from '#/utils';

 // 创建本地数据副本
 const modelData = defineModel<any>();
@@ -57,7 +57,7 @@ defineExpose({ validate });
        placeholder="请选择状态"
      >
        <Select.Option
-          v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+          v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS, 'number')"
          :key="dict.value"
          :value="dict.value"
        >
--- a/apps/web-antd/src/views/ai/write/index/components/Left.vue
+++ b/apps/web-antd/src/views/ai/write/index/components/Left.vue
@@ -11,7 +11,7 @@ import { Button, message, Textarea } from 'ant-design-vue';
 import {
  AiWriteTypeEnum,
  DICT_TYPE,
-  getIntDictOptions,
+  getDictOptions,
  WriteExample,
 } from '#/utils';

@@ -211,22 +211,22 @@ function submit() {
        <ReuseLabel label="长度" />
        <Tag
          v-model="formData.length"
-          :tags="getIntDictOptions(DICT_TYPE.AI_WRITE_LENGTH)"
+          :tags="getDictOptions(DICT_TYPE.AI_WRITE_LENGTH, 'number')"
        />
        <ReuseLabel label="格式" />
        <Tag
          v-model="formData.format"
-          :tags="getIntDictOptions(DICT_TYPE.AI_WRITE_FORMAT)"
+          :tags="getDictOptions(DICT_TYPE.AI_WRITE_FORMAT, 'number')"
        />
        <ReuseLabel label="语气" />
        <Tag
          v-model="formData.tone"
-          :tags="getIntDictOptions(DICT_TYPE.AI_WRITE_TONE)"
+          :tags="getDictOptions(DICT_TYPE.AI_WRITE_TONE, 'number')"
        />
        <ReuseLabel label="语言" />
        <Tag
          v-model="formData.language"
-          :tags="getIntDictOptions(DICT_TYPE.AI_WRITE_LANGUAGE)"
+          :tags="getDictOptions(DICT_TYPE.AI_WRITE_LANGUAGE, 'number')"
        />

        <div class="mt-3 flex items-center justify-center">
--- a/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
+++ b/apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
@@ -25,7 +25,7 @@ import {

 import { DeptSelectModal, UserSelectModal } from '#/components/select-modal';
 import { ImageUpload } from '#/components/upload';
-import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '#/utils';
+import { DICT_TYPE, getDictOptions } from '#/utils';

 const props = defineProps({
  categoryList: {
@@ -295,7 +295,7 @@ defineExpose({ validate });
        <Radio.Group v-model:value="modelData.type">
          <!-- TODO BPMN 流程类型需要整合，暂时禁用 -->
          <Radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_TYPE)"
+            v-for="dict in getDictOptions(DICT_TYPE.BPM_MODEL_TYPE, 'number')"
            :key="dict.value"
            :value="dict.value"
            :disabled="dict.value === 10"
@@ -307,10 +307,11 @@ defineExpose({ validate });
      <Form.Item label="是否可见" name="visible" class="mb-5">
        <Radio.Group v-model:value="modelData.visible">
          <Radio
-            v-for="(dict, index) in getBoolDictOptions(
+            v-for="dict in getDictOptions(
              DICT_TYPE.INFRA_BOOLEAN_STRING,
+              'boolean',
            )"
-            :key="index"
+            :key="dict.label"
            :value="dict.value"
          >
            {{ dict.label }}
--- a/apps/web-antd/src/views/mall/home/index.vue
+++ b/apps/web-antd/src/views/mall/home/index.vue
@@ -139,8 +139,6 @@ const quickNavItems: WorkbenchQuickNavItem[] = [
 ];

 const router = useRouter();
-// 这是一个示例方法，实际项目中需要根据实际情况进行调整
-// This is a sample method, adjust according to the actual project requirements
 function navTo(nav: WorkbenchProjectItem | WorkbenchQuickNavItem) {
  if (nav.url?.startsWith('http')) {
    openWindow(nav.url);
--- a/apps/web-antd/src/views/mall/promotion/article/category/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/article/category/data.ts
@@ -1,12 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeGridPropTypes } from '#/adapter/vxe-table';

-import {
-  DICT_TYPE,
-  getDictOptions,
-  getIntDictOptions,
-  getRangePickerDefaultProps,
-} from '#/utils';
+import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -72,7 +67,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        placeholder: '请选择状态',
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS),
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
    {
--- a/apps/web-antd/src/views/mall/promotion/banner/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/banner/data.ts
@@ -1,12 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeGridPropTypes } from '#/adapter/vxe-table';

-import {
-  DICT_TYPE,
-  getDictOptions,
-  getIntDictOptions,
-  getRangePickerDefaultProps,
-} from '#/utils';
+import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -99,7 +94,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        placeholder: '请选择状态',
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS),
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
    {
--- a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts
@@ -2,7 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallSeckillConfigApi } from '#/api/mall/promotion/seckill/seckillConfig';

-import { DICT_TYPE, getDictOptions, getIntDictOptions } from '#/utils';
+import { DICT_TYPE, getDictOptions } from '#/utils';

 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -83,7 +83,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        placeholder: '请选择状态',
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS),
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
      },
    },
  ];
--- a/apps/web-antd/src/views/pay/refund/data.ts
+++ b/apps/web-antd/src/views/pay/refund/data.ts
@@ -2,12 +2,7 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';

 import { getAppList } from '#/api/pay/app';
-import {
-  DICT_TYPE,
-  getIntDictOptions,
-  getRangePickerDefaultProps,
-  getStrDictOptions,
-} from '#/utils';
+import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils';

 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
@@ -34,7 +29,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        allowClear: true,
-        options: getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE),
+        options: getDictOptions(DICT_TYPE.PAY_CHANNEL_CODE, 'string'),
      },
    },
    {
@@ -63,7 +58,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
      component: 'Select',
      componentProps: {
        allowClear: true,
-        options: getIntDictOptions(DICT_TYPE.PAY_REFUND_STATUS),
+        options: getDictOptions(DICT_TYPE.PAY_REFUND_STATUS, 'number'),
      },
    },
    {