Browse Source

1、bpmnjs中template中不能写注释,会导致报错
2、租客列表添加显示账号密码,修改不显示

gexinzhineng/gxzn27 2 năm trước cách đây
mục cha
commit
c1be4339d6

+ 0 - 2
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>

+ 24 - 1
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)

+ 2 - 4
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: '账号额度',

+ 7 - 0
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'