!27 修改测试所提bug

Merge pull request !27 from 周建/master

!27 修改测试所提bug
Merge pull request !27 from 周建/master
f9f3c204 · 芋道源码 · Gitee · 2323946c · be6e307b · f9f3c204
Commit f9f3c204 authored Mar 14, 2023 by 芋道源码 Committed by Gitee Mar 14, 2023
13 changed files
--- a/src/views/bpm/form/form.data.ts
+++ b/src/views/bpm/form/form.data.ts
@@ -10,7 +10,7 @@ export const rules = reactive({
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '表单编号',
  action: true,
  columns: [

--- a/src/views/infra/apiAccessLog/apiAccessLog.data.ts
+++ b/src/views/infra/apiAccessLog/apiAccessLog.data.ts
@@ -3,7 +3,7 @@ import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '日志编号',
  action: true,
  actionWidth: '80px',

--- a/src/views/infra/apiErrorLog/apiErrorLog.data.ts
+++ b/src/views/infra/apiErrorLog/apiErrorLog.data.ts
@@ -3,7 +3,7 @@ import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '日志编号',
  action: true,
  actionWidth: '300',

--- a/src/views/infra/fileConfig/fileConfig.data.ts
+++ b/src/views/infra/fileConfig/fileConfig.data.ts
@@ -23,7 +23,7 @@ export const rules = reactive({
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '配置编号',
  action: true,
  actionWidth: '400px',

--- a/src/views/infra/job/JobLog.vue
+++ b/src/views/infra/job/JobLog.vue
@@ -70,7 +70,7 @@ const detailData = ref() // 详情 Ref
 // 详情操作
 const handleDetail = async (row: JobLogApi.JobLogVO) => {
  // 设置数据
-  const res = JobLogApi.getJobLogApi(row.id)
+  const res = await JobLogApi.getJobLogApi(row.id)
  detailData.value = res
  dialogTitle.value = t('action.detail')
  dialogVisible.value = true

--- a/src/views/infra/job/job.data.ts
+++ b/src/views/infra/job/job.data.ts
@@ -11,7 +11,7 @@ export const rules = reactive({
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '任务编号',
  action: true,
  actionWidth: '280px',

--- a/src/views/infra/job/jobLog.data.ts
+++ b/src/views/infra/job/jobLog.data.ts
@@ -4,7 +4,7 @@ const { t } = useI18n()
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
-  primaryType: 'seq',
+  primaryType: 'id',
  primaryTitle: '日志编号',
  action: true,
  columns: [

--- a/src/views/system/sms/smsChannel/sms.channel.data.ts
+++ b/src/views/system/sms/smsChannel/sms.channel.data.ts
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 const { t } = useI18n() // 国际化
+const authorizedGrantOptions = getStrDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE)
 // 表单校验
 export const rules = reactive({
  signature: [required],
@@ -24,8 +28,17 @@ const crudSchemas = reactive<VxeCrudSchema>({
    {
      title: '渠道编码',
      field: 'code',
-      dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
+      // dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
-      isSearch: true
+      // dictClass: 'string',
+      isSearch: true,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: authorizedGrantOptions,
+          multiple: false,
+          filterable: true
+        }
+      }
    },
    {
      title: t('common.status'),

--- a/src/views/system/sms/smsLog/index.vue
+++ b/src/views/system/sms/smsLog/index.vue
@@ -44,12 +44,13 @@ const [registerTable, { exportList }] = useXTable({
 // 弹窗相关的变量
 const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('edit') // 弹出层标题
+const dialogTitle = ref(t('action.detail')) // 弹出层标题
 const actionType = ref('') // 操作按钮的类型
 // ========== 详情相关 ==========
 const detailData = ref() // 详情 Ref
 const handleDetail = (row: SmsLoglApi.SmsLogVO) => {
  // 设置数据
+  actionType.value = 'detail'
  detailData.value = row
  dialogVisible.value = true
 }

--- a/src/views/system/sms/smsLog/sms.log.data.ts
+++ b/src/views/system/sms/smsLog/sms.log.data.ts
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 const { t } = useI18n() // 国际化
+const authorizedGrantOptions = getStrDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE)
 // CrudSchema
 const crudSchemas = reactive<VxeCrudSchema>({
  primaryKey: 'id',
@@ -25,9 +28,17 @@ const crudSchemas = reactive<VxeCrudSchema>({
    {
      title: '短信渠道',
      field: 'channelId',
-      dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
+      // dictType: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE,
-      dictClass: 'number',
+      // dictClass: 'number',
-      isSearch: true
+      isSearch: true,
+      // table: {
+      // component: 'Select',
+      componentProps: {
+        options: authorizedGrantOptions
+        // multiple: false,
+        // filterable: true
+      }
+      // }
    },
    {
      title: '发送状态',

--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -19,12 +19,44 @@ const getTenantPackageOptions = async () => {
 }
 getTenantPackageOptions()
+const validateName = (rule: any, value: any, callback: any) => {
+  const reg = /^[a-zA-Z0-9]{4,30}$/
+  if (value === '') {
+    callback(new Error('请输入用户名称'))
+  } else {
+    console.log(reg.test(rule), 'reg.test(rule)')
+    if (!reg.test(value)) {
+      callback(new Error('用户名称由 数字、字母 组成'))
+    } else {
+      callback()
+    }
+  }
+}
+const validateMobile = (rule: any, value: any, callback: any) => {
+  const reg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+  if (value === '') {
+    callback(new Error('请输入联系手机'))
+  } else {
+    if (!reg.test(value)) {
+      callback(new Error('请输入正确的手机号'))
+    } else {
+      callback()
+    }
+  }
+}
 // 表单校验
 export const rules = reactive({
  name: [required],
  packageId: [required],
  contactName: [required],
-  contactMobile: [required],
+  contactMobile: [
+    required,
+    {
+      validator: validateMobile,
+      trigger: 'blur'
+    }
+  ],
  accountCount: [required],
  expireTime: [required],
  username: [
@@ -34,7 +66,8 @@ export const rules = reactive({
      max: 30,
      trigger: 'blur',
      message: '用户名称长度为 4-30 个字符'
-    }
+    },
+    { validator: validateName, trigger: 'blur' }
  ],
  password: [
    required,
@@ -90,7 +123,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
      title: '用户名称',
      field: 'username',
      isTable: false,
-      isDetail: false
+      isDetail: false,
+      isForm: false
    },
    {
      title: '用户密码',
@@ -99,7 +133,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
      isDetail: false,
      form: {
        component: 'InputPassword'
-      }
+      },
+      isForm: false
    },
    {
      title: '账号额度',

--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -15,7 +15,6 @@
        <XTextButton preIcon="ep:delete" :title="t('action.del')" @click="deleteData(row.id)" />
      </template>
    </XTable>
-  </ContentWrap>
    <XModal v-model="dialogVisible" :title="dialogTitle">
      <!-- 对话框(添加 / 修改) -->
      <Form
@@ -25,7 +24,7 @@
        ref="formRef"
      >
        <template #menuIds>
-        <el-card>
+          <el-card class="cardHeight">
            <template #header>
              <div class="card-header">
                全选/全不选:
@@ -44,7 +43,7 @@
              show-checkbox
              :props="defaultProps"
              :data="menuOptions"
-            empty-text="加载中，请稍后"
+              empty-text="加载中，请稍候"
            />
          </el-card>
        </template>
@@ -63,6 +62,7 @@
        <XButton :loading="loading" :title="t('dialog.close')" @click="dialogVisible = false" />
      </template>
    </XModal>
+  </ContentWrap>
 </template>
 <script setup lang="ts" name="TenantPackage">
 import { handleTree, defaultProps } from '@/utils/tree'
@@ -179,7 +179,7 @@ onMounted(async () => {
 // getList()
 </script>
 <style scoped>
-.el-card {
+.cardHeight {
  width: 100%;
  max-height: 400px;
  overflow-y: scroll;

--- a/src/views/system/user/user.data.ts
+++ b/src/views/system/user/user.data.ts
 import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
 // 国际化
 const { t } = useI18n()
+const validateMobile = (rule: any, value: any, callback: any) => {
+  const reg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+  if (value === '') {
+    callback(new Error('请输入联系手机'))
+  } else {
+    if (!reg.test(value)) {
+      callback(new Error('请输入正确的手机号'))
+    } else {
+      callback()
+    }
+  }
+}
 // 表单校验
 export const rules = reactive({
  username: [required],
@@ -17,12 +29,13 @@ export const rules = reactive({
  ],
  status: [required],
  mobile: [
+    required,
    {
-      required: true,
      len: 11,
      trigger: 'blur',
      message: '请输入正确的手机号码'
-    }
+    },
+    { validator: validateMobile, trigger: 'blur' }
  ]
 })
 // crudSchemas