diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index cfa455a7d..3b98cd01e 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -150,24 +150,17 @@ export function useTypeGridColumns(): VxeTableGridOptions['columns'] { // ============================== 字典数据 ============================== -// TODO @芋艿:后续针对 antd,增加 /** * 颜色选项 */ const colorOptions = [ { value: '', label: '无' }, - { value: 'processing', label: '主要' }, - { value: 'success', label: '成功' }, { value: 'default', label: '默认' }, + { value: 'primary', label: '主要' }, + { value: 'success', label: '成功' }, + { value: 'info', label: '信息' }, { value: 'warning', label: '警告' }, - { value: 'error', label: '危险' }, - { value: 'pink', label: 'pink' }, - { value: 'red', label: 'red' }, - { value: 'orange', label: 'orange' }, - { value: 'green', label: 'green' }, - { value: 'cyan', label: 'cyan' }, - { value: 'blue', label: 'blue' }, - { value: 'purple', label: 'purple' }, + { value: 'danger', label: '危险' }, ]; /** 数据新增/修改的表单 */ diff --git a/apps/web-ele/src/components/dict-tag/dict-tag.vue b/apps/web-ele/src/components/dict-tag/dict-tag.vue index c4e459131..7ae6f2bb6 100644 --- a/apps/web-ele/src/components/dict-tag/dict-tag.vue +++ b/apps/web-ele/src/components/dict-tag/dict-tag.vue @@ -20,7 +20,8 @@ const props = defineProps(); /** 获取标签类型 */ function getTagType(colorType?: string): TagType { switch (colorType) { - case 'danger': { + case 'danger': + case 'error': { return 'danger'; } case 'default': { @@ -29,7 +30,8 @@ function getTagType(colorType?: string): TagType { case 'info': { return 'info'; } - case 'primary': { + case 'primary': + case 'processing': { return 'primary'; } case 'success': { diff --git a/apps/web-ele/src/views/system/dict/data.ts b/apps/web-ele/src/views/system/dict/data.ts index ccbf836ca..639855e2e 100644 --- a/apps/web-ele/src/views/system/dict/data.ts +++ b/apps/web-ele/src/views/system/dict/data.ts @@ -148,22 +148,15 @@ export function useTypeGridColumns(): VxeTableGridOptions['columns'] { // ============================== 字典数据 ============================== -// TODO @芋艿:后续针对 antd,增加 /** 颜色选项 */ const colorOptions = [ { value: '', label: '无' }, - { value: 'processing', label: '主要' }, - { value: 'success', label: '成功' }, { value: 'default', label: '默认' }, + { value: 'primary', label: '主要' }, + { value: 'success', label: '成功' }, + { value: 'info', label: '信息' }, { value: 'warning', label: '警告' }, - { value: 'error', label: '危险' }, - { value: 'pink', label: 'pink' }, - { value: 'red', label: 'red' }, - { value: 'orange', label: 'orange' }, - { value: 'green', label: 'green' }, - { value: 'cyan', label: 'cyan' }, - { value: 'blue', label: 'blue' }, - { value: 'purple', label: 'purple' }, + { value: 'danger', label: '危险' }, ]; /** 数据新增/修改的表单 */