cloud-web-corejs 1.0.249 → 1.0.251

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.
Files changed (60) hide show
  1. package/package.json +1 -1
  2. package/src/components/xform/form-designer/designer.js +1 -0
  3. package/src/components/xform/form-designer/setting-panel/form-setting.vue +3 -0
  4. package/src/components/xform/utils/util.js +1 -0
  5. package/src/views/bd/setting/formVersion/button.vue +55 -0
  6. package/src/views/bd/setting/formVersion/compareBasicSection.vue +125 -0
  7. package/src/views/bd/setting/formVersion/compareCodeSection.vue +539 -0
  8. package/src/views/bd/setting/formVersion/compareContMixin.scss +65 -0
  9. package/src/views/bd/setting/formVersion/compareContent.vue +63 -0
  10. package/src/views/bd/setting/formVersion/compareDialog.vue +88 -0
  11. package/src/views/bd/setting/formVersion/compareMixin.js +93 -0
  12. package/src/views/bd/setting/formVersion/fieldCompare.vue +54 -0
  13. package/src/views/bd/setting/formVersion/formScriptCompareView.vue +94 -0
  14. package/src/views/bd/setting/formVersion/formTemplateCompareView.vue +74 -0
  15. package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +491 -0
  16. package/src/views/bd/setting/formVersion/link.vue +58 -0
  17. package/src/views/bd/setting/formVersion/preformDialog.vue +87 -0
  18. package/src/views/bd/setting/formVersion/reverButton.vue +82 -0
  19. package/src/views/bd/setting/formVersion/tableDetailDiff.js +99 -0
  20. package/src/views/bd/setting/formVersion/tableModelCompareView.vue +514 -0
  21. package/src/views/bd/setting/formVersion/textDiff.js +102 -0
  22. package/src/views/bd/setting/form_import_log/edit.vue +6 -3
  23. package/src/views/bd/setting/form_import_log/list.vue +5 -0
  24. package/src/views/bd/setting/form_script/edit.vue +196 -83
  25. package/src/views/bd/setting/form_script/edit1.vue +410 -220
  26. package/src/views/bd/setting/form_script/form_list.vue +19 -0
  27. package/src/views/bd/setting/form_script/list.vue +95 -21
  28. package/src/views/bd/setting/form_script/list1.vue +24 -0
  29. package/src/views/bd/setting/form_script/mixins/dialog.js +2 -2
  30. package/src/views/bd/setting/form_script/mixins/edit.js +265 -207
  31. package/src/views/bd/setting/form_script/mixins/edit1.js +259 -201
  32. package/src/views/bd/setting/form_script/mixins/form_list.js +322 -296
  33. package/src/views/bd/setting/form_script/mixins/list.js +163 -95
  34. package/src/views/bd/setting/form_script/mixins/list1.js +244 -155
  35. package/src/views/bd/setting/form_script/mixins/otherAuthDialog.js +1 -1
  36. package/src/views/bd/setting/form_template/batchWfObjConfigDialog.vue +1 -1
  37. package/src/views/bd/setting/form_template/edit.vue +355 -205
  38. package/src/views/bd/setting/form_template/formDesignerDialog.vue +171 -0
  39. package/src/views/bd/setting/form_template/list.vue +49 -74
  40. package/src/views/bd/setting/form_template/mixins/batchWfObjConfigDialog.js +3 -3
  41. package/src/views/bd/setting/form_template/mixins/edit.js +51 -8
  42. package/src/views/bd/setting/form_template/mixins/itemList.js +1 -1
  43. package/src/views/bd/setting/form_template/mixins/list.js +114 -82
  44. package/src/views/bd/setting/form_template/mixins/list2.js +3 -3
  45. package/src/views/bd/setting/form_template/mixins/otherAuthDialog.js +1 -1
  46. package/src/views/bd/setting/form_template/mixins/wf_list.js +3 -7
  47. package/src/views/bd/setting/form_template/wf_list.vue +161 -127
  48. package/src/views/bd/setting/request_setting/list.vue +15 -25
  49. package/src/views/bd/setting/table_model/edit.vue +702 -498
  50. package/src/views/bd/setting/table_model/list.vue +28 -0
  51. package/src/views/bd/setting/table_model/mixins/dialog.js +1 -1
  52. package/src/views/bd/setting/table_model/mixins/edit.js +228 -121
  53. package/src/views/bd/setting/table_model/mixins/list.js +55 -20
  54. package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js +1 -1
  55. package/src/views/bd/setting/table_model/mixins/zdDialog.js +50 -46
  56. package/src/views/bd/setting/utils/index.js +15 -0
  57. package/src/views/user/form/vform/designer.vue +303 -287
  58. package/src/views/user/form/vform/formFieldMapping.js +2 -3
  59. package/src/views/user/form/vform/render.vue +8 -0
  60. package/src/views/user/form/view/list.vue +5 -1
@@ -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
- ref="designer"
7
- :reportTemplate.sync="reportTemplate"
8
- :designer-config="designerConfig"
9
- :field-list-data="fieldListData"
10
- @field-widget-used="handleFWU"
11
- @field-widget-removed="handleFWR"
12
- @form-json-updated="handleFJU"
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 '@base/components/xform/extension/extension-loader'
22
+ import { loadExtension } from "@base/components/xform/extension/extension-loader";
32
23
 
33
- loadExtension()
34
- import VFormDesigner from '@base/components/xform/form-designer/index.vue'
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: 'vform-designer:edit',
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
+ jsonFlag: 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: 'first',
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();
@@ -97,41 +89,46 @@ export default {
97
89
  designer.setFormJson(this.formJson);
98
90
  },
99
91
  getTemplate() {
100
- /* this.showDesinger = true;
101
- return */
102
92
  if (this.columnFlag) {
103
93
  this.reportTemplate = this.formTemplate;
104
94
  this.showDesinger = true;
105
95
  this.$nextTick(() => {
106
96
  let formJson = this.$baseLodash.cloneDeep({
107
97
  widgetList: this.widgetList,
108
- formConfig:{}
98
+ formConfig: {},
109
99
  });
110
100
  this.$refs.designer.setFormJson(formJson);
111
- })
112
- return
101
+ });
102
+ } else if (this.jsonFlag && this.formTemplate) {
103
+ this.reportTemplate = this.$baseLodash.cloneDeep(this.formTemplate);
104
+ this.showDesinger = true;
105
+ this.$nextTick(() => {
106
+ this.$refs.designer.setFormJson(this.reportTemplate.formViewContent);
107
+ });
108
+ } else {
109
+ this.$http({
110
+ aes: true,
111
+ url: USER_PREFIX + `/formTemplate/getByFormCode`,
112
+ method: `post`,
113
+ data: {
114
+ stringOne: this.formCode,
115
+ },
116
+ isLoading: true,
117
+ modalStrictly: true,
118
+ success: (res) => {
119
+ if (!res.objx) {
120
+ this.$baseAlert(this.$t1("获取报表模板失败"));
121
+ return;
122
+ }
123
+ let reportTemplate = res.objx || {};
124
+ this.reportTemplate = reportTemplate;
125
+ this.showDesinger = true;
126
+ this.$nextTick(() => {
127
+ this.$refs.designer.setFormJson(reportTemplate.formViewContent);
128
+ });
129
+ },
130
+ });
113
131
  }
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
132
  },
136
133
  loadFieldListData(res) {
137
134
  this.entity = "User";
@@ -210,27 +207,37 @@ export default {
210
207
  }
211
208
  };*/
212
209
  res = {
213
- "code": 200, "error": null, "message": "success", "data": {
214
- "subFormList": [{"name": "Jinjilianxiren", "label": "员工-紧急联系人"}],
215
- "storageSetting": [{"cloudStorage": "false"}],
216
- "fieldList": [
210
+ code: 200,
211
+ error: null,
212
+ message: "success",
213
+ data: {
214
+ subFormList: [{ name: "Jinjilianxiren", label: "员工-紧急联系人" }],
215
+ storageSetting: [{ cloudStorage: "false" }],
216
+ fieldList: [
217
217
  /*{
218
218
  "name": "yuangongdanganId",
219
219
  "label": "id主键",
220
220
  "type": "PrimaryKey",
221
221
  "required": "1"
222
- },*/ {"name": "createdOn", "label": "创建时间", "type": "DateTime", "required": "1"}, /*{
222
+ },*/ {
223
+ name: "createdOn",
224
+ label: "创建时间",
225
+ type: "DateTime",
226
+ required: "1",
227
+ },
228
+ /*{
223
229
  "searchDialogWidth": "520px",
224
230
  "name": "createdBy",
225
231
  "label": "创建用户",
226
232
  "type": "Reference",
227
233
  "required": "1"
228
234
  },*/ {
229
- "name": "modifiedOn",
230
- "label": "最近修改时间",
231
- "type": "DateTime",
232
- "required": "0"
233
- }, /*{
235
+ name: "modifiedOn",
236
+ label: "最近修改时间",
237
+ type: "DateTime",
238
+ required: "0",
239
+ },
240
+ /*{
234
241
  "searchDialogWidth": "520px",
235
242
  "name": "modifiedBy",
236
243
  "label": "修改用户",
@@ -249,116 +256,140 @@ export default {
249
256
  "type": "Reference",
250
257
  "required": "1"
251
258
  },*/ {
252
- "name": "gonghao",
253
- "label": "工号",
254
- "type": "Text",
255
- "required": "0",
256
- "maxLength": "200"
257
- }, {
258
- "name": "xingming",
259
- "label": "姓名",
260
- "type": "Text",
261
- "required": "1",
262
- "maxLength": "200"
263
- }, /*{
259
+ name: "gonghao",
260
+ label: "工号",
261
+ type: "Text",
262
+ required: "0",
263
+ maxLength: "200",
264
+ },
265
+ {
266
+ name: "xingming",
267
+ label: "姓名",
268
+ type: "Text",
269
+ required: "1",
270
+ maxLength: "200",
271
+ },
272
+ /*{
264
273
  "searchDialogWidth": "520px",
265
274
  "name": "bumen",
266
275
  "label": "部门",
267
276
  "type": "Reference",
268
277
  "required": "1"
269
278
  },*/ {
270
- "name": "gangwei",
271
- "label": "岗位",
272
- "type": "Text",
273
- "required": "1",
274
- "maxLength": "200"
275
- }, /*{
279
+ name: "gangwei",
280
+ label: "岗位",
281
+ type: "Text",
282
+ required: "1",
283
+ maxLength: "200",
284
+ },
285
+ /*{
276
286
  "searchDialogWidth": "520px",
277
287
  "name": "yuangongchengyuan",
278
288
  "label": "员工成员",
279
289
  "type": "Reference",
280
290
  "required": "0"
281
291
  },*/ {
282
- "name": "shenfenzhenghao",
283
- "label": "身份证号",
284
- "type": "Text",
285
- "required": "0",
286
- "maxLength": "200"
287
- }, {"name": "xingbie", "label": "性别", "type": "Option", "required": "1"}, {
288
- "name": "chushengriqi",
289
- "label": "出生日期",
290
- "type": "Date",
291
- "required": "0"
292
- }, /*{
292
+ name: "shenfenzhenghao",
293
+ label: "身份证号",
294
+ type: "Text",
295
+ required: "0",
296
+ maxLength: "200",
297
+ },
298
+ { name: "xingbie", label: "性别", type: "Option", required: "1" },
299
+ {
300
+ name: "chushengriqi",
301
+ label: "出生日期",
302
+ type: "Date",
303
+ required: "0",
304
+ },
305
+ /*{
293
306
  "name": "jiguan",
294
307
  "label": "籍贯",
295
308
  "type": "AreaSelect",
296
309
  "areaDataType": "2",
297
310
  "required": "0"
298
311
  },*/ {
299
- "name": "hujisuozaidi",
300
- "label": "户籍所在地",
301
- "type": "Text",
302
- "required": "0",
303
- "maxLength": "200"
304
- }, {"name": "hujileixing", "label": "户籍类型", "type": "Option", "required": "0"}, {
305
- "name": "minzu",
306
- "label": "民族",
307
- "type": "Text",
308
- "required": "0",
309
- "maxLength": "200"
310
- }, {
311
- "name": "hunyinzhuangtai",
312
- "label": "婚姻状态",
313
- "type": "Option",
314
- "required": "0"
315
- }, {
316
- "name": "zhengzhimianmao",
317
- "label": "政治面貌",
318
- "type": "Option",
319
- "required": "0"
320
- }, /*{
312
+ name: "hujisuozaidi",
313
+ label: "户籍所在地",
314
+ type: "Text",
315
+ required: "0",
316
+ maxLength: "200",
317
+ },
318
+ { name: "hujileixing", label: "户籍类型", type: "Option", required: "0" },
319
+ {
320
+ name: "minzu",
321
+ label: "民族",
322
+ type: "Text",
323
+ required: "0",
324
+ maxLength: "200",
325
+ },
326
+ {
327
+ name: "hunyinzhuangtai",
328
+ label: "婚姻状态",
329
+ type: "Option",
330
+ required: "0",
331
+ },
332
+ {
333
+ name: "zhengzhimianmao",
334
+ label: "政治面貌",
335
+ type: "Option",
336
+ required: "0",
337
+ },
338
+ /*{
321
339
  "name": "yuangongzhaopian",
322
340
  "label": "员工照片",
323
341
  "type": "Picture",
324
342
  "required": "0"
325
343
  },*/ {
326
- "name": "pinyongxingshi",
327
- "label": "聘用形式",
328
- "type": "Option",
329
- "required": "0"
330
- }, {
331
- "name": "yuangongzhuangtai",
332
- "label": "员工状态",
333
- "type": "Option",
334
- "required": "1"
335
- }, {"name": "canjiagongzuoriqi", "label": "参加工作日期", "type": "Date", "required": "0"}, {
336
- "name": "ruzhiriqi",
337
- "label": "入职日期",
338
- "type": "Date",
339
- "required": "1"
340
- }, {
341
- "name": "shiyongqitianshu",
342
- "label": "试用期天数(天)",
343
- "type": "Integer",
344
- "required": "1"
345
- }, {"name": "zhuanzhengriqi", "label": "转正日期", "type": "Date", "required": "0"}, {
346
- "min": "-999999999",
347
- "max": "999999999",
348
- "precision": "2",
349
- "name": "shiyongqixinzi",
350
- "label": "试用期薪资",
351
- "type": "Money",
352
- "required": "0"
353
- }, {
354
- "min": "-999999999",
355
- "max": "999999999",
356
- "precision": "2",
357
- "name": "zhengshixinzi",
358
- "label": "正式薪资",
359
- "type": "Money",
360
- "required": "0"
361
- }, /*{
344
+ name: "pinyongxingshi",
345
+ label: "聘用形式",
346
+ type: "Option",
347
+ required: "0",
348
+ },
349
+ {
350
+ name: "yuangongzhuangtai",
351
+ label: "员工状态",
352
+ type: "Option",
353
+ required: "1",
354
+ },
355
+ {
356
+ name: "canjiagongzuoriqi",
357
+ label: "参加工作日期",
358
+ type: "Date",
359
+ required: "0",
360
+ },
361
+ {
362
+ name: "ruzhiriqi",
363
+ label: "入职日期",
364
+ type: "Date",
365
+ required: "1",
366
+ },
367
+ {
368
+ name: "shiyongqitianshu",
369
+ label: "试用期天数(天)",
370
+ type: "Integer",
371
+ required: "1",
372
+ },
373
+ { name: "zhuanzhengriqi", label: "转正日期", type: "Date", required: "0" },
374
+ {
375
+ min: "-999999999",
376
+ max: "999999999",
377
+ precision: "2",
378
+ name: "shiyongqixinzi",
379
+ label: "试用期薪资",
380
+ type: "Money",
381
+ required: "0",
382
+ },
383
+ {
384
+ min: "-999999999",
385
+ max: "999999999",
386
+ precision: "2",
387
+ name: "zhengshixinzi",
388
+ label: "正式薪资",
389
+ type: "Money",
390
+ required: "0",
391
+ },
392
+ /*{
362
393
  "searchDialogWidth": "520px",
363
394
  "name": "zhijieshangji",
364
395
  "label": "直接上级",
@@ -371,65 +402,75 @@ export default {
371
402
  "type": "Reference",
372
403
  "required": "0"
373
404
  },*/ {
374
- "name": "shebaozhanghao",
375
- "label": "社保账号",
376
- "type": "Text",
377
- "required": "0",
378
- "maxLength": "200"
379
- }, {
380
- "name": "gongjijinzhanghao",
381
- "label": "公积金账号",
382
- "type": "Text",
383
- "required": "0",
384
- "maxLength": "200"
385
- }, {
386
- "name": "yinhangkahao",
387
- "label": "银行卡号",
388
- "type": "Text",
389
- "required": "0",
390
- "maxLength": "200"
391
- }, {
392
- "name": "kaihuxing",
393
- "label": "开户行",
394
- "type": "Text",
395
- "required": "0",
396
- "maxLength": "200"
397
- }, {
398
- "name": "shoujihao",
399
- "label": "手机号",
400
- "type": "Text",
401
- "required": "0",
402
- "maxLength": "200"
403
- }, /*{
405
+ name: "shebaozhanghao",
406
+ label: "社保账号",
407
+ type: "Text",
408
+ required: "0",
409
+ maxLength: "200",
410
+ },
411
+ {
412
+ name: "gongjijinzhanghao",
413
+ label: "公积金账号",
414
+ type: "Text",
415
+ required: "0",
416
+ maxLength: "200",
417
+ },
418
+ {
419
+ name: "yinhangkahao",
420
+ label: "银行卡号",
421
+ type: "Text",
422
+ required: "0",
423
+ maxLength: "200",
424
+ },
425
+ {
426
+ name: "kaihuxing",
427
+ label: "开户行",
428
+ type: "Text",
429
+ required: "0",
430
+ maxLength: "200",
431
+ },
432
+ {
433
+ name: "shoujihao",
434
+ label: "手机号",
435
+ type: "Text",
436
+ required: "0",
437
+ maxLength: "200",
438
+ },
439
+ /*{
404
440
  "name": "changzhudizhi",
405
441
  "label": "常住地址",
406
442
  "type": "AreaSelect",
407
443
  "areaDataType": "2",
408
444
  "required": "0"
409
445
  },*/ {
410
- "name": "jutidizhi",
411
- "label": "具体地址",
412
- "type": "Text",
413
- "required": "0",
414
- "maxLength": "200"
415
- }, {"name": "zuigaoxueli", "label": "最高学历", "type": "Option", "required": "0"}, {
416
- "name": "biyeshijian",
417
- "label": "毕业时间",
418
- "type": "Date",
419
- "required": "0"
420
- }, {"name": "aa", "label": "aa", "type": "Integer", "required": "1"}, /*{
446
+ name: "jutidizhi",
447
+ label: "具体地址",
448
+ type: "Text",
449
+ required: "0",
450
+ maxLength: "200",
451
+ },
452
+ { name: "zuigaoxueli", label: "最高学历", type: "Option", required: "0" },
453
+ {
454
+ name: "biyeshijian",
455
+ label: "毕业时间",
456
+ type: "Date",
457
+ required: "0",
458
+ },
459
+ { name: "aa", label: "aa", type: "Integer", required: "1" },
460
+ /*{
421
461
  "detailEntity": "Jinjilianxiren",
422
462
  "name": "jinjilianxirenId",
423
463
  "label": "员工-紧急联系人.id主键",
424
464
  "type": "PrimaryKey",
425
465
  "required": "1"
426
466
  },*/ {
427
- "detailEntity": "Jinjilianxiren",
428
- "name": "createdOn",
429
- "label": "员工-紧急联系人.创建时间",
430
- "type": "DateTime",
431
- "required": "1"
432
- }, /*{
467
+ detailEntity: "Jinjilianxiren",
468
+ name: "createdOn",
469
+ label: "员工-紧急联系人.创建时间",
470
+ type: "DateTime",
471
+ required: "1",
472
+ },
473
+ /*{
433
474
  "searchDialogWidth": "520px",
434
475
  "detailEntity": "Jinjilianxiren",
435
476
  "name": "createdBy",
@@ -437,12 +478,13 @@ export default {
437
478
  "type": "Reference",
438
479
  "required": "1"
439
480
  },*/ {
440
- "detailEntity": "Jinjilianxiren",
441
- "name": "modifiedOn",
442
- "label": "员工-紧急联系人.最近修改时间",
443
- "type": "DateTime",
444
- "required": "0"
445
- }, /*{
481
+ detailEntity: "Jinjilianxiren",
482
+ name: "modifiedOn",
483
+ label: "员工-紧急联系人.最近修改时间",
484
+ type: "DateTime",
485
+ required: "0",
486
+ },
487
+ /*{
446
488
  "searchDialogWidth": "520px",
447
489
  "detailEntity": "Jinjilianxiren",
448
490
  "name": "modifiedBy",
@@ -457,38 +499,34 @@ export default {
457
499
  "type": "Reference",
458
500
  "required": "1"
459
501
  },*/ {
460
- "detailEntity": "Jinjilianxiren",
461
- "name": "shouji",
462
- "label": "员工-紧急联系人.手机",
463
- "type": "Text",
464
- "required": "0",
465
- "maxLength": "200"
466
- }, {
467
- "detailEntity": "Jinjilianxiren",
468
- "name": "jinjilianxirenxingming",
469
- "label": "员工-紧急联系人.紧急联系人姓名",
470
- "type": "Text",
471
- "required": "0",
472
- "maxLength": "200"
473
- }]
474
- }
502
+ detailEntity: "Jinjilianxiren",
503
+ name: "shouji",
504
+ label: "员工-紧急联系人.手机",
505
+ type: "Text",
506
+ required: "0",
507
+ maxLength: "200",
508
+ },
509
+ {
510
+ detailEntity: "Jinjilianxiren",
511
+ name: "jinjilianxirenxingming",
512
+ label: "员工-紧急联系人.紧急联系人姓名",
513
+ type: "Text",
514
+ required: "0",
515
+ maxLength: "200",
516
+ },
517
+ ],
518
+ },
475
519
  };
476
520
  if (res.data.fieldList) {
477
521
  this.fieldListData.fieldList = res.data.fieldList;
478
522
  if (res.data.subFormList) {
479
- this.fieldListData.subFormList =
480
- res.data.subFormList;
523
+ this.fieldListData.subFormList = res.data.subFormList;
481
524
  }
482
525
  this.meteFieldsResult = res;
483
- const metaFields = this.buildMetaFields(
484
- this.meteFieldsResult
485
- );
486
- this.$refs.designer.setFieldListData(
487
- this.fieldListData
488
- );
526
+ const metaFields = this.buildMetaFields(this.meteFieldsResult);
527
+ this.$refs.designer.setFieldListData(this.fieldListData);
489
528
  this.$refs.designer.setMetaFields(metaFields);
490
529
  }
491
-
492
530
  },
493
531
 
494
532
  buildMetaFields(mdResult) {
@@ -509,10 +547,7 @@ export default {
509
547
  return;
510
548
  }
511
549
 
512
- if (
513
- fld.type === "AnyReference" ||
514
- fld.type === "ReferenceList"
515
- ) {
550
+ if (fld.type === "AnyReference" || fld.type === "ReferenceList") {
516
551
  return;
517
552
  }
518
553
 
@@ -520,18 +555,11 @@ export default {
520
555
  return; //跳过本次循环
521
556
  }
522
557
 
523
- const fieldNewProps = deepClone(
524
- formFieldMapping[fld.type]
525
- );
558
+ const fieldNewProps = deepClone(formFieldMapping[fld.type]);
526
559
  const fieldSchema = deepClone(
527
- this.$refs.designer.designer.getFieldWidgetByType(
528
- fieldNewProps.type
529
- )
530
- );
531
- overwriteObj(
532
- fieldSchema.options,
533
- fieldNewProps.options
560
+ this.$refs.designer.designer.getFieldWidgetByType(fieldNewProps.type)
534
561
  );
562
+ overwriteObj(fieldSchema.options, fieldNewProps.options);
535
563
 
536
564
  fieldSchema.displayName = fld.label;
537
565
  fieldSchema.nameReadonly = true;
@@ -560,10 +588,7 @@ export default {
560
588
  fld.type !== "PrimaryKey"
561
589
  ) {
562
590
  //跳过id主键
563
- if (
564
- fld.type === "AnyReference" ||
565
- fld.type === "ReferenceList"
566
- ) {
591
+ if (fld.type === "AnyReference" || fld.type === "ReferenceList") {
567
592
  return;
568
593
  }
569
594
 
@@ -571,18 +596,11 @@ export default {
571
596
  return; //跳过本次循环
572
597
  }
573
598
 
574
- const fieldNewProps = deepClone(
575
- formFieldMapping[fld.type]
576
- );
599
+ const fieldNewProps = deepClone(formFieldMapping[fld.type]);
577
600
  const fieldSchema = deepClone(
578
- this.$refs.designer.designer.getFieldWidgetByType(
579
- fieldNewProps.type
580
- )
581
- );
582
- overwriteObj(
583
- fieldSchema.options,
584
- fieldNewProps.options
601
+ this.$refs.designer.designer.getFieldWidgetByType(fieldNewProps.type)
585
602
  );
603
+ overwriteObj(fieldSchema.options, fieldNewProps.options);
586
604
 
587
605
  fieldSchema.displayName = fld.label;
588
606
  fieldSchema.nameReadonly = true;
@@ -605,11 +623,9 @@ export default {
605
623
  let cloudStorageFlag = false;
606
624
  let cloudStorageType = "";
607
625
  if (mdResult.data.storageSetting) {
608
- cloudStorageFlag =
609
- mdResult.data.storageSetting[0].cloudStorage === "true";
626
+ cloudStorageFlag = mdResult.data.storageSetting[0].cloudStorage === "true";
610
627
  if (cloudStorageFlag) {
611
- cloudStorageType =
612
- mdResult.data.storageSetting[0].cloudStorageType;
628
+ cloudStorageType = mdResult.data.storageSetting[0].cloudStorageType;
613
629
  }
614
630
  }
615
631
 
@@ -646,35 +662,30 @@ export default {
646
662
  fieldSchema.options.precision = !fldObj.precision
647
663
  ? fieldSchema.options.precision
648
664
  : fldObj.precision * 1;
649
- fieldSchema.options.min = !fldObj.min
650
- ? fieldSchema.options.min
651
- : fldObj.min * 1;
652
- fieldSchema.options.max = !fldObj.max
653
- ? fieldSchema.options.max
654
- : fldObj.max * 1;
665
+ fieldSchema.options.min = !fldObj.min ? fieldSchema.options.min : fldObj.min * 1;
666
+ fieldSchema.options.max = !fldObj.max ? fieldSchema.options.max : fldObj.max * 1;
655
667
  }
656
668
 
657
669
  /* 处理地区选择字段 */
658
670
  if (fldObj.type === "AreaSelect") {
659
- fieldSchema.optionItemsReadonly = true;
660
671
  fieldSchema.options.areaDataType = !fldObj.areaDataType
661
672
  ? fieldSchema.options.areaDataType
662
673
  : fldObj.areaDataType * 1;
674
+ if (fldObj.areaName) {
675
+ fieldSchema.options.areaName = fldObj.areaName;
676
+ }
663
677
  }
664
678
 
665
679
  /* 处理一对一字段 */
666
680
  if (fldObj.type === "Reference") {
667
- fieldSchema.options.searchDialogWidth =
668
- !fldObj.searchDialogWidth
669
- ? fieldSchema.options.searchDialogWidth
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 (fieldSchema.options.name === "createdOn" || fieldSchema.options.name === "createdBy"
700
- || fieldSchema.options.name === "modifiedOn" || fieldSchema.options.name === "modifiedBy"
701
- || fieldSchema.options.name === "ownerUser" || fieldSchema.options.name === "ownerDepartment"
702
- || fieldSchema.options.name === "approvalConfigId" || fieldSchema.options.name === "approvalStatus"
703
- || fieldSchema.options.name === "lastApprovedBy" || fieldSchema.options.name === "lastApprovedOn") {
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