Commit 6291a3d7d8f587cf67dcbc53d3278376fbeb2e19

Authored by xingyu
1 parent 5725d486

refactor: dictData ==> dictClass

Showing 36 changed files with 63 additions and 63 deletions
yudao-server/src/main/resources/application-local.yaml
@@ -44,34 +44,34 @@ spring: @@ -44,34 +44,34 @@ spring:
44 primary: master 44 primary: master
45 datasource: 45 datasource:
46 master: 46 master:
47 - name: ruoyi-vue-pro  
48 - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 47 + name: pro
  48 + url: jdbc:mysql://101.201.151.212:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
49 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 49 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
50 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 50 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
51 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 51 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
52 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 52 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
53 - username: root  
54 - password: 123456 53 + username: luoqi
  54 + password: luoqikeji
55 # username: sa 55 # username: sa
56 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W 56 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
57 slave: # 模拟从库,可根据自己需要修改 57 slave: # 模拟从库,可根据自己需要修改
58 - name: ruoyi-vue-pro  
59 - url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例 58 + name: pro
  59 + url: jdbc:mysql://101.201.151.212:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
60 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例 60 # url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
61 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 61 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
62 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 62 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例
63 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 63 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
64 - username: root  
65 - password: 123456 64 + username: luoqi
  65 + password: luoqikeji
66 # username: sa 66 # username: sa
67 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W 67 # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
68 68
69 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 69 # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
70 redis: 70 redis:
71 - host: 127.0.0.1 # 地址 71 + host: 39.107.87.6 # 地址
72 port: 6379 # 端口 72 port: 6379 # 端口
73 - database: 0 # 数据库索引  
74 -# password: 123456 # 密码,建议生产环境开启 73 + database: 10 # 数据库索引
  74 + password: xingyu4j # 密码,建议生产环境开启
75 75
76 --- #################### 定时任务相关配置 #################### 76 --- #################### 定时任务相关配置 ####################
77 77
yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
@@ -17,7 +17,7 @@ export type CrudSchema = Omit<TableColumn, 'children'> & { @@ -17,7 +17,7 @@ export type CrudSchema = Omit<TableColumn, 'children'> & {
17 detail?: CrudDescriptionsParams // 详情的详细配置 17 detail?: CrudDescriptionsParams // 详情的详细配置
18 children?: CrudSchema[] 18 children?: CrudSchema[]
19 dictType?: string // 字典类型 19 dictType?: string // 字典类型
20 - dictData?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean 20 + dictClass?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean
21 } 21 }
22 22
23 type CrudSearchParams = { 23 type CrudSearchParams = {
@@ -157,11 +157,11 @@ const filterFormSchema = (crudSchema: CrudSchema[]): FormSchema[] => { @@ -157,11 +157,11 @@ const filterFormSchema = (crudSchema: CrudSchema[]): FormSchema[] => {
157 let comonentProps = {} 157 let comonentProps = {}
158 if (schemaItem.dictType) { 158 if (schemaItem.dictType) {
159 const options: ComponentOptions[] = [] 159 const options: ComponentOptions[] = []
160 - if (schemaItem.dictData && schemaItem.dictData === 'number') { 160 + if (schemaItem.dictClass && schemaItem.dictClass === 'number') {
161 getIntDictOptions(schemaItem.dictType).forEach((dict) => { 161 getIntDictOptions(schemaItem.dictType).forEach((dict) => {
162 options.push(dict) 162 options.push(dict)
163 }) 163 })
164 - } else if (schemaItem.dictData && schemaItem.dictData === 'boolean') { 164 + } else if (schemaItem.dictClass && schemaItem.dictClass === 'boolean') {
165 getBoolDictOptions(schemaItem.dictType).forEach((dict) => { 165 getBoolDictOptions(schemaItem.dictType).forEach((dict) => {
166 options.push(dict) 166 options.push(dict)
167 }) 167 })
yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts
@@ -38,7 +38,7 @@ type VxeCrudColumns = Omit<VxeTableColumn, 'children'> & { @@ -38,7 +38,7 @@ type VxeCrudColumns = Omit<VxeTableColumn, 'children'> & {
38 print?: CrudPrintParams // vxe 打印的字段 38 print?: CrudPrintParams // vxe 打印的字段
39 children?: VxeCrudColumns[] // 子级 39 children?: VxeCrudColumns[] // 子级
40 dictType?: string // 字典类型 40 dictType?: string // 字典类型
41 - dictData?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean 41 + dictClass?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean
42 } 42 }
43 43
44 type CrudSearchParams = { 44 type CrudSearchParams = {
@@ -239,11 +239,11 @@ const filterFormSchema = (crudSchema: VxeCrudSchema): FormSchema[] => { @@ -239,11 +239,11 @@ const filterFormSchema = (crudSchema: VxeCrudSchema): FormSchema[] => {
239 let comonentProps = {} 239 let comonentProps = {}
240 if (schemaItem.dictType) { 240 if (schemaItem.dictType) {
241 const options: ComponentOptions[] = [] 241 const options: ComponentOptions[] = []
242 - if (schemaItem.dictData && schemaItem.dictData === 'number') { 242 + if (schemaItem.dictClass && schemaItem.dictClass === 'number') {
243 getIntDictOptions(schemaItem.dictType).forEach((dict) => { 243 getIntDictOptions(schemaItem.dictType).forEach((dict) => {
244 options.push(dict) 244 options.push(dict)
245 }) 245 })
246 - } else if (schemaItem.dictData && schemaItem.dictData === 'boolean') { 246 + } else if (schemaItem.dictClass && schemaItem.dictClass === 'boolean') {
247 getBoolDictOptions(schemaItem.dictType).forEach((dict) => { 247 getBoolDictOptions(schemaItem.dictType).forEach((dict) => {
248 options.push(dict) 248 options.push(dict)
249 }) 249 })
yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts
@@ -34,7 +34,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -34,7 +34,7 @@ const crudSchemas = reactive<CrudSchema[]>([
34 label: t('common.status'), 34 label: t('common.status'),
35 field: 'status', 35 field: 'status',
36 dictType: DICT_TYPE.COMMON_STATUS, 36 dictType: DICT_TYPE.COMMON_STATUS,
37 - dictData: 'number' 37 + dictClass: 'number'
38 }, 38 },
39 { 39 {
40 label: '备注', 40 label: '备注',
yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts
@@ -42,7 +42,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -42,7 +42,7 @@ const crudSchemas = reactive<CrudSchema[]>([
42 label: t('common.status'), 42 label: t('common.status'),
43 field: 'status', 43 field: 'status',
44 dictType: DICT_TYPE.COMMON_STATUS, 44 dictType: DICT_TYPE.COMMON_STATUS,
45 - dictData: 'number' 45 + dictClass: 'number'
46 }, 46 },
47 { 47 {
48 label: '备注', 48 label: '备注',
yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts
@@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([
41 label: '流程分类', 41 label: '流程分类',
42 field: 'category', 42 field: 'category',
43 dictType: DICT_TYPE.BPM_MODEL_CATEGORY, 43 dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
44 - dictData: 'number', 44 + dictClass: 'number',
45 search: { 45 search: {
46 show: true 46 show: true
47 } 47 }
yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts
@@ -28,7 +28,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -28,7 +28,7 @@ const crudSchemas = reactive<CrudSchema[]>([
28 label: '流程分类', 28 label: '流程分类',
29 field: 'category', 29 field: 'category',
30 dictType: DICT_TYPE.BPM_MODEL_CATEGORY, 30 dictType: DICT_TYPE.BPM_MODEL_CATEGORY,
31 - dictData: 'number', 31 + dictClass: 'number',
32 search: { 32 search: {
33 show: true 33 show: true
34 } 34 }
@@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([
41 label: t('common.status'), 41 label: t('common.status'),
42 field: 'status', 42 field: 'status',
43 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS, 43 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS,
44 - dictData: 'number', 44 + dictClass: 'number',
45 search: { 45 search: {
46 show: true 46 show: true
47 } 47 }
@@ -50,7 +50,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -50,7 +50,7 @@ const crudSchemas = reactive<CrudSchema[]>([
50 label: '结果', 50 label: '结果',
51 field: 'result', 51 field: 'result',
52 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, 52 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
53 - dictData: 'number', 53 + dictClass: 'number',
54 search: { 54 search: {
55 show: true 55 show: true
56 } 56 }
yudao-ui-admin-vue3/src/views/bpm/task/done/done.data.ts
@@ -30,7 +30,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -30,7 +30,7 @@ const crudSchemas = reactive<CrudSchema[]>([
30 label: '结果', 30 label: '结果',
31 field: 'result', 31 field: 'result',
32 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, 32 dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
33 - dictData: 'number' 33 + dictClass: 'number'
34 }, 34 },
35 { 35 {
36 label: '审批意见', 36 label: '审批意见',
yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts
@@ -26,7 +26,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -26,7 +26,7 @@ const crudSchemas = reactive<CrudSchema[]>([
26 label: '用户类型', 26 label: '用户类型',
27 field: 'userType', 27 field: 'userType',
28 dictType: DICT_TYPE.USER_TYPE, 28 dictType: DICT_TYPE.USER_TYPE,
29 - dictData: 'number', 29 + dictClass: 'number',
30 search: { 30 search: {
31 show: true 31 show: true
32 } 32 }
yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts
@@ -69,7 +69,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -69,7 +69,7 @@ const crudSchemas = reactive<CrudSchema[]>([
69 label: '处理状态', 69 label: '处理状态',
70 field: 'processStatus', 70 field: 'processStatus',
71 dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS, 71 dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS,
72 - dictData: 'number', 72 + dictClass: 'number',
73 search: { 73 search: {
74 show: true 74 show: true
75 } 75 }
yudao-ui-admin-vue3/src/views/infra/config/config.data.ts
@@ -52,7 +52,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -52,7 +52,7 @@ const crudSchemas = reactive<CrudSchema[]>([
52 label: '系统内置', 52 label: '系统内置',
53 field: 'type', 53 field: 'type',
54 dictType: DICT_TYPE.INFRA_CONFIG_TYPE, 54 dictType: DICT_TYPE.INFRA_CONFIG_TYPE,
55 - dictData: 'number', 55 + dictClass: 'number',
56 search: { 56 search: {
57 show: true 57 show: true
58 } 58 }
yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts
@@ -48,7 +48,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -48,7 +48,7 @@ const crudSchemas = reactive<CrudSchema[]>([
48 label: '存储器', 48 label: '存储器',
49 field: 'storage', 49 field: 'storage',
50 dictType: DICT_TYPE.INFRA_FILE_STORAGE, 50 dictType: DICT_TYPE.INFRA_FILE_STORAGE,
51 - dictData: 'number', 51 + dictClass: 'number',
52 search: { 52 search: {
53 show: true 53 show: true
54 } 54 }
@@ -57,7 +57,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -57,7 +57,7 @@ const crudSchemas = reactive<CrudSchema[]>([
57 label: '主配置', 57 label: '主配置',
58 field: 'primary', 58 field: 'primary',
59 dictType: DICT_TYPE.INFRA_BOOLEAN_STRING, 59 dictType: DICT_TYPE.INFRA_BOOLEAN_STRING,
60 - dictData: 'number' 60 + dictClass: 'number'
61 }, 61 },
62 { 62 {
63 label: t('form.remark'), 63 label: t('form.remark'),
yudao-ui-admin-vue3/src/views/infra/job/job.data.ts
@@ -37,7 +37,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -37,7 +37,7 @@ const crudSchemas = reactive<CrudSchema[]>([
37 label: t('common.status'), 37 label: t('common.status'),
38 field: 'status', 38 field: 'status',
39 dictType: DICT_TYPE.INFRA_JOB_STATUS, 39 dictType: DICT_TYPE.INFRA_JOB_STATUS,
40 - dictData: 'number', 40 + dictClass: 'number',
41 form: { 41 form: {
42 show: false 42 show: false
43 }, 43 },
yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts
@@ -74,7 +74,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -74,7 +74,7 @@ const crudSchemas = reactive<CrudSchema[]>([
74 label: t('common.status'), 74 label: t('common.status'),
75 field: 'status', 75 field: 'status',
76 dictType: DICT_TYPE.INFRA_JOB_LOG_STATUS, 76 dictType: DICT_TYPE.INFRA_JOB_LOG_STATUS,
77 - dictData: 'number', 77 + dictClass: 'number',
78 search: { 78 search: {
79 show: true 79 show: true
80 } 80 }
yudao-ui-admin-vue3/src/views/pay/app/app.data.ts
@@ -45,7 +45,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -45,7 +45,7 @@ const crudSchemas = reactive<CrudSchema[]>([
45 label: t('common.status'), 45 label: t('common.status'),
46 field: 'status', 46 field: 'status',
47 dictType: DICT_TYPE.COMMON_STATUS, 47 dictType: DICT_TYPE.COMMON_STATUS,
48 - dictData: 'number', 48 + dictClass: 'number',
49 search: { 49 search: {
50 show: true 50 show: true
51 } 51 }
yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts
@@ -51,7 +51,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -51,7 +51,7 @@ const crudSchemas = reactive<CrudSchema[]>([
51 label: t('common.status'), 51 label: t('common.status'),
52 field: 'status', 52 field: 'status',
53 dictType: DICT_TYPE.COMMON_STATUS, 53 dictType: DICT_TYPE.COMMON_STATUS,
54 - dictData: 'number', 54 + dictClass: 'number',
55 search: { 55 search: {
56 show: true 56 show: true
57 } 57 }
yudao-ui-admin-vue3/src/views/pay/order/order.data.ts
@@ -83,7 +83,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -83,7 +83,7 @@ const crudSchemas = reactive<CrudSchema[]>([
83 label: '回调商户状态', 83 label: '回调商户状态',
84 field: 'notifyStatus', 84 field: 'notifyStatus',
85 dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, 85 dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS,
86 - dictData: 'number' 86 + dictClass: 'number'
87 }, 87 },
88 { 88 {
89 label: '支付金额', 89 label: '支付金额',
@@ -110,7 +110,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -110,7 +110,7 @@ const crudSchemas = reactive<CrudSchema[]>([
110 label: '支付状态', 110 label: '支付状态',
111 field: 'status', 111 field: 'status',
112 dictType: DICT_TYPE.PAY_ORDER_STATUS, 112 dictType: DICT_TYPE.PAY_ORDER_STATUS,
113 - dictData: 'number', 113 + dictClass: 'number',
114 search: { 114 search: {
115 show: true 115 show: true
116 } 116 }
@@ -139,7 +139,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -139,7 +139,7 @@ const crudSchemas = reactive<CrudSchema[]>([
139 label: '退款状态', 139 label: '退款状态',
140 field: 'refundStatus', 140 field: 'refundStatus',
141 dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS, 141 dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS,
142 - dictData: 'number', 142 + dictClass: 'number',
143 search: { 143 search: {
144 show: true 144 show: true
145 } 145 }
yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts
@@ -67,7 +67,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -67,7 +67,7 @@ const crudSchemas = reactive<CrudSchema[]>([
67 label: '退款类型', 67 label: '退款类型',
68 field: 'type', 68 field: 'type',
69 dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE, 69 dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE,
70 - dictData: 'number', 70 + dictClass: 'number',
71 search: { 71 search: {
72 show: true 72 show: true
73 } 73 }
@@ -76,7 +76,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -76,7 +76,7 @@ const crudSchemas = reactive<CrudSchema[]>([
76 label: t('common.status'), 76 label: t('common.status'),
77 field: 'status', 77 field: 'status',
78 dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS, 78 dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS,
79 - dictData: 'number', 79 + dictClass: 'number',
80 search: { 80 search: {
81 show: true 81 show: true
82 } 82 }
yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
@@ -65,7 +65,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -65,7 +65,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
65 title: t('common.status'), 65 title: t('common.status'),
66 field: 'status', 66 field: 'status',
67 dictType: DICT_TYPE.COMMON_STATUS, 67 dictType: DICT_TYPE.COMMON_STATUS,
68 - dictData: 'number', 68 + dictClass: 'number',
69 isSearch: true 69 isSearch: true
70 } 70 }
71 ] 71 ]
yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts
@@ -97,7 +97,7 @@ export const crudSchemas = reactive<CrudSchema[]>([ @@ -97,7 +97,7 @@ export const crudSchemas = reactive<CrudSchema[]>([
97 label: t('common.status'), 97 label: t('common.status'),
98 field: 'status', 98 field: 'status',
99 dictType: DICT_TYPE.COMMON_STATUS, 99 dictType: DICT_TYPE.COMMON_STATUS,
100 - dictData: 'number' 100 + dictClass: 'number'
101 }, 101 },
102 { 102 {
103 label: t('form.remark'), 103 label: t('form.remark'),
yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts
@@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -41,7 +41,7 @@ const crudSchemas = reactive<CrudSchema[]>([
41 label: t('common.status'), 41 label: t('common.status'),
42 field: 'status', 42 field: 'status',
43 dictType: DICT_TYPE.COMMON_STATUS, 43 dictType: DICT_TYPE.COMMON_STATUS,
44 - dictData: 'number' 44 + dictClass: 'number'
45 }, 45 },
46 { 46 {
47 label: t('common.createTime'), 47 label: t('common.createTime'),
yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
@@ -22,7 +22,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -22,7 +22,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
22 title: '错误码类型', 22 title: '错误码类型',
23 field: 'type', 23 field: 'type',
24 dictType: DICT_TYPE.SYSTEM_ERROR_CODE_TYPE, 24 dictType: DICT_TYPE.SYSTEM_ERROR_CODE_TYPE,
25 - dictData: 'number', 25 + dictClass: 'number',
26 isSearch: true 26 isSearch: true
27 }, 27 },
28 { 28 {
yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts
@@ -13,7 +13,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -13,7 +13,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
13 title: '日志类型', 13 title: '日志类型',
14 field: 'logType', 14 field: 'logType',
15 dictType: DICT_TYPE.SYSTEM_LOGIN_TYPE, 15 dictType: DICT_TYPE.SYSTEM_LOGIN_TYPE,
16 - dictData: 'number' 16 + dictClass: 'number'
17 }, 17 },
18 { 18 {
19 title: '用户名称', 19 title: '用户名称',
@@ -36,7 +36,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -36,7 +36,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
36 title: '登陆结果', 36 title: '登陆结果',
37 field: 'result', 37 field: 'result',
38 dictType: DICT_TYPE.SYSTEM_LOGIN_RESULT, 38 dictType: DICT_TYPE.SYSTEM_LOGIN_RESULT,
39 - dictData: 'number' 39 + dictClass: 'number'
40 }, 40 },
41 { 41 {
42 title: '登录日期', 42 title: '登录日期',
yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts
@@ -26,13 +26,13 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -26,13 +26,13 @@ const crudSchemas = reactive<VxeCrudSchema>({
26 title: '公告类型', 26 title: '公告类型',
27 field: 'type', 27 field: 'type',
28 dictType: DICT_TYPE.SYSTEM_NOTICE_TYPE, 28 dictType: DICT_TYPE.SYSTEM_NOTICE_TYPE,
29 - dictData: 'number' 29 + dictClass: 'number'
30 }, 30 },
31 { 31 {
32 title: t('common.status'), 32 title: t('common.status'),
33 field: 'status', 33 field: 'status',
34 dictType: DICT_TYPE.COMMON_STATUS, 34 dictType: DICT_TYPE.COMMON_STATUS,
35 - dictData: 'number', 35 + dictClass: 'number',
36 isSearch: true 36 isSearch: true
37 }, 37 },
38 { 38 {
yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts
@@ -45,7 +45,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -45,7 +45,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
45 title: t('common.status'), 45 title: t('common.status'),
46 field: 'status', 46 field: 'status',
47 dictType: DICT_TYPE.COMMON_STATUS, 47 dictType: DICT_TYPE.COMMON_STATUS,
48 - dictData: 'number', 48 + dictClass: 'number',
49 isSearch: true 49 isSearch: true
50 }, 50 },
51 { 51 {
yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts
@@ -26,7 +26,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -26,7 +26,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
26 title: '用户类型', 26 title: '用户类型',
27 field: 'userType', 27 field: 'userType',
28 dictType: DICT_TYPE.USER_TYPE, 28 dictType: DICT_TYPE.USER_TYPE,
29 - dictData: 'number', 29 + dictClass: 'number',
30 isSearch: true 30 isSearch: true
31 }, 31 },
32 { 32 {
yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts
@@ -21,7 +21,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -21,7 +21,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
21 title: '操作类型', 21 title: '操作类型',
22 field: 'type', 22 field: 'type',
23 dictType: DICT_TYPE.SYSTEM_OPERATE_TYPE, 23 dictType: DICT_TYPE.SYSTEM_OPERATE_TYPE,
24 - dictData: 'number', 24 + dictClass: 'number',
25 isSearch: true 25 isSearch: true
26 }, 26 },
27 { 27 {
yudao-ui-admin-vue3/src/views/system/post/post.data.ts
@@ -36,7 +36,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -36,7 +36,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
36 title: t('common.status'), 36 title: t('common.status'),
37 field: 'status', 37 field: 'status',
38 dictType: DICT_TYPE.COMMON_STATUS, 38 dictType: DICT_TYPE.COMMON_STATUS,
39 - dictData: 'number', 39 + dictClass: 'number',
40 isSearch: true 40 isSearch: true
41 }, 41 },
42 { 42 {
yudao-ui-admin-vue3/src/views/system/role/role.data.ts
@@ -27,7 +27,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -27,7 +27,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
27 title: '角色类型', 27 title: '角色类型',
28 field: 'type', 28 field: 'type',
29 dictType: DICT_TYPE.SYSTEM_ROLE_TYPE, 29 dictType: DICT_TYPE.SYSTEM_ROLE_TYPE,
30 - dictData: 'number' 30 + dictClass: 'number'
31 }, 31 },
32 { 32 {
33 title: '角色标识', 33 title: '角色标识',
@@ -42,7 +42,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -42,7 +42,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
42 title: t('common.status'), 42 title: t('common.status'),
43 field: 'status', 43 field: 'status',
44 dictType: DICT_TYPE.COMMON_STATUS, 44 dictType: DICT_TYPE.COMMON_STATUS,
45 - dictData: 'number', 45 + dictClass: 'number',
46 isSearch: true 46 isSearch: true
47 }, 47 },
48 { 48 {
yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts
@@ -39,7 +39,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -39,7 +39,7 @@ const crudSchemas = reactive<CrudSchema[]>([
39 label: t('common.status'), 39 label: t('common.status'),
40 field: 'status', 40 field: 'status',
41 dictType: DICT_TYPE.COMMON_STATUS, 41 dictType: DICT_TYPE.COMMON_STATUS,
42 - dictData: 'number', 42 + dictClass: 'number',
43 search: { 43 search: {
44 show: true 44 show: true
45 } 45 }
yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts
@@ -34,7 +34,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -34,7 +34,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
34 title: t('common.status'), 34 title: t('common.status'),
35 field: 'status', 35 field: 'status',
36 dictType: DICT_TYPE.COMMON_STATUS, 36 dictType: DICT_TYPE.COMMON_STATUS,
37 - dictData: 'number', 37 + dictClass: 'number',
38 isSearch: true 38 isSearch: true
39 }, 39 },
40 { 40 {
yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts
@@ -23,21 +23,21 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -23,21 +23,21 @@ const crudSchemas = reactive<VxeCrudSchema>({
23 title: '短信渠道', 23 title: '短信渠道',
24 field: 'channelId', 24 field: 'channelId',
25 dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, 25 dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
26 - dictData: 'number', 26 + dictClass: 'number',
27 isSearch: true 27 isSearch: true
28 }, 28 },
29 { 29 {
30 title: '发送状态', 30 title: '发送状态',
31 field: 'sendStatus', 31 field: 'sendStatus',
32 dictType: DICT_TYPE.SYSTEM_SMS_SEND_STATUS, 32 dictType: DICT_TYPE.SYSTEM_SMS_SEND_STATUS,
33 - dictData: 'number', 33 + dictClass: 'number',
34 isSearch: true 34 isSearch: true
35 }, 35 },
36 { 36 {
37 title: '接收状态', 37 title: '接收状态',
38 field: 'receiveStatus', 38 field: 'receiveStatus',
39 dictType: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, 39 dictType: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS,
40 - dictData: 'number', 40 + dictClass: 'number',
41 isSearch: true 41 isSearch: true
42 }, 42 },
43 { 43 {
@@ -49,7 +49,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -49,7 +49,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
49 title: '短信类型', 49 title: '短信类型',
50 field: 'templateType', 50 field: 'templateType',
51 dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, 51 dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE,
52 - dictData: 'number', 52 + dictClass: 'number',
53 isSearch: true 53 isSearch: true
54 }, 54 },
55 { 55 {
yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts
@@ -46,7 +46,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -46,7 +46,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
46 title: '短信类型', 46 title: '短信类型',
47 field: 'type', 47 field: 'type',
48 dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, 48 dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE,
49 - dictData: 'number', 49 + dictClass: 'number',
50 table: { 50 table: {
51 width: 80 51 width: 80
52 } 52 }
@@ -55,7 +55,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -55,7 +55,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
55 title: t('common.status'), 55 title: t('common.status'),
56 field: 'status', 56 field: 'status',
57 dictType: DICT_TYPE.COMMON_STATUS, 57 dictType: DICT_TYPE.COMMON_STATUS,
58 - dictData: 'number', 58 + dictClass: 'number',
59 table: { 59 table: {
60 width: 80 60 width: 80
61 } 61 }
yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts
@@ -105,7 +105,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -105,7 +105,7 @@ const crudSchemas = reactive<CrudSchema[]>([
105 label: '租户状态', 105 label: '租户状态',
106 field: 'status', 106 field: 'status',
107 dictType: DICT_TYPE.COMMON_STATUS, 107 dictType: DICT_TYPE.COMMON_STATUS,
108 - dictData: 'number', 108 + dictClass: 'number',
109 search: { 109 search: {
110 show: true 110 show: true
111 } 111 }
yudao-ui-admin-vue3/src/views/system/tenantPackage/tenantPackage.data.ts
@@ -39,7 +39,7 @@ const crudSchemas = reactive<CrudSchema[]>([ @@ -39,7 +39,7 @@ const crudSchemas = reactive<CrudSchema[]>([
39 label: t('common.status'), 39 label: t('common.status'),
40 field: 'status', 40 field: 'status',
41 dictType: DICT_TYPE.COMMON_STATUS, 41 dictType: DICT_TYPE.COMMON_STATUS,
42 - dictData: 'number', 42 + dictClass: 'number',
43 search: { 43 search: {
44 show: true 44 show: true
45 } 45 }
yudao-ui-admin-vue3/src/views/system/user/user.data.ts
@@ -68,7 +68,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ @@ -68,7 +68,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
68 title: t('common.status'), 68 title: t('common.status'),
69 field: 'status', 69 field: 'status',
70 dictType: DICT_TYPE.COMMON_STATUS, 70 dictType: DICT_TYPE.COMMON_STATUS,
71 - dictData: 'number', 71 + dictClass: 'number',
72 isSearch: true 72 isSearch: true
73 }, 73 },
74 { 74 {