cloud-web-corejs 1.0.54-dev.600 → 1.0.54-dev.601
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/components/xform/form-designer/setting-panel/form-setting.vue +4 -4
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +3 -3
- package/src/views/bd/setting/formVersion/button.vue +1 -1
- package/src/views/bd/setting/formVersion/compareDialog.vue +286 -0
- package/src/views/bd/setting/formVersion/fieldCompare.vue +51 -0
- package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +91 -60
- package/src/views/bd/setting/formVersion/preformDialog.vue +2 -2
- package/src/views/bd/setting/formVersion/reverButton.vue +12 -14
- package/src/views/bd/setting/form_script/edit.vue +79 -34
- package/src/views/bd/setting/form_script/edit1.vue +143 -61
- package/src/views/bd/setting/form_script/mixins/edit.js +76 -53
- package/src/views/bd/setting/form_script/mixins/edit1.js +75 -52
- package/src/views/bd/setting/form_template/edit.vue +93 -36
- package/src/views/bd/setting/form_template/formDesignerDialog.vue +166 -0
- package/src/views/bd/setting/form_template/list.vue +10 -42
- package/src/views/bd/setting/form_template/mixins/edit.js +19 -2
- package/src/views/bd/setting/form_template/mixins/list.js +2 -4
- package/src/views/bd/setting/form_template/mixins/wf_list.js +0 -4
- package/src/views/bd/setting/form_template/wf_list.vue +161 -127
- package/src/views/bd/setting/table_model/edit.vue +388 -203
- package/src/views/bd/setting/table_model/mixins/edit.js +87 -72
- package/src/views/user/form/vform/designer.vue +300 -284
- package/src/views/bd/setting/form_template/mixins/list2.js +0 -411
|
@@ -1,24 +1,15 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div>
|
|
3
3
|
<!-- <el-button type="primary" @click="test">Submit</el-button> -->
|
|
4
|
-
<div class="designer-box" id="containt" style="margin-bottom: 0
|
|
5
|
-
<v-form-designer
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
@reflushTemplateList="reflushTemplateList"
|
|
14
|
-
v-if="showDesinger"
|
|
15
|
-
:readonly="readonly"
|
|
16
|
-
:columnFlag="columnFlag"
|
|
17
|
-
:sourceData="sourceData"
|
|
18
|
-
sourceData:="sourceData"
|
|
19
|
-
@customConfirm="customConfirm"
|
|
20
|
-
/>
|
|
21
|
-
</div><!--
|
|
4
|
+
<div class="designer-box" id="containt" style="margin-bottom: 0">
|
|
5
|
+
<v-form-designer ref="designer" :reportTemplate.sync="reportTemplate"
|
|
6
|
+
:designer-config="designerConfig" :field-list-data="fieldListData"
|
|
7
|
+
@field-widget-used="handleFWU" @field-widget-removed="handleFWR"
|
|
8
|
+
@form-json-updated="handleFJU" @reflushTemplateList="reflushTemplateList"
|
|
9
|
+
v-if="showDesinger" :readonly="readonly" :columnFlag="columnFlag"
|
|
10
|
+
:sourceData="sourceData" sourceData:="sourceData" @customConfirm="customConfirm" />
|
|
11
|
+
</div>
|
|
12
|
+
<!--
|
|
22
13
|
<el-tabs v-model="activeName" class="tab-boxCard tabCard-sty1" v-if="showDesinger">
|
|
23
14
|
<el-tab-pane label="设计器" name="first">
|
|
24
15
|
|
|
@@ -28,25 +19,26 @@
|
|
|
28
19
|
</template>
|
|
29
20
|
|
|
30
21
|
<script>
|
|
31
|
-
import {loadExtension} from
|
|
22
|
+
import { loadExtension } from "@base/components/xform/extension/extension-loader";
|
|
32
23
|
|
|
33
|
-
loadExtension()
|
|
34
|
-
import VFormDesigner from
|
|
35
|
-
import {deepClone, overwriteObj} from "@base/components/xform/utils/util";
|
|
36
|
-
import {formFieldMapping} from "./formFieldMapping";
|
|
24
|
+
loadExtension();
|
|
25
|
+
import VFormDesigner from "@base/components/xform/form-designer/index.vue";
|
|
26
|
+
import { deepClone, overwriteObj } from "@base/components/xform/utils/util";
|
|
27
|
+
import { formFieldMapping } from "./formFieldMapping";
|
|
37
28
|
|
|
38
29
|
export default {
|
|
39
|
-
name:
|
|
30
|
+
name: "vform-designer:edit",
|
|
40
31
|
props: {
|
|
41
32
|
formCode: String,
|
|
42
33
|
readonly: Boolean,
|
|
43
34
|
formTemplate: Object,
|
|
44
35
|
widgetList: Array,
|
|
45
36
|
columnFlag: Boolean,
|
|
46
|
-
sourceData:Object
|
|
37
|
+
sourceData: Object,
|
|
38
|
+
historyFlag: Boolean,
|
|
47
39
|
},
|
|
48
40
|
components: {
|
|
49
|
-
VFormDesigner
|
|
41
|
+
VFormDesigner,
|
|
50
42
|
},
|
|
51
43
|
data() {
|
|
52
44
|
return {
|
|
@@ -55,7 +47,7 @@ export default {
|
|
|
55
47
|
optionData: {},
|
|
56
48
|
reportTemplate: {},
|
|
57
49
|
showDesinger: false,
|
|
58
|
-
activeName:
|
|
50
|
+
activeName: "first",
|
|
59
51
|
showRequestaccessList: false,
|
|
60
52
|
showFunctionScriptList: false,
|
|
61
53
|
designerConfig: {
|
|
@@ -75,7 +67,7 @@ export default {
|
|
|
75
67
|
meteFieldsResult: null,
|
|
76
68
|
usedFieldNames: {},
|
|
77
69
|
entity: null,
|
|
78
|
-
entityLabel: null
|
|
70
|
+
entityLabel: null,
|
|
79
71
|
};
|
|
80
72
|
},
|
|
81
73
|
computed: {},
|
|
@@ -84,7 +76,7 @@ export default {
|
|
|
84
76
|
if (this.showRequestaccessList === false && val == "second") {
|
|
85
77
|
this.showRequestaccessList = true;
|
|
86
78
|
}
|
|
87
|
-
}
|
|
79
|
+
},
|
|
88
80
|
},
|
|
89
81
|
mounted() {
|
|
90
82
|
this.getTemplate();
|
|
@@ -105,33 +97,40 @@ export default {
|
|
|
105
97
|
this.$nextTick(() => {
|
|
106
98
|
let formJson = this.$baseLodash.cloneDeep({
|
|
107
99
|
widgetList: this.widgetList,
|
|
108
|
-
formConfig:{}
|
|
100
|
+
formConfig: {},
|
|
109
101
|
});
|
|
110
102
|
this.$refs.designer.setFormJson(formJson);
|
|
111
|
-
})
|
|
112
|
-
|
|
103
|
+
});
|
|
104
|
+
} else if (this.formTemplate) {
|
|
105
|
+
this.reportTemplate = this.$baseLodash.cloneDeep(this.formTemplate);
|
|
106
|
+
this.showDesinger = true;
|
|
107
|
+
this.$nextTick(() => {
|
|
108
|
+
this.$refs.designer.setFormJson(this.reportTemplate.formViewContent);
|
|
109
|
+
});
|
|
110
|
+
} else {
|
|
111
|
+
this.$http({
|
|
112
|
+
aes: true,
|
|
113
|
+
url: USER_PREFIX + `/formTemplate/getByFormCode`,
|
|
114
|
+
method: `post`,
|
|
115
|
+
data: {
|
|
116
|
+
stringOne: this.formCode,
|
|
117
|
+
},
|
|
118
|
+
isLoading: true,
|
|
119
|
+
modalStrictly: true,
|
|
120
|
+
success: (res) => {
|
|
121
|
+
if (!res.objx) {
|
|
122
|
+
this.$baseAlert(this.$t1("获取报表模板失败"));
|
|
123
|
+
return;
|
|
124
|
+
}
|
|
125
|
+
let reportTemplate = res.objx || {};
|
|
126
|
+
this.reportTemplate = reportTemplate;
|
|
127
|
+
this.showDesinger = true;
|
|
128
|
+
this.$nextTick(() => {
|
|
129
|
+
this.$refs.designer.setFormJson(reportTemplate.formViewContent);
|
|
130
|
+
});
|
|
131
|
+
},
|
|
132
|
+
});
|
|
113
133
|
}
|
|
114
|
-
this.$http({
|
|
115
|
-
aes: true,
|
|
116
|
-
url: USER_PREFIX + `/formTemplate/getByFormCode`,
|
|
117
|
-
method: `post`,
|
|
118
|
-
data: {
|
|
119
|
-
stringOne: this.formCode
|
|
120
|
-
},
|
|
121
|
-
isLoading: true,
|
|
122
|
-
modalStrictly: true,
|
|
123
|
-
success: res => {
|
|
124
|
-
let reportTemplate = res.objx || {};
|
|
125
|
-
this.reportTemplate = reportTemplate;
|
|
126
|
-
this.showDesinger = true;
|
|
127
|
-
this.$nextTick(() => {
|
|
128
|
-
this.$refs.designer.setFormJson(reportTemplate.formViewContent);
|
|
129
|
-
|
|
130
|
-
// this.loadFieldListData();
|
|
131
|
-
|
|
132
|
-
})
|
|
133
|
-
}
|
|
134
|
-
});
|
|
135
134
|
},
|
|
136
135
|
loadFieldListData(res) {
|
|
137
136
|
this.entity = "User";
|
|
@@ -210,27 +209,37 @@ export default {
|
|
|
210
209
|
}
|
|
211
210
|
};*/
|
|
212
211
|
res = {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
212
|
+
code: 200,
|
|
213
|
+
error: null,
|
|
214
|
+
message: "success",
|
|
215
|
+
data: {
|
|
216
|
+
subFormList: [{ name: "Jinjilianxiren", label: "员工-紧急联系人" }],
|
|
217
|
+
storageSetting: [{ cloudStorage: "false" }],
|
|
218
|
+
fieldList: [
|
|
217
219
|
/*{
|
|
218
220
|
"name": "yuangongdanganId",
|
|
219
221
|
"label": "id主键",
|
|
220
222
|
"type": "PrimaryKey",
|
|
221
223
|
"required": "1"
|
|
222
|
-
},*/ {
|
|
224
|
+
},*/ {
|
|
225
|
+
name: "createdOn",
|
|
226
|
+
label: "创建时间",
|
|
227
|
+
type: "DateTime",
|
|
228
|
+
required: "1",
|
|
229
|
+
},
|
|
230
|
+
/*{
|
|
223
231
|
"searchDialogWidth": "520px",
|
|
224
232
|
"name": "createdBy",
|
|
225
233
|
"label": "创建用户",
|
|
226
234
|
"type": "Reference",
|
|
227
235
|
"required": "1"
|
|
228
236
|
},*/ {
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
},
|
|
237
|
+
name: "modifiedOn",
|
|
238
|
+
label: "最近修改时间",
|
|
239
|
+
type: "DateTime",
|
|
240
|
+
required: "0",
|
|
241
|
+
},
|
|
242
|
+
/*{
|
|
234
243
|
"searchDialogWidth": "520px",
|
|
235
244
|
"name": "modifiedBy",
|
|
236
245
|
"label": "修改用户",
|
|
@@ -249,116 +258,140 @@ export default {
|
|
|
249
258
|
"type": "Reference",
|
|
250
259
|
"required": "1"
|
|
251
260
|
},*/ {
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
},
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
261
|
+
name: "gonghao",
|
|
262
|
+
label: "工号",
|
|
263
|
+
type: "Text",
|
|
264
|
+
required: "0",
|
|
265
|
+
maxLength: "200",
|
|
266
|
+
},
|
|
267
|
+
{
|
|
268
|
+
name: "xingming",
|
|
269
|
+
label: "姓名",
|
|
270
|
+
type: "Text",
|
|
271
|
+
required: "1",
|
|
272
|
+
maxLength: "200",
|
|
273
|
+
},
|
|
274
|
+
/*{
|
|
264
275
|
"searchDialogWidth": "520px",
|
|
265
276
|
"name": "bumen",
|
|
266
277
|
"label": "部门",
|
|
267
278
|
"type": "Reference",
|
|
268
279
|
"required": "1"
|
|
269
280
|
},*/ {
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
},
|
|
281
|
+
name: "gangwei",
|
|
282
|
+
label: "岗位",
|
|
283
|
+
type: "Text",
|
|
284
|
+
required: "1",
|
|
285
|
+
maxLength: "200",
|
|
286
|
+
},
|
|
287
|
+
/*{
|
|
276
288
|
"searchDialogWidth": "520px",
|
|
277
289
|
"name": "yuangongchengyuan",
|
|
278
290
|
"label": "员工成员",
|
|
279
291
|
"type": "Reference",
|
|
280
292
|
"required": "0"
|
|
281
293
|
},*/ {
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
},
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
294
|
+
name: "shenfenzhenghao",
|
|
295
|
+
label: "身份证号",
|
|
296
|
+
type: "Text",
|
|
297
|
+
required: "0",
|
|
298
|
+
maxLength: "200",
|
|
299
|
+
},
|
|
300
|
+
{ name: "xingbie", label: "性别", type: "Option", required: "1" },
|
|
301
|
+
{
|
|
302
|
+
name: "chushengriqi",
|
|
303
|
+
label: "出生日期",
|
|
304
|
+
type: "Date",
|
|
305
|
+
required: "0",
|
|
306
|
+
},
|
|
307
|
+
/*{
|
|
293
308
|
"name": "jiguan",
|
|
294
309
|
"label": "籍贯",
|
|
295
310
|
"type": "AreaSelect",
|
|
296
311
|
"areaDataType": "2",
|
|
297
312
|
"required": "0"
|
|
298
313
|
},*/ {
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
},
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
314
|
+
name: "hujisuozaidi",
|
|
315
|
+
label: "户籍所在地",
|
|
316
|
+
type: "Text",
|
|
317
|
+
required: "0",
|
|
318
|
+
maxLength: "200",
|
|
319
|
+
},
|
|
320
|
+
{ name: "hujileixing", label: "户籍类型", type: "Option", required: "0" },
|
|
321
|
+
{
|
|
322
|
+
name: "minzu",
|
|
323
|
+
label: "民族",
|
|
324
|
+
type: "Text",
|
|
325
|
+
required: "0",
|
|
326
|
+
maxLength: "200",
|
|
327
|
+
},
|
|
328
|
+
{
|
|
329
|
+
name: "hunyinzhuangtai",
|
|
330
|
+
label: "婚姻状态",
|
|
331
|
+
type: "Option",
|
|
332
|
+
required: "0",
|
|
333
|
+
},
|
|
334
|
+
{
|
|
335
|
+
name: "zhengzhimianmao",
|
|
336
|
+
label: "政治面貌",
|
|
337
|
+
type: "Option",
|
|
338
|
+
required: "0",
|
|
339
|
+
},
|
|
340
|
+
/*{
|
|
321
341
|
"name": "yuangongzhaopian",
|
|
322
342
|
"label": "员工照片",
|
|
323
343
|
"type": "Picture",
|
|
324
344
|
"required": "0"
|
|
325
345
|
},*/ {
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
},
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
346
|
+
name: "pinyongxingshi",
|
|
347
|
+
label: "聘用形式",
|
|
348
|
+
type: "Option",
|
|
349
|
+
required: "0",
|
|
350
|
+
},
|
|
351
|
+
{
|
|
352
|
+
name: "yuangongzhuangtai",
|
|
353
|
+
label: "员工状态",
|
|
354
|
+
type: "Option",
|
|
355
|
+
required: "1",
|
|
356
|
+
},
|
|
357
|
+
{
|
|
358
|
+
name: "canjiagongzuoriqi",
|
|
359
|
+
label: "参加工作日期",
|
|
360
|
+
type: "Date",
|
|
361
|
+
required: "0",
|
|
362
|
+
},
|
|
363
|
+
{
|
|
364
|
+
name: "ruzhiriqi",
|
|
365
|
+
label: "入职日期",
|
|
366
|
+
type: "Date",
|
|
367
|
+
required: "1",
|
|
368
|
+
},
|
|
369
|
+
{
|
|
370
|
+
name: "shiyongqitianshu",
|
|
371
|
+
label: "试用期天数(天)",
|
|
372
|
+
type: "Integer",
|
|
373
|
+
required: "1",
|
|
374
|
+
},
|
|
375
|
+
{ name: "zhuanzhengriqi", label: "转正日期", type: "Date", required: "0" },
|
|
376
|
+
{
|
|
377
|
+
min: "-999999999",
|
|
378
|
+
max: "999999999",
|
|
379
|
+
precision: "2",
|
|
380
|
+
name: "shiyongqixinzi",
|
|
381
|
+
label: "试用期薪资",
|
|
382
|
+
type: "Money",
|
|
383
|
+
required: "0",
|
|
384
|
+
},
|
|
385
|
+
{
|
|
386
|
+
min: "-999999999",
|
|
387
|
+
max: "999999999",
|
|
388
|
+
precision: "2",
|
|
389
|
+
name: "zhengshixinzi",
|
|
390
|
+
label: "正式薪资",
|
|
391
|
+
type: "Money",
|
|
392
|
+
required: "0",
|
|
393
|
+
},
|
|
394
|
+
/*{
|
|
362
395
|
"searchDialogWidth": "520px",
|
|
363
396
|
"name": "zhijieshangji",
|
|
364
397
|
"label": "直接上级",
|
|
@@ -371,65 +404,75 @@ export default {
|
|
|
371
404
|
"type": "Reference",
|
|
372
405
|
"required": "0"
|
|
373
406
|
},*/ {
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
},
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
407
|
+
name: "shebaozhanghao",
|
|
408
|
+
label: "社保账号",
|
|
409
|
+
type: "Text",
|
|
410
|
+
required: "0",
|
|
411
|
+
maxLength: "200",
|
|
412
|
+
},
|
|
413
|
+
{
|
|
414
|
+
name: "gongjijinzhanghao",
|
|
415
|
+
label: "公积金账号",
|
|
416
|
+
type: "Text",
|
|
417
|
+
required: "0",
|
|
418
|
+
maxLength: "200",
|
|
419
|
+
},
|
|
420
|
+
{
|
|
421
|
+
name: "yinhangkahao",
|
|
422
|
+
label: "银行卡号",
|
|
423
|
+
type: "Text",
|
|
424
|
+
required: "0",
|
|
425
|
+
maxLength: "200",
|
|
426
|
+
},
|
|
427
|
+
{
|
|
428
|
+
name: "kaihuxing",
|
|
429
|
+
label: "开户行",
|
|
430
|
+
type: "Text",
|
|
431
|
+
required: "0",
|
|
432
|
+
maxLength: "200",
|
|
433
|
+
},
|
|
434
|
+
{
|
|
435
|
+
name: "shoujihao",
|
|
436
|
+
label: "手机号",
|
|
437
|
+
type: "Text",
|
|
438
|
+
required: "0",
|
|
439
|
+
maxLength: "200",
|
|
440
|
+
},
|
|
441
|
+
/*{
|
|
404
442
|
"name": "changzhudizhi",
|
|
405
443
|
"label": "常住地址",
|
|
406
444
|
"type": "AreaSelect",
|
|
407
445
|
"areaDataType": "2",
|
|
408
446
|
"required": "0"
|
|
409
447
|
},*/ {
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
},
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
448
|
+
name: "jutidizhi",
|
|
449
|
+
label: "具体地址",
|
|
450
|
+
type: "Text",
|
|
451
|
+
required: "0",
|
|
452
|
+
maxLength: "200",
|
|
453
|
+
},
|
|
454
|
+
{ name: "zuigaoxueli", label: "最高学历", type: "Option", required: "0" },
|
|
455
|
+
{
|
|
456
|
+
name: "biyeshijian",
|
|
457
|
+
label: "毕业时间",
|
|
458
|
+
type: "Date",
|
|
459
|
+
required: "0",
|
|
460
|
+
},
|
|
461
|
+
{ name: "aa", label: "aa", type: "Integer", required: "1" },
|
|
462
|
+
/*{
|
|
421
463
|
"detailEntity": "Jinjilianxiren",
|
|
422
464
|
"name": "jinjilianxirenId",
|
|
423
465
|
"label": "员工-紧急联系人.id主键",
|
|
424
466
|
"type": "PrimaryKey",
|
|
425
467
|
"required": "1"
|
|
426
468
|
},*/ {
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
},
|
|
469
|
+
detailEntity: "Jinjilianxiren",
|
|
470
|
+
name: "createdOn",
|
|
471
|
+
label: "员工-紧急联系人.创建时间",
|
|
472
|
+
type: "DateTime",
|
|
473
|
+
required: "1",
|
|
474
|
+
},
|
|
475
|
+
/*{
|
|
433
476
|
"searchDialogWidth": "520px",
|
|
434
477
|
"detailEntity": "Jinjilianxiren",
|
|
435
478
|
"name": "createdBy",
|
|
@@ -437,12 +480,13 @@ export default {
|
|
|
437
480
|
"type": "Reference",
|
|
438
481
|
"required": "1"
|
|
439
482
|
},*/ {
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
},
|
|
483
|
+
detailEntity: "Jinjilianxiren",
|
|
484
|
+
name: "modifiedOn",
|
|
485
|
+
label: "员工-紧急联系人.最近修改时间",
|
|
486
|
+
type: "DateTime",
|
|
487
|
+
required: "0",
|
|
488
|
+
},
|
|
489
|
+
/*{
|
|
446
490
|
"searchDialogWidth": "520px",
|
|
447
491
|
"detailEntity": "Jinjilianxiren",
|
|
448
492
|
"name": "modifiedBy",
|
|
@@ -457,38 +501,34 @@ export default {
|
|
|
457
501
|
"type": "Reference",
|
|
458
502
|
"required": "1"
|
|
459
503
|
},*/ {
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
},
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
504
|
+
detailEntity: "Jinjilianxiren",
|
|
505
|
+
name: "shouji",
|
|
506
|
+
label: "员工-紧急联系人.手机",
|
|
507
|
+
type: "Text",
|
|
508
|
+
required: "0",
|
|
509
|
+
maxLength: "200",
|
|
510
|
+
},
|
|
511
|
+
{
|
|
512
|
+
detailEntity: "Jinjilianxiren",
|
|
513
|
+
name: "jinjilianxirenxingming",
|
|
514
|
+
label: "员工-紧急联系人.紧急联系人姓名",
|
|
515
|
+
type: "Text",
|
|
516
|
+
required: "0",
|
|
517
|
+
maxLength: "200",
|
|
518
|
+
},
|
|
519
|
+
],
|
|
520
|
+
},
|
|
475
521
|
};
|
|
476
522
|
if (res.data.fieldList) {
|
|
477
523
|
this.fieldListData.fieldList = res.data.fieldList;
|
|
478
524
|
if (res.data.subFormList) {
|
|
479
|
-
this.fieldListData.subFormList =
|
|
480
|
-
res.data.subFormList;
|
|
525
|
+
this.fieldListData.subFormList = res.data.subFormList;
|
|
481
526
|
}
|
|
482
527
|
this.meteFieldsResult = res;
|
|
483
|
-
const metaFields = this.buildMetaFields(
|
|
484
|
-
|
|
485
|
-
);
|
|
486
|
-
this.$refs.designer.setFieldListData(
|
|
487
|
-
this.fieldListData
|
|
488
|
-
);
|
|
528
|
+
const metaFields = this.buildMetaFields(this.meteFieldsResult);
|
|
529
|
+
this.$refs.designer.setFieldListData(this.fieldListData);
|
|
489
530
|
this.$refs.designer.setMetaFields(metaFields);
|
|
490
531
|
}
|
|
491
|
-
|
|
492
532
|
},
|
|
493
533
|
|
|
494
534
|
buildMetaFields(mdResult) {
|
|
@@ -509,10 +549,7 @@ export default {
|
|
|
509
549
|
return;
|
|
510
550
|
}
|
|
511
551
|
|
|
512
|
-
if (
|
|
513
|
-
fld.type === "AnyReference" ||
|
|
514
|
-
fld.type === "ReferenceList"
|
|
515
|
-
) {
|
|
552
|
+
if (fld.type === "AnyReference" || fld.type === "ReferenceList") {
|
|
516
553
|
return;
|
|
517
554
|
}
|
|
518
555
|
|
|
@@ -520,18 +557,11 @@ export default {
|
|
|
520
557
|
return; //跳过本次循环
|
|
521
558
|
}
|
|
522
559
|
|
|
523
|
-
const fieldNewProps = deepClone(
|
|
524
|
-
formFieldMapping[fld.type]
|
|
525
|
-
);
|
|
560
|
+
const fieldNewProps = deepClone(formFieldMapping[fld.type]);
|
|
526
561
|
const fieldSchema = deepClone(
|
|
527
|
-
this.$refs.designer.designer.getFieldWidgetByType(
|
|
528
|
-
fieldNewProps.type
|
|
529
|
-
)
|
|
530
|
-
);
|
|
531
|
-
overwriteObj(
|
|
532
|
-
fieldSchema.options,
|
|
533
|
-
fieldNewProps.options
|
|
562
|
+
this.$refs.designer.designer.getFieldWidgetByType(fieldNewProps.type)
|
|
534
563
|
);
|
|
564
|
+
overwriteObj(fieldSchema.options, fieldNewProps.options);
|
|
535
565
|
|
|
536
566
|
fieldSchema.displayName = fld.label;
|
|
537
567
|
fieldSchema.nameReadonly = true;
|
|
@@ -560,10 +590,7 @@ export default {
|
|
|
560
590
|
fld.type !== "PrimaryKey"
|
|
561
591
|
) {
|
|
562
592
|
//跳过id主键
|
|
563
|
-
if (
|
|
564
|
-
fld.type === "AnyReference" ||
|
|
565
|
-
fld.type === "ReferenceList"
|
|
566
|
-
) {
|
|
593
|
+
if (fld.type === "AnyReference" || fld.type === "ReferenceList") {
|
|
567
594
|
return;
|
|
568
595
|
}
|
|
569
596
|
|
|
@@ -571,18 +598,11 @@ export default {
|
|
|
571
598
|
return; //跳过本次循环
|
|
572
599
|
}
|
|
573
600
|
|
|
574
|
-
const fieldNewProps = deepClone(
|
|
575
|
-
formFieldMapping[fld.type]
|
|
576
|
-
);
|
|
601
|
+
const fieldNewProps = deepClone(formFieldMapping[fld.type]);
|
|
577
602
|
const fieldSchema = deepClone(
|
|
578
|
-
this.$refs.designer.designer.getFieldWidgetByType(
|
|
579
|
-
fieldNewProps.type
|
|
580
|
-
)
|
|
581
|
-
);
|
|
582
|
-
overwriteObj(
|
|
583
|
-
fieldSchema.options,
|
|
584
|
-
fieldNewProps.options
|
|
603
|
+
this.$refs.designer.designer.getFieldWidgetByType(fieldNewProps.type)
|
|
585
604
|
);
|
|
605
|
+
overwriteObj(fieldSchema.options, fieldNewProps.options);
|
|
586
606
|
|
|
587
607
|
fieldSchema.displayName = fld.label;
|
|
588
608
|
fieldSchema.nameReadonly = true;
|
|
@@ -605,11 +625,9 @@ export default {
|
|
|
605
625
|
let cloudStorageFlag = false;
|
|
606
626
|
let cloudStorageType = "";
|
|
607
627
|
if (mdResult.data.storageSetting) {
|
|
608
|
-
cloudStorageFlag =
|
|
609
|
-
mdResult.data.storageSetting[0].cloudStorage === "true";
|
|
628
|
+
cloudStorageFlag = mdResult.data.storageSetting[0].cloudStorage === "true";
|
|
610
629
|
if (cloudStorageFlag) {
|
|
611
|
-
cloudStorageType =
|
|
612
|
-
mdResult.data.storageSetting[0].cloudStorageType;
|
|
630
|
+
cloudStorageType = mdResult.data.storageSetting[0].cloudStorageType;
|
|
613
631
|
}
|
|
614
632
|
}
|
|
615
633
|
|
|
@@ -646,12 +664,8 @@ export default {
|
|
|
646
664
|
fieldSchema.options.precision = !fldObj.precision
|
|
647
665
|
? fieldSchema.options.precision
|
|
648
666
|
: fldObj.precision * 1;
|
|
649
|
-
fieldSchema.options.min = !fldObj.min
|
|
650
|
-
|
|
651
|
-
: fldObj.min * 1;
|
|
652
|
-
fieldSchema.options.max = !fldObj.max
|
|
653
|
-
? fieldSchema.options.max
|
|
654
|
-
: fldObj.max * 1;
|
|
667
|
+
fieldSchema.options.min = !fldObj.min ? fieldSchema.options.min : fldObj.min * 1;
|
|
668
|
+
fieldSchema.options.max = !fldObj.max ? fieldSchema.options.max : fldObj.max * 1;
|
|
655
669
|
}
|
|
656
670
|
|
|
657
671
|
/* 处理地区选择字段 */
|
|
@@ -664,17 +678,14 @@ export default {
|
|
|
664
678
|
|
|
665
679
|
/* 处理一对一字段 */
|
|
666
680
|
if (fldObj.type === "Reference") {
|
|
667
|
-
fieldSchema.options.searchDialogWidth =
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
: fldObj.searchDialogWidth;
|
|
681
|
+
fieldSchema.options.searchDialogWidth = !fldObj.searchDialogWidth
|
|
682
|
+
? fieldSchema.options.searchDialogWidth
|
|
683
|
+
: fldObj.searchDialogWidth;
|
|
671
684
|
}
|
|
672
685
|
|
|
673
686
|
/* 处理单选项字段 */
|
|
674
687
|
if (fieldSchema.options.hasOwnProperty("optionItems")) {
|
|
675
|
-
if (
|
|
676
|
-
this.formOptionData.hasOwnProperty(fieldSchema.options.name)
|
|
677
|
-
) {
|
|
688
|
+
if (this.formOptionData.hasOwnProperty(fieldSchema.options.name)) {
|
|
678
689
|
fieldSchema.options.optionItems = deepClone(
|
|
679
690
|
this.formOptionData[fieldSchema.options.name]
|
|
680
691
|
);
|
|
@@ -682,8 +693,8 @@ export default {
|
|
|
682
693
|
|
|
683
694
|
if (fldObj.type === "Boolean") {
|
|
684
695
|
fieldSchema.options.optionItems = [
|
|
685
|
-
{value: true, label: "是"},
|
|
686
|
-
{value: false, label: "否"},
|
|
696
|
+
{ value: true, label: "是" },
|
|
697
|
+
{ value: false, label: "否" },
|
|
687
698
|
];
|
|
688
699
|
}
|
|
689
700
|
|
|
@@ -696,11 +707,18 @@ export default {
|
|
|
696
707
|
}
|
|
697
708
|
|
|
698
709
|
/* 取消系统字段的必填校验 */
|
|
699
|
-
if (
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
710
|
+
if (
|
|
711
|
+
fieldSchema.options.name === "createdOn" ||
|
|
712
|
+
fieldSchema.options.name === "createdBy" ||
|
|
713
|
+
fieldSchema.options.name === "modifiedOn" ||
|
|
714
|
+
fieldSchema.options.name === "modifiedBy" ||
|
|
715
|
+
fieldSchema.options.name === "ownerUser" ||
|
|
716
|
+
fieldSchema.options.name === "ownerDepartment" ||
|
|
717
|
+
fieldSchema.options.name === "approvalConfigId" ||
|
|
718
|
+
fieldSchema.options.name === "approvalStatus" ||
|
|
719
|
+
fieldSchema.options.name === "lastApprovedBy" ||
|
|
720
|
+
fieldSchema.options.name === "lastApprovedOn"
|
|
721
|
+
) {
|
|
704
722
|
fieldSchema.options.required = false;
|
|
705
723
|
}
|
|
706
724
|
|
|
@@ -750,9 +768,7 @@ export default {
|
|
|
750
768
|
aes: true,
|
|
751
769
|
url: USER_PREFIX + "/szTaMb/listPage",
|
|
752
770
|
data: {},
|
|
753
|
-
success: res => {
|
|
754
|
-
|
|
755
|
-
}
|
|
771
|
+
success: (res) => {},
|
|
756
772
|
});
|
|
757
773
|
},
|
|
758
774
|
reflushTemplateList() {
|
|
@@ -760,8 +776,8 @@ export default {
|
|
|
760
776
|
},
|
|
761
777
|
customConfirm(json) {
|
|
762
778
|
this.$emit("customConfirm", json);
|
|
763
|
-
}
|
|
764
|
-
}
|
|
779
|
+
},
|
|
780
|
+
},
|
|
765
781
|
};
|
|
766
782
|
</script>
|
|
767
783
|
|