From c1be4339d6688cfd03aab2556389cb1dfd0a4c00 Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Wed, 15 Mar 2023 14:33:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81bpmnjs=E4=B8=ADtemplate=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=86=99=E6=B3=A8=E9=87=8A=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5=E9=94=99=202=E3=80=81=E7=A7=9F?=
 =?UTF-8?q?=E5=AE=A2=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E5=AF=86=E7=A0=81=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multi-instance/ElementMultiInstance.vue   |  2 --
 src/views/system/tenant/index.vue             | 25 ++++++++++++++++++-
 src/views/system/tenant/tenant.data.ts        |  6 ++---
 src/views/system/user/user.data.ts            |  7 ++++++
 4 files changed, 33 insertions(+), 7 deletions(-)

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 @@
     <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>
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<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: '账号额度',
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<VxeCrudSchema>({
         component: 'InputPassword'
       }
     },
+    {
+      title: '用户' + t('profile.user.sex'),
+      field: 'sex',
+      dictType: DICT_TYPE.SYSTEM_USER_SEX,
+      dictClass: 'number',
+      table: { show: false }
+    },
     {
       title: '用户昵称',
       field: 'nickname'

From 629c177c996c93295ba3a8d10a72d2a3441ac44d Mon Sep 17 00:00:00 2001
From: gexinzhineng/gxzn27 <1348660141@qq.com>
Date: Wed, 15 Mar 2023 18:09:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=BA=94=E7=94=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BC=BA=E5=B0=91=E5=AD=97=E6=AE=B5=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E4=BA=86=202=E3=80=81=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=A8=A1=E6=9D=BF=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=203=E3=80=81=E7=9F=AD=E4=BF=A1=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=204=E3=80=81=E5=9F=BA=E7=A1=80=E8=AE=BE=E6=96=BD=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E5=88=87=E6=8D=A2=E6=9A=82=E6=97=A0=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=85=88=E6=B3=A8=E9=87=8A=EF=BC=8C=E7=94=9F=E6=88=90json?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96=205=E3=80=81?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A1=A8=E6=A0=BC=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=93=BE=E8=B7=AF=E5=9C=B0=E5=9D=80=EF=BC=88=E5=90=8Cvue2?=
 =?UTF-8?q?=EF=BC=89=206=E3=80=81=E6=90=9C=E7=B4=A2=E6=A1=86=E5=89=8D?=
 =?UTF-8?q?=E5=AD=97=E5=AE=BD=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/sms/smsLog/index.ts            |  2 +-
 src/components/XTable/src/XTable.vue          |  2 +-
 .../infra/apiAccessLog/apiAccessLog.data.ts   |  3 +-
 src/views/infra/build/index.vue               | 16 ++++++-----
 src/views/system/oauth2/client/client.data.ts |  4 +++
 .../sms/smsTemplate/sms.template.data.ts      | 28 ++++++++++++++++++-
 6 files changed, 44 insertions(+), 11 deletions(-)

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/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<VxeCrudSchema>({
   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 @@
           <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) => {
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<VxeCrudSchema>({
   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<VxeCrudSchema>({
   action: true,
   actionWidth: '280',
   columns: [
+    {
+      title: '短信渠道编码',
+      field: 'channelId',
+      isSearch: false,
+      isForm: true,
+      isTable: false,
+      form: {
+        component: 'Select',
+        componentProps: {
+          options: tenantPackageOption
+        }
+      }
+    },
     {
       title: '模板编码',
       field: 'code',