!32 测试人员所提bug修改

Merge pull request !32 from 周建/master
2023-03-15 12:24:52 +00:00 · 2023-03-15 12:24:52 +00:00 · aad49fd5e9
commit aad49fd5e9
parent f9f3c2040f 629c177c99
10 changed files with 77 additions and 18 deletions
--- 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 })
 }
--- 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
    }
--- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@ -3,10 +3,8 @@
    <el-form label-width="90px">
      <el-form-item label="回路特性">
        <el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
-          <!--bpmn:MultiInstanceLoopCharacteristics-->
          <el-option label="并行多重事件" value="ParallelMultiInstance" />
          <el-option label="时序多重事件" value="SequentialMultiInstance" />
-          <!--bpmn:StandardLoopCharacteristics-->
          <el-option label="循环事件" value="StandardLoop" />
          <el-option label="无" value="Null" />
        </el-select>
--- a/src/views/infra/apiAccessLog/apiAccessLog.data.ts
+++ b/src/views/infra/apiAccessLog/apiAccessLog.data.ts
@ -10,7 +10,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
  columns: [
    {
      title: '链路追踪',
-      field: 'traceId'
+      field: 'traceId',
+      isTable: false
    },
    {
      title: '用户编号',
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
@ -8,7 +8,7 @@
          <el-button size="small" type="primary" @click="showJson">生成JSON</el-button>
          <el-button size="small" type="success" @click="showOption">生成Options</el-button>
          <el-button size="small" type="danger" @click="showTemplate">生成组件</el-button>
-          <el-button size="small" @click="changeLocale">中英切换</el-button>
+          <!-- <el-button size="small" @click="changeLocale">中英切换</el-button> -->
        </div>
      </el-col>
      <el-col>
@ -19,9 +19,11 @@
      <div ref="editor" v-if="dialogVisible">
        <XTextButton style="float: right" :title="t('common.copy')" @click="copy(formValue)" />
        <el-scrollbar height="580">
-          <pre>
-            {{ formValue }}
-          </pre>
+          <div v-highlight>
+            <code class="hljs">
+              {{ formValue }}
+            </code>
+          </div>
        </el-scrollbar>
      </div>
      <span style="color: red" v-if="err">输入内容格式有误!</span>
@ -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) => {
--- 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<VxeCrudSchema>({
  primaryType: null,
  action: true,
  columns: [
+    {
+      title: '客户端端号',
+      field: 'clientId'
+    },
    {
      title: '客户端密钥',
      field: 'secret'
--- 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<VxeCrudSchema>({
  action: true,
  actionWidth: '280',
  columns: [
+    {
+      title: '短信渠道编码',
+      field: 'channelId',
+      isSearch: false,
+      isForm: true,
+      isTable: false,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: tenantPackageOption
+        }
+      }
+    },
    {
      title: '模板编码',
      field: 'code',
--- 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)
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@ -123,8 +123,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
      title: '用户名称',
      field: 'username',
      isTable: false,
-      isDetail: false,
-      isForm: false
+      isDetail: false
    },
    {
      title: '用户密码',
@ -133,8 +132,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
      isDetail: false,
      form: {
        component: 'InputPassword'
-      },
-      isForm: false
+      }
    },
    {
      title: '账号额度',
--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
@ -60,6 +60,13 @@ const crudSchemas = reactive<VxeCrudSchema>({
        component: 'InputPassword'
      }
    },
+    {
+      title: '用户' + t('profile.user.sex'),
+      field: 'sex',
+      dictType: DICT_TYPE.SYSTEM_USER_SEX,
+      dictClass: 'number',
+      table: { show: false }
+    },
    {
      title: '用户昵称',
      field: 'nickname'