Skip to content

Commit 9095970

Browse files
committed
邮件记录详情,创建时间显示不正确
编辑参数键名,键不能修改,修改时只读,新增时正常 租户套餐显示备注及搜索条件显示(同vue2)
1 parent 9440154 commit 9095970

File tree

7 files changed

+264
-320
lines changed

7 files changed

+264
-320
lines changed

src/views/bpm/form/formEditor.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
<div ref="editor" v-if="dialogVisible1">
1313
<XTextButton style="float: right" :title="t('common.copy')" @click="copy(formValue)" />
1414
<el-scrollbar height="580">
15-
<pre>
16-
{{ formValue }}
17-
</pre>
15+
<div v-highlight>
16+
<code class="hljs">
17+
{{ formValue }}
18+
</code>
19+
</div>
1820
</el-scrollbar>
1921
</div>
2022
</Dialog>

src/views/bpm/model/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
style="width: 100%"
147147
>
148148
<el-option
149-
v-for="dict in getDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)"
150-
:key="dict.value"
149+
v-for="(dict, index) in getDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY)"
150+
:key="index"
151151
:label="dict.label"
152152
:value="dict.value"
153153
/>
@@ -434,9 +434,9 @@ const handleUpdate = async (rowId: number) => {
434434
// 设置数据
435435
saveForm.value = await ModelApi.getModelApi(rowId)
436436
if (saveForm.value.category == null) {
437-
saveForm.value.category = 1
437+
saveForm.value.category = '1'
438438
} else {
439-
saveForm.value.category = Number(saveForm.value.category)
439+
saveForm.value.category = saveForm.value.category
440440
}
441441
}
442442

src/views/infra/config/config.data.ts

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
2+
const { t } = useI18n() // 国际化
3+
4+
// 表单校验
5+
export const rules = reactive({
6+
category: [required],
7+
name: [required],
8+
key: [required],
9+
value: [required]
10+
})
11+
12+
// CrudSchema
13+
const crudSchemas = reactive<VxeCrudSchema>({
14+
primaryKey: 'id',
15+
primaryType: null,
16+
action: true,
17+
columns: [
18+
{
19+
title: '参数分类',
20+
field: 'category'
21+
},
22+
{
23+
title: '参数名称',
24+
field: 'name',
25+
isSearch: true
26+
},
27+
{
28+
title: '参数键名',
29+
field: 'key',
30+
isSearch: true
31+
},
32+
{
33+
title: '参数键值',
34+
field: 'value'
35+
},
36+
{
37+
title: '系统内置',
38+
field: 'type',
39+
dictType: DICT_TYPE.INFRA_CONFIG_TYPE,
40+
dictClass: 'number',
41+
isSearch: true
42+
},
43+
{
44+
title: '是否可见',
45+
field: 'visible',
46+
table: {
47+
slots: {
48+
default: 'visible_default'
49+
}
50+
},
51+
form: {
52+
component: 'RadioButton',
53+
componentProps: {
54+
options: [
55+
{ label: '是', value: true },
56+
{ label: '否', value: false }
57+
]
58+
}
59+
}
60+
},
61+
{
62+
title: t('form.remark'),
63+
field: 'remark',
64+
isTable: false,
65+
form: {
66+
component: 'Input',
67+
componentProps: {
68+
type: 'textarea',
69+
rows: 4
70+
},
71+
colProps: {
72+
span: 24
73+
}
74+
}
75+
},
76+
{
77+
title: t('common.createTime'),
78+
field: 'createTime',
79+
formatter: 'formatDate',
80+
isForm: false,
81+
search: {
82+
show: true,
83+
itemRender: {
84+
name: 'XDataTimePicker'
85+
}
86+
}
87+
}
88+
]
89+
})
90+
export const { allSchemas } = useVxeCrudSchemas(crudSchemas)

src/views/infra/config/form.vue

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)