cloud-web-corejs 1.0.54-dev.128 → 1.0.54-dev.129
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/VabUpload/view.vue +2 -2
- package/src/components/table/index.js +12 -11
- package/src/components/table/tableFormMixin.js +6 -3
- package/src/components/xform/form-render/container-item/data-table-item.vue +1 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +2 -1
- package/src/views/bd/setting/table_model/mixins/edit.js +1 -1
|
@@ -8,6 +8,7 @@ modules = {
|
|
|
8
8
|
formData: {
|
|
9
9
|
type: Object,
|
|
10
10
|
},
|
|
11
|
+
|
|
11
12
|
},
|
|
12
13
|
data() {
|
|
13
14
|
return {
|
|
@@ -31,11 +32,12 @@ modules = {
|
|
|
31
32
|
openAdvancedSearchDialog() {
|
|
32
33
|
let $grid = this.$parent;
|
|
33
34
|
let formData = this.formData;
|
|
35
|
+
let formData2 = this.$baseLodash.cloneDeep(this.formData);
|
|
34
36
|
let advancedFormData = {};
|
|
35
37
|
$grid.searchColumns.forEach((form1Field) => {
|
|
36
38
|
let nullValue = this.getNullValue(form1Field);
|
|
37
39
|
if (!form1Field.common) {
|
|
38
|
-
let value =
|
|
40
|
+
let value = formData2[form1Field.field];
|
|
39
41
|
if (value !== null && value !== undefined) {
|
|
40
42
|
advancedFormData[form1Field.field] = value;
|
|
41
43
|
} else {
|
|
@@ -70,11 +72,12 @@ modules = {
|
|
|
70
72
|
clearAdvancedSearchDialog() {
|
|
71
73
|
let $grid = this.$parent;
|
|
72
74
|
let formData = this.formData;
|
|
75
|
+
debugger
|
|
73
76
|
let advancedFormData = this.advancedFormData;
|
|
74
77
|
$grid.searchColumns.forEach((form1Field) => {
|
|
75
78
|
let nullValue = this.getNullValue(form1Field);
|
|
76
79
|
if (!form1Field.common) {
|
|
77
|
-
|
|
80
|
+
|
|
78
81
|
// formData[form1Field.field] = nullValue;
|
|
79
82
|
if(formData[form1Field.field] && Array.isArray(formData[form1Field.field]) ){
|
|
80
83
|
formData[form1Field.field].length = 0;
|
|
@@ -89,7 +92,7 @@ modules = {
|
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
});
|
|
92
|
-
this.$emit("advancedClear");
|
|
95
|
+
this.$emit("advancedClear",formData);
|
|
93
96
|
},
|
|
94
97
|
searchEvent() {
|
|
95
98
|
this.$emit("searchEvent");
|
|
@@ -100,7 +100,7 @@
|
|
|
100
100
|
</template>
|
|
101
101
|
</div>-->
|
|
102
102
|
|
|
103
|
-
<tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel"
|
|
103
|
+
<tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel" :xform="true"
|
|
104
104
|
@searchEvent="searchEvent" @resetEvent="resetEvent" @advancedClear="advancedClear"
|
|
105
105
|
@settingConfirm="tableFormSettingConfirm">
|
|
106
106
|
<template #buttonLeft>
|
|
@@ -1607,7 +1607,8 @@ modules = {
|
|
|
1607
1607
|
},
|
|
1608
1608
|
advancedClear() {
|
|
1609
1609
|
let formModel = this.formModel;
|
|
1610
|
-
this.getFormRef().setFormData(formModel);
|
|
1610
|
+
// this.getFormRef().setFormData(formModel);
|
|
1611
|
+
this.getGridTable().updateData();
|
|
1611
1612
|
},
|
|
1612
1613
|
tableFormSettingConfirm() {
|
|
1613
1614
|
let formModel = this.formModel;
|
|
@@ -570,7 +570,7 @@ modules = {
|
|
|
570
570
|
|
|
571
571
|
let referenceEntity = this.referenceEntity;
|
|
572
572
|
let refServiceName = this.refServiceName;
|
|
573
|
-
|
|
573
|
+
|
|
574
574
|
let referenceZd = referenceEntity + "." + this.referenceKey;
|
|
575
575
|
let referenceShowFields = this.referenceShowFields;
|
|
576
576
|
let keys = referenceShowFields.map(item => {
|