diff --git a/apps/web-antd/src/components/Dict/src/data.tsx b/apps/web-antd/src/components/Dict/src/data.tsx index 68395f8a..3172110a 100644 --- a/apps/web-antd/src/components/Dict/src/data.tsx +++ b/apps/web-antd/src/components/Dict/src/data.tsx @@ -16,7 +16,10 @@ export const tagTypes: TagType = { orange: { color: 'orange', label: 'orange' }, /** 自定义预设 color可以为16进制颜色 */ pink: { color: 'pink', label: 'pink' }, - primary: { color: 'processing', label: '主要(primary)' }, + /** + * 新版processing参数有问题 暂时用blue代替 + */ + primary: { color: 'blue', label: '主要(primary)' }, purple: { color: 'purple', label: 'purple' }, red: { color: 'red', label: 'red' }, success: { color: 'success', label: '成功(success)' }, diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 7a7f4fc5..bc915cc9 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -3,7 +3,14 @@ import { onBeforeUnmount, onMounted, ref } from 'vue'; import { preferences } from '@vben/preferences'; -import { Tag as ATag, Button, Card, Select } from 'ant-design-vue'; +import { + Tag as ATag, + Button, + Card, + RadioButton, + RadioGroup, + Select, +} from 'ant-design-vue'; import { DictTag } from '#/components/Dict'; import { useDictStore } from '#/store/dict'; @@ -26,6 +33,8 @@ onBeforeUnmount(() => intervalId && clearInterval(intervalId)); const sexOptions = getDictOptions('sys_user_sex'); const disabledDict = getDict('sys_normal_disable'); +const select = ref('pc'); +const deviceOptions = getDictOptions('sys_device_type'); const dictStore = useDictStore(); onMounted(() => { @@ -52,8 +61,19 @@ onMounted(() => { class="w-[200px]" placeholder="请选择性别" /> - - +
+ + +
+ + + {{ item.label }} + +