diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index a0f09eff3..148e69f89 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -44,34 +44,34 @@ spring: primary: master datasource: master: - name: ruoyi-vue-pro - 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 连接的示例 + name: pro + 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 连接的示例 # 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 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例 - username: root - password: 123456 + username: luoqi + password: luoqikeji # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W slave: # 模拟从库,可根据自己需要修改 - name: ruoyi-vue-pro - 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 连接的示例 + name: pro + 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 连接的示例 # 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 连接的示例 # url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例 # url: jdbc:oracle:thin:@127.0.0.1:1521:xe # Oracle 连接的示例 # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例 - username: root - password: 123456 + username: luoqi + password: luoqikeji # username: sa # password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: - host: 127.0.0.1 # 地址 + host: 39.107.87.6 # 地址 port: 6379 # 端口 - database: 0 # 数据库索引 -# password: 123456 # 密码,建议生产环境开启 + database: 10 # 数据库索引 + password: xingyu4j # 密码,建议生产环境开启 --- #################### 定时任务相关配置 #################### diff --git a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts index 9ce88605d..402973247 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts @@ -17,7 +17,7 @@ export type CrudSchema = Omit & { detail?: CrudDescriptionsParams // 详情的详细配置 children?: CrudSchema[] dictType?: string // 字典类型 - dictData?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean + dictClass?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean } type CrudSearchParams = { @@ -157,11 +157,11 @@ const filterFormSchema = (crudSchema: CrudSchema[]): FormSchema[] => { let comonentProps = {} if (schemaItem.dictType) { const options: ComponentOptions[] = [] - if (schemaItem.dictData && schemaItem.dictData === 'number') { + if (schemaItem.dictClass && schemaItem.dictClass === 'number') { getIntDictOptions(schemaItem.dictType).forEach((dict) => { options.push(dict) }) - } else if (schemaItem.dictData && schemaItem.dictData === 'boolean') { + } else if (schemaItem.dictClass && schemaItem.dictClass === 'boolean') { getBoolDictOptions(schemaItem.dictType).forEach((dict) => { options.push(dict) }) diff --git a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts index 5d822e2bc..141816379 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useVxeCrudSchemas.ts @@ -38,7 +38,7 @@ type VxeCrudColumns = Omit & { print?: CrudPrintParams // vxe 打印的字段 children?: VxeCrudColumns[] // 子级 dictType?: string // 字典类型 - dictData?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean + dictClass?: 'string' | 'number' | 'boolean' // 字典数据类型 string | number | boolean } type CrudSearchParams = { @@ -239,11 +239,11 @@ const filterFormSchema = (crudSchema: VxeCrudSchema): FormSchema[] => { let comonentProps = {} if (schemaItem.dictType) { const options: ComponentOptions[] = [] - if (schemaItem.dictData && schemaItem.dictData === 'number') { + if (schemaItem.dictClass && schemaItem.dictClass === 'number') { getIntDictOptions(schemaItem.dictType).forEach((dict) => { options.push(dict) }) - } else if (schemaItem.dictData && schemaItem.dictData === 'boolean') { + } else if (schemaItem.dictClass && schemaItem.dictClass === 'boolean') { getBoolDictOptions(schemaItem.dictType).forEach((dict) => { options.push(dict) }) diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts b/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts index 3b5eddd45..463a87ba2 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts @@ -34,7 +34,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number' + dictClass: 'number' }, { label: '备注', diff --git a/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts b/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts index 76dd7d9d5..684f55018 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts @@ -42,7 +42,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number' + dictClass: 'number' }, { label: '备注', diff --git a/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts b/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts index 842ea092f..9ae9c8b58 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/model/model.data.ts @@ -41,7 +41,7 @@ const crudSchemas = reactive([ label: '流程分类', field: 'category', dictType: DICT_TYPE.BPM_MODEL_CATEGORY, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts index d979dc6e8..ce363a131 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/processInstance/process.data.ts @@ -28,7 +28,7 @@ const crudSchemas = reactive([ label: '流程分类', field: 'category', dictType: DICT_TYPE.BPM_MODEL_CATEGORY, - dictData: 'number', + dictClass: 'number', search: { show: true } @@ -41,7 +41,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } @@ -50,7 +50,7 @@ const crudSchemas = reactive([ label: '结果', field: 'result', dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/bpm/task/done/done.data.ts b/yudao-ui-admin-vue3/src/views/bpm/task/done/done.data.ts index 3bcb5f2c5..aa7ce9355 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/task/done/done.data.ts +++ b/yudao-ui-admin-vue3/src/views/bpm/task/done/done.data.ts @@ -30,7 +30,7 @@ const crudSchemas = reactive([ label: '结果', field: 'result', dictType: DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, - dictData: 'number' + dictClass: 'number' }, { label: '审批意见', diff --git a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts index 832cdfd6a..8a68db0ca 100644 --- a/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/apiAccessLog/apiAccessLog.data.ts @@ -26,7 +26,7 @@ const crudSchemas = reactive([ label: '用户类型', field: 'userType', dictType: DICT_TYPE.USER_TYPE, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts index db41b275d..e4fa53094 100644 --- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/apiErrorLog.data.ts @@ -69,7 +69,7 @@ const crudSchemas = reactive([ label: '处理状态', field: 'processStatus', dictType: DICT_TYPE.INFRA_API_ERROR_LOG_PROCESS_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts b/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts index 8912a8e75..3dfc44157 100644 --- a/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/config/config.data.ts @@ -52,7 +52,7 @@ const crudSchemas = reactive([ label: '系统内置', field: 'type', dictType: DICT_TYPE.INFRA_CONFIG_TYPE, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts b/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts index 2aa9b3be5..11cf0bdb4 100644 --- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/fileConfig.data.ts @@ -48,7 +48,7 @@ const crudSchemas = reactive([ label: '存储器', field: 'storage', dictType: DICT_TYPE.INFRA_FILE_STORAGE, - dictData: 'number', + dictClass: 'number', search: { show: true } @@ -57,7 +57,7 @@ const crudSchemas = reactive([ label: '主配置', field: 'primary', dictType: DICT_TYPE.INFRA_BOOLEAN_STRING, - dictData: 'number' + dictClass: 'number' }, { label: t('form.remark'), diff --git a/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts b/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts index 9cac9b055..fc0d098c9 100644 --- a/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/job/job.data.ts @@ -37,7 +37,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.INFRA_JOB_STATUS, - dictData: 'number', + dictClass: 'number', form: { show: false }, diff --git a/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts b/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts index 8998cec26..4bffcb5bb 100644 --- a/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts +++ b/yudao-ui-admin-vue3/src/views/infra/job/jobLog.data.ts @@ -74,7 +74,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.INFRA_JOB_LOG_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts b/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts index ac3b0a579..62c8a7a3f 100644 --- a/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts +++ b/yudao-ui-admin-vue3/src/views/pay/app/app.data.ts @@ -45,7 +45,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts b/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts index f079f487a..1193ef151 100644 --- a/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts +++ b/yudao-ui-admin-vue3/src/views/pay/merchant/merchant.data.ts @@ -51,7 +51,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts b/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts index f4c4fbeaa..212063f01 100644 --- a/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts +++ b/yudao-ui-admin-vue3/src/views/pay/order/order.data.ts @@ -83,7 +83,7 @@ const crudSchemas = reactive([ label: '回调商户状态', field: 'notifyStatus', dictType: DICT_TYPE.PAY_ORDER_NOTIFY_STATUS, - dictData: 'number' + dictClass: 'number' }, { label: '支付金额', @@ -110,7 +110,7 @@ const crudSchemas = reactive([ label: '支付状态', field: 'status', dictType: DICT_TYPE.PAY_ORDER_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } @@ -139,7 +139,7 @@ const crudSchemas = reactive([ label: '退款状态', field: 'refundStatus', dictType: DICT_TYPE.PAY_ORDER_REFUND_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts b/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts index 42981e95d..e92c2106b 100644 --- a/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts +++ b/yudao-ui-admin-vue3/src/views/pay/refund/refund.data.ts @@ -67,7 +67,7 @@ const crudSchemas = reactive([ label: '退款类型', field: 'type', dictType: DICT_TYPE.PAY_REFUND_ORDER_TYPE, - dictData: 'number', + dictClass: 'number', search: { show: true } @@ -76,7 +76,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.PAY_REFUND_ORDER_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts index f8898030c..7eca4f62b 100644 --- a/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts @@ -65,7 +65,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true } ] diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts index cceb991d5..d07683f15 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.data.ts @@ -97,7 +97,7 @@ export const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number' + dictClass: 'number' }, { label: t('form.remark'), diff --git a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts index bfe6909d3..08dd41397 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts +++ b/yudao-ui-admin-vue3/src/views/system/dict/dict.type.ts @@ -41,7 +41,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number' + dictClass: 'number' }, { label: t('common.createTime'), diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts index 918fa8353..ce53b3382 100644 --- a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts @@ -22,7 +22,7 @@ const crudSchemas = reactive({ title: '错误码类型', field: 'type', dictType: DICT_TYPE.SYSTEM_ERROR_CODE_TYPE, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts index b6bfd3101..e241062e2 100644 --- a/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/loginlog/loginLog.data.ts @@ -13,7 +13,7 @@ const crudSchemas = reactive({ title: '日志类型', field: 'logType', dictType: DICT_TYPE.SYSTEM_LOGIN_TYPE, - dictData: 'number' + dictClass: 'number' }, { title: '用户名称', @@ -36,7 +36,7 @@ const crudSchemas = reactive({ title: '登陆结果', field: 'result', dictType: DICT_TYPE.SYSTEM_LOGIN_RESULT, - dictData: 'number' + dictClass: 'number' }, { title: '登录日期', diff --git a/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts b/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts index bbf7b53ae..ad22b5967 100644 --- a/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/notice/notice.data.ts @@ -26,13 +26,13 @@ const crudSchemas = reactive({ title: '公告类型', field: 'type', dictType: DICT_TYPE.SYSTEM_NOTICE_TYPE, - dictData: 'number' + dictClass: 'number' }, { title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts b/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts index 73f02b63b..5de8f5e3d 100644 --- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts @@ -45,7 +45,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts b/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts index e5e108382..66c2ee85b 100644 --- a/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/oauth2/token/token.data.ts @@ -26,7 +26,7 @@ const crudSchemas = reactive({ title: '用户类型', field: 'userType', dictType: DICT_TYPE.USER_TYPE, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts index a2424228f..fc386f59d 100644 --- a/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/operatelog/operatelog.data.ts @@ -21,7 +21,7 @@ const crudSchemas = reactive({ title: '操作类型', field: 'type', dictType: DICT_TYPE.SYSTEM_OPERATE_TYPE, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts index 438ca69aa..49d7c7ee2 100644 --- a/yudao-ui-admin-vue3/src/views/system/post/post.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/post/post.data.ts @@ -36,7 +36,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts index 535096470..1108a29dd 100644 --- a/yudao-ui-admin-vue3/src/views/system/role/role.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/role/role.data.ts @@ -27,7 +27,7 @@ const crudSchemas = reactive({ title: '角色类型', field: 'type', dictType: DICT_TYPE.SYSTEM_ROLE_TYPE, - dictData: 'number' + dictClass: 'number' }, { title: '角色标识', @@ -42,7 +42,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts index a5dde8174..0b0864644 100644 --- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/sensitiveWord.data.ts @@ -39,7 +39,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts index 72f83568b..e87cb5746 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/sms.channel.data.ts @@ -34,7 +34,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts index 585ae5eff..0936f8e37 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsLog/sms.log.data.ts @@ -23,21 +23,21 @@ const crudSchemas = reactive({ title: '短信渠道', field: 'channelId', dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, - dictData: 'number', + dictClass: 'number', isSearch: true }, { title: '发送状态', field: 'sendStatus', dictType: DICT_TYPE.SYSTEM_SMS_SEND_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { title: '接收状态', field: 'receiveStatus', dictType: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, { @@ -49,7 +49,7 @@ const crudSchemas = reactive({ title: '短信类型', field: 'templateType', dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, - dictData: 'number', + dictClass: 'number', isSearch: true }, { diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts index 39dc35760..619425f41 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/sms.template.data.ts @@ -46,7 +46,7 @@ const crudSchemas = reactive({ title: '短信类型', field: 'type', dictType: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, - dictData: 'number', + dictClass: 'number', table: { width: 80 } @@ -55,7 +55,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', table: { width: 80 } diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts index bf7951c35..ef88848ff 100644 --- a/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/tenant/tenant.data.ts @@ -105,7 +105,7 @@ const crudSchemas = reactive([ label: '租户状态', field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/system/tenantPackage/tenantPackage.data.ts b/yudao-ui-admin-vue3/src/views/system/tenantPackage/tenantPackage.data.ts index eaaabd3e9..500bc8ae3 100644 --- a/yudao-ui-admin-vue3/src/views/system/tenantPackage/tenantPackage.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/tenantPackage/tenantPackage.data.ts @@ -39,7 +39,7 @@ const crudSchemas = reactive([ label: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', search: { show: true } diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts index fd32aab38..719e04c4e 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts @@ -68,7 +68,7 @@ const crudSchemas = reactive({ title: t('common.status'), field: 'status', dictType: DICT_TYPE.COMMON_STATUS, - dictData: 'number', + dictClass: 'number', isSearch: true }, {