@zscreate/zhxy-app-component 1.0.358 → 1.0.359
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.
|
@@ -35,7 +35,13 @@
|
|
|
35
35
|
default: () => {
|
|
36
36
|
return {}
|
|
37
37
|
}
|
|
38
|
-
}
|
|
38
|
+
},
|
|
39
|
+
dataObj: {
|
|
40
|
+
type: Object,
|
|
41
|
+
default: () => {
|
|
42
|
+
return {}
|
|
43
|
+
}
|
|
44
|
+
},
|
|
39
45
|
},
|
|
40
46
|
computed: {
|
|
41
47
|
// 整个form是否有*号，为了保证label对齐，而不是和*号对齐
|
|
@@ -43,6 +49,11 @@
|
|
|
43
49
|
return true
|
|
44
50
|
}
|
|
45
51
|
},
|
|
52
|
+
provide() {
|
|
53
|
+
return {
|
|
54
|
+
dataObj: () => this.dataObj,
|
|
55
|
+
}
|
|
56
|
+
},
|
|
46
57
|
watch: {
|
|
47
58
|
rules: {
|
|
48
59
|
immediate: true,
|
|
@@ -50,7 +61,7 @@
|
|
|
50
61
|
handler(value) {
|
|
51
62
|
this.mRules = value || {}
|
|
52
63
|
}
|
|
53
|
-
}
|
|
64
|
+
},
|
|
54
65
|
},
|
|
55
66
|
data() {
|
|
56
67
|
return {
|
|
@@ -729,6 +729,7 @@ export default {
|
|
|
729
729
|
formId: String,
|
|
730
730
|
itemkey: [Number, String],
|
|
731
731
|
models: [Object],
|
|
732
|
+
newModels: [Object],
|
|
732
733
|
isCorrect: [Number, String, null],
|
|
733
734
|
widget: Object,
|
|
734
735
|
labelStyle: Object,
|
|
@@ -1385,7 +1386,7 @@ export default {
|
|
|
1385
1386
|
let options = this.widget.options
|
|
1386
1387
|
let time = this.tableKey ?
|
|
1387
1388
|
this.models[this.tableKey][this.tableIndex][options.conditionValue] : this.models[options
|
|
1388
|
-
.conditionValue]
|
|
1389
|
+
.conditionValue] || this.newModels[options.conditionValue] //newModels在安农大纠错弹框中会传入，修复范围比较无效问题
|
|
1389
1390
|
if (!value || !time) {
|
|
1390
1391
|
callback()
|
|
1391
1392
|
}
|