Skip to content

Commit c1be433

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

File tree

4 files changed

+33
-7
lines changed

4 files changed

+33
-7
lines changed

src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
<el-form label-width="90px">
44
<el-form-item label="回路特性">
55
<el-select v-model="loopCharacteristics" @change="changeLoopCharacteristicsType">
6-
<!--bpmn:MultiInstanceLoopCharacteristics-->
76
<el-option label="并行多重事件" value="ParallelMultiInstance" />
87
<el-option label="时序多重事件" value="SequentialMultiInstance" />
9-
<!--bpmn:StandardLoopCharacteristics-->
108
<el-option label="循环事件" value="StandardLoop" />
119
<el-option label="" value="Null" />
1210
</el-select>

src/views/system/tenant/index.vue

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,37 @@ const setDialogTile = (type: string) => {
123123
}
124124
125125
// 新增操作
126-
const handleCreate = () => {
126+
const handleCreate = async () => {
127127
// 重置表单
128128
setDialogTile('create')
129+
await nextTick()
130+
console.log(allSchemas.formSchema, 'allSchemas.formSchema')
131+
if (allSchemas.formSchema[4].field !== 'username') {
132+
unref(formRef)?.addSchema(
133+
{
134+
field: 'username',
135+
label: '用户名称',
136+
component: 'Input'
137+
},
138+
0
139+
)
140+
unref(formRef)?.addSchema(
141+
{
142+
field: 'password',
143+
label: '用户密码',
144+
component: 'InputPassword'
145+
},
146+
1
147+
)
148+
}
129149
}
130150
131151
// 修改操作
132152
const handleUpdate = async (rowId: number) => {
133153
setDialogTile('update')
154+
await nextTick()
155+
unref(formRef)?.delSchema('username')
156+
unref(formRef)?.delSchema('password')
134157
// 设置数据
135158
const res = await TenantApi.getTenantApi(rowId)
136159
unref(formRef)?.setValues(res)

src/views/system/tenant/tenant.data.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
123123
title: '用户名称',
124124
field: 'username',
125125
isTable: false,
126-
isDetail: false,
127-
isForm: false
126+
isDetail: false
128127
},
129128
{
130129
title: '用户密码',
@@ -133,8 +132,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
133132
isDetail: false,
134133
form: {
135134
component: 'InputPassword'
136-
},
137-
isForm: false
135+
}
138136
},
139137
{
140138
title: '账号额度',

src/views/system/user/user.data.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ const crudSchemas = reactive<VxeCrudSchema>({
6060
component: 'InputPassword'
6161
}
6262
},
63+
{
64+
title: '用户' + t('profile.user.sex'),
65+
field: 'sex',
66+
dictType: DICT_TYPE.SYSTEM_USER_SEX,
67+
dictClass: 'number',
68+
table: { show: false }
69+
},
6370
{
6471
title: '用户昵称',
6572
field: 'nickname'

0 commit comments

Comments
 (0)