askbot-dragon 1.4.66 → 1.4.68

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 (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/formTemplate.vue +34 -25
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "askbot-dragon",
3
- "version": "1.4.66",
3
+ "version": "1.4.68",
4
4
  "scripts": {
5
5
  "serve": "vue-cli-service serve",
6
6
  "build": "vue-cli-service build",
package/src/components/formTemplate.vue CHANGED
@@ -18,11 +18,11 @@
18
18
  <span style="color: red;padding-left: 5px;padding-right: 5px" v-if="item.fieldId !== '0feca81fce97465da537248c066e4db8' && item.fieldId !=='1d8bd21485834773a6d18eae60013000' && (item.required || isRequiredFn(item.formField))">*</span>
19
19
  <el-tooltip class="item" effect="dark" placement="right-start">
20
20
  <div slot="content" v-if="item.formField.remark">{{item.formField.remark.text}}</div>
21
- <div slot="content" v-else-if="item.formField.extInfo.remark">{{item.formField.extInfo.remark.text}}</div>
21
+ <div slot="content" v-else-if="item.formField.extInfo && item.formField.extInfo.remark">{{item.formField.extInfo.remark.text}}</div>
22
22
  <span v-if="item.formField.remark && item.formField.remark.enable">
23
23
  <i class="el-icon-warning-outline"></i>
24
24
  </span>
25
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable">
25
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable">
26
26
  <i class="el-icon-warning-outline"></i>
27
27
  </span>
28
28
  </el-tooltip>
@@ -290,7 +290,7 @@
290
290
  @click.stop="leftIcon(item.formField.remark)">
291
291
  <i class="el-icon-warning-outline"></i>
292
292
  </span>
293
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
293
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
294
294
  @click.stop="leftIcon(item.formField.extInfo.remark)">
295
295
  <i class="el-icon-warning-outline"></i>
296
296
  </span>
@@ -326,7 +326,7 @@
326
326
  @click.stop="leftIcon(item.formField.remark)">
327
327
  <i class="el-icon-warning-outline"></i>
328
328
  </span>
329
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
329
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
330
330
  @click.stop="leftIcon(item.formField.extInfo.remark)">
331
331
  <i class="el-icon-warning-outline"></i>
332
332
  </span>
@@ -340,7 +340,7 @@
340
340
  @click.stop="leftIcon(item.formField.remark)">
341
341
  <i class="el-icon-warning-outline"></i>
342
342
  </span>
343
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
343
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
344
344
  @click.stop="leftIcon(item.formField.extInfo.remark)">
345
345
  <i class="el-icon-warning-outline"></i>
346
346
  </span>
@@ -374,7 +374,7 @@
374
374
  @click.stop="leftIcon(item.formField.remark)">
375
375
  <i class="el-icon-warning-outline"></i>
376
376
  </span>
377
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
377
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
378
378
  @click.stop="leftIcon(item.formField.extInfo.remark)">
379
379
  <i class="el-icon-warning-outline"></i>
380
380
  </span>
@@ -405,7 +405,7 @@
405
405
  @click.stop="leftIcon(item.formField.remark)">
406
406
  <i class="el-icon-warning-outline"></i>
407
407
  </span>
408
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
408
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
409
409
  @click.stop="leftIcon(item.formField.extInfo.remark)">
410
410
  <i class="el-icon-warning-outline"></i>
411
411
  </span>
@@ -443,7 +443,7 @@
443
443
  @click.stop="leftIcon(item.formField.remark)">
444
444
  <i class="el-icon-warning-outline"></i>
445
445
  </span>
446
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
446
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
447
447
  @click.stop="leftIcon(item.formField.extInfo.remark)">
448
448
  <i class="el-icon-warning-outline"></i>
449
449
  </span>
@@ -481,7 +481,7 @@
481
481
  @click.stop="leftIcon(item.formField.remark)">
482
482
  <i class="el-icon-warning-outline"></i>
483
483
  </span>
484
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
484
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
485
485
  @click.stop="leftIcon(item.formField.extInfo.remark)">
486
486
  <i class="el-icon-warning-outline"></i>
487
487
  </span>
@@ -497,7 +497,7 @@
497
497
  @click.stop="leftIcon(item.formField.remark)">
498
498
  <i class="el-icon-warning-outline"></i>
499
499
  </span>
500
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
500
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
501
501
  @click.stop="leftIcon(item.formField.extInfo.remark)">
502
502
  <i class="el-icon-warning-outline"></i>
503
503
  </span>
@@ -515,7 +515,7 @@
515
515
  @click.stop="leftIcon(item.formField.remark)">
516
516
  <i class="el-icon-warning-outline"></i>
517
517
  </span>
518
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
518
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
519
519
  @click.stop="leftIcon(item.formField.extInfo.remark)">
520
520
  <i class="el-icon-warning-outline"></i>
521
521
  </span>
@@ -535,7 +535,7 @@
535
535
  @click.stop="leftIcon(item.formField.remark)">
536
536
  <i class="el-icon-warning-outline"></i>
537
537
  </span>
538
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
538
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
539
539
  @click.stop="leftIcon(item.formField.extInfo.remark)">
540
540
  <i class="el-icon-warning-outline"></i>
541
541
  </span>
@@ -559,7 +559,7 @@
559
559
  @click.stop="leftIcon(item.formField.remark)">
560
560
  <i class="el-icon-warning-outline"></i>
561
561
  </span>
562
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
562
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
563
563
  @click.stop="leftIcon(item.formField.extInfo.remark)">
564
564
  <i class="el-icon-warning-outline"></i>
565
565
  </span>
@@ -598,7 +598,7 @@
598
598
  @click.stop="leftIcon(item.formField.remark)">
599
599
  <i class="el-icon-warning-outline"></i>
600
600
  </span>
601
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
601
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
602
602
  @click.stop="leftIcon(item.formField.extInfo.remark)">
603
603
  <i class="el-icon-warning-outline"></i>
604
604
  </span>
@@ -635,7 +635,7 @@
635
635
  @click.stop="leftIcon(item.formField.remark)">
636
636
  <i class="el-icon-warning-outline"></i>
637
637
  </span>
638
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
638
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
639
639
  @click.stop="leftIcon(item.formField.extInfo.remark)">
640
640
  <i class="el-icon-warning-outline"></i>
641
641
  </span>
@@ -695,7 +695,7 @@
695
695
  @click.stop="leftIcon(item.formField.remark)">
696
696
  <i class="el-icon-warning-outline"></i>
697
697
  </span>
698
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
698
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
699
699
  @click.stop="leftIcon(item.formField.extInfo.remark)">
700
700
  <i class="el-icon-warning-outline"></i>
701
701
  </span>
@@ -711,7 +711,7 @@
711
711
  @click.stop="leftIcon(item.formField.remark)">
712
712
  <i class="el-icon-warning-outline"></i>
713
713
  </span>
714
- <span v-else-if="item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
714
+ <span v-else-if="item.formField.extInfo && item.formField.extInfo.remark && item.formField.extInfo.remark.enable"
715
715
  @click.stop="leftIcon(item.formField.extInfo.remark)">
716
716
  <i class="el-icon-warning-outline"></i>
717
717
  </span>
@@ -1190,6 +1190,7 @@ export default {
1190
1190
  this.isBaiLi = true;
1191
1191
  }
1192
1192
  this.isMobile()
1193
+ /* 取值extInfo值的时候需要注意，extInfo有可能存在null的情况 */
1193
1194
  },
1194
1195
  beforeCreate() {
1195
1196
  // 等待dom渲染完毕之后，再去显示 三级联动。
@@ -1323,7 +1324,14 @@ export default {
1323
1324
  clearOptionStruct() {
1324
1325
  // this.fieldValue,this.cascadeDetail.field.id
1325
1326
  console.log(this.detailField,'this.cascadeDetail',this.fieldValue[this.detailField.fieldId]);
1326
- let options = this.detailField.formField.extInfo.cascadeDown.options
1327
+ let options = [];
1328
+ if (this.detailField.formField.extInfo.cascadeDown && this.detailField.formField.extInfo.cascadeDown.options){
1329
+ options = this.detailField.formField.extInfo.cascadeDown.options
1330
+ } else if (this.detailField.formField.extInfo.cascade){
1331
+ options = this.detailField.formField.extInfo.cascade
1332
+ } else if (this.detailField.formField.extInfo.cascadeDown && this.detailField.formField.extInfo.cascadeDown[0]){
1333
+ options = this.detailField.formField.extInfo.cascadeDown[0].options
1334
+ }
1327
1335
  let clear = (options, parent) => {
1328
1336
  for (let index = 0; index < options.length; index++) {
1329
1337
  const opt = options[index];
@@ -1427,11 +1435,12 @@ export default {
1427
1435
  setOptions(extInfo){
1428
1436
  let options = []
1429
1437
  console.debug('cascadeDown',extInfo)
1430
- if (extInfo.cascadeDown.options){
1438
+ if (extInfo.cascadeDown && extInfo.cascadeDown.options){
1431
1439
  options = extInfo.cascadeDown.options
1432
1440
  return options
1433
- }
1434
- else if (extInfo.cascadeDown[0]){
1441
+ } else if (extInfo.cascade){
1442
+ options = extInfo.cascade
1443
+ } else if (extInfo.cascadeDown && extInfo.cascadeDown[0]){
1435
1444
  options = extInfo.cascadeDown[0].options
1436
1445
  }
1437
1446
  return options
@@ -2076,10 +2085,10 @@ export default {
2076
2085
  if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
2077
2086
  cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
2078
2087
  }
2079
- else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
2088
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
2080
2089
  cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
2081
2090
  }
2082
- else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
2091
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
2083
2092
  cascader = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
2084
2093
  }
2085
2094
  cascader.forEach(item=>{
@@ -2285,10 +2294,10 @@ export default {
2285
2294
  if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascade){
2286
2295
  this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascade
2287
2296
  }
2288
- else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
2297
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options){
2289
2298
  this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown.options
2290
2299
  }
2291
- else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
2300
+ else if (this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown && this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0]){
2292
2301
  this.data = this.formShow.form.formFieldRelation[i].formField.extInfo.cascadeDown[0].options
2293
2302
  }
2294
2303
  this.column[0].values = Object.values(this.data).map(function (e) {