diff --git a/src/api/system/sms/smsLog/index.ts b/src/api/system/sms/smsLog/index.ts index 52594b90..863eabb6 100644 --- a/src/api/system/sms/smsLog/index.ts +++ b/src/api/system/sms/smsLog/index.ts @@ -53,5 +53,5 @@ export const getSmsLogPageApi = (params: SmsLogPageReqVO) => { // 导出短信日志 export const exportSmsLogApi = (params: SmsLogExportReqVO) => { - return request.download({ url: '/system/sms-log/export', params }) + return request.download({ url: '/system/sms-log/export-excel', params }) } diff --git a/src/components/XTable/src/XTable.vue b/src/components/XTable/src/XTable.vue index 451d3d30..55c7b129 100644 --- a/src/components/XTable/src/XTable.vue +++ b/src/components/XTable/src/XTable.vue @@ -128,7 +128,7 @@ const getColumnsConfig = (options: XTableProps) => { proxyForm = true options.formConfig = { enabled: true, - titleWidth: 100, + titleWidth: 180, titleAlign: 'right', items: allSchemas.searchSchema } diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue index 962234d5..2e5bc8a7 100644 --- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue +++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue @@ -3,10 +3,8 @@ - - diff --git a/src/views/infra/apiAccessLog/apiAccessLog.data.ts b/src/views/infra/apiAccessLog/apiAccessLog.data.ts index b2d9786d..cb9e97a7 100644 --- a/src/views/infra/apiAccessLog/apiAccessLog.data.ts +++ b/src/views/infra/apiAccessLog/apiAccessLog.data.ts @@ -10,7 +10,8 @@ const crudSchemas = reactive({ columns: [ { title: '链路追踪', - field: 'traceId' + field: 'traceId', + isTable: false }, { title: '用户编号', diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue index 7da88f8c..6f577e95 100644 --- a/src/views/infra/build/index.vue +++ b/src/views/infra/build/index.vue @@ -8,7 +8,7 @@ 生成JSON 生成Options 生成组件 - 中英切换 + @@ -19,9 +19,11 @@
-
-            {{ formValue }}
-          
+
+ + {{ formValue }} + +
输入内容格式有误! @@ -69,9 +71,9 @@ const showTemplate = () => { type.value = 2 formValue.value = makeTemplate() } -const changeLocale = () => { - console.info('changeLocale') -} +// const changeLocale = () => { +// console.info('changeLocale') +// } /** 复制 **/ const copy = async (text: string) => { diff --git a/src/views/system/oauth2/client/client.data.ts b/src/views/system/oauth2/client/client.data.ts index 5f84e811..52ee8895 100644 --- a/src/views/system/oauth2/client/client.data.ts +++ b/src/views/system/oauth2/client/client.data.ts @@ -22,6 +22,10 @@ const crudSchemas = reactive({ primaryType: null, action: true, columns: [ + { + title: '客户端端号', + field: 'clientId' + }, { title: '客户端密钥', field: 'secret' diff --git a/src/views/system/sms/smsTemplate/sms.template.data.ts b/src/views/system/sms/smsTemplate/sms.template.data.ts index 514a503a..6178d6c2 100644 --- a/src/views/system/sms/smsTemplate/sms.template.data.ts +++ b/src/views/system/sms/smsTemplate/sms.template.data.ts @@ -1,6 +1,19 @@ import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas' +import * as smsApi from '@/api/system/sms/smsChannel' const { t } = useI18n() // 国际化 - +const tenantPackageOption = [] +const getTenantPackageOptions = async () => { + const res = await smsApi.getSimpleSmsChannels() + console.log(res, 'resresres') + res.forEach((tenantPackage: TenantPackageVO) => { + tenantPackageOption.push({ + key: tenantPackage.id, + value: tenantPackage.id, + label: tenantPackage.signature + }) + }) +} +getTenantPackageOptions() // 表单校验 export const rules = reactive({ type: [required], @@ -20,6 +33,19 @@ const crudSchemas = reactive({ action: true, actionWidth: '280', columns: [ + { + title: '短信渠道编码', + field: 'channelId', + isSearch: false, + isForm: true, + isTable: false, + form: { + component: 'Select', + componentProps: { + options: tenantPackageOption + } + } + }, { title: '模板编码', field: 'code', diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue index 20c697d6..bb1ca1a3 100644 --- a/src/views/system/tenant/index.vue +++ b/src/views/system/tenant/index.vue @@ -123,14 +123,37 @@ const setDialogTile = (type: string) => { } // 新增操作 -const handleCreate = () => { +const handleCreate = async () => { // 重置表单 setDialogTile('create') + await nextTick() + console.log(allSchemas.formSchema, 'allSchemas.formSchema') + if (allSchemas.formSchema[4].field !== 'username') { + unref(formRef)?.addSchema( + { + field: 'username', + label: '用户名称', + component: 'Input' + }, + 0 + ) + unref(formRef)?.addSchema( + { + field: 'password', + label: '用户密码', + component: 'InputPassword' + }, + 1 + ) + } } // 修改操作 const handleUpdate = async (rowId: number) => { setDialogTile('update') + await nextTick() + unref(formRef)?.delSchema('username') + unref(formRef)?.delSchema('password') // 设置数据 const res = await TenantApi.getTenantApi(rowId) unref(formRef)?.setValues(res) diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts index adda1807..1137b44a 100644 --- a/src/views/system/tenant/tenant.data.ts +++ b/src/views/system/tenant/tenant.data.ts @@ -123,8 +123,7 @@ const crudSchemas = reactive({ title: '用户名称', field: 'username', isTable: false, - isDetail: false, - isForm: false + isDetail: false }, { title: '用户密码', @@ -133,8 +132,7 @@ const crudSchemas = reactive({ isDetail: false, form: { component: 'InputPassword' - }, - isForm: false + } }, { title: '账号额度', diff --git a/src/views/system/user/user.data.ts b/src/views/system/user/user.data.ts index 59a795e7..3a702c04 100644 --- a/src/views/system/user/user.data.ts +++ b/src/views/system/user/user.data.ts @@ -60,6 +60,13 @@ const crudSchemas = reactive({ component: 'InputPassword' } }, + { + title: '用户' + t('profile.user.sex'), + field: 'sex', + dictType: DICT_TYPE.SYSTEM_USER_SEX, + dictClass: 'number', + table: { show: false } + }, { title: '用户昵称', field: 'nickname'