cloud-web-corejs 1.0.54-dev.139 → 1.0.54-dev.140
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/designer.js +1514 -1
- package/src/components/xform/form-designer/indexMixin.js +783 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/columnRenderDialog.vue +132 -0
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +24 -2
- package/src/components/xform/form-designer/toolbar-panel/index.vue +0 -4
- package/src/components/xform/form-designer/toolbar-panel/indexMixin.js +566 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +2155 -1
- package/src/views/bd/setting/table_model/edit.vue +4 -3
- package/src/views/bd/setting/table_model/mixins/edit.js +9 -3
- package/src/views/user/form/vform/designer.vue +767 -753
- package/src/views/user/home/default.vue +1003 -979
|
@@ -157,7 +157,8 @@
|
|
|
157
157
|
max="200"
|
|
158
158
|
v-model="szTaMb.sszstEn"
|
|
159
159
|
@clear="
|
|
160
|
-
szTaMb.sszst =
|
|
160
|
+
szTaMb.sszst = null;
|
|
161
|
+
szTaMb.sszstBm = null;
|
|
161
162
|
$forceUpdate();
|
|
162
163
|
"
|
|
163
164
|
:disabled="szTaMb.taType == 0"
|
|
@@ -725,7 +726,7 @@
|
|
|
725
726
|
<tr>
|
|
726
727
|
<th>
|
|
727
728
|
<span class="t">
|
|
728
|
-
{{ $t1("
|
|
729
|
+
{{ $t1("对应表") }}
|
|
729
730
|
</span>
|
|
730
731
|
</th>
|
|
731
732
|
<td>
|
|
@@ -753,7 +754,7 @@
|
|
|
753
754
|
<tr>
|
|
754
755
|
<th>
|
|
755
756
|
<span class="t">
|
|
756
|
-
{{ $t1("
|
|
757
|
+
{{ $t1("对应表字段") }}
|
|
757
758
|
</span>
|
|
758
759
|
</th>
|
|
759
760
|
<td>
|
|
@@ -43,6 +43,7 @@ modules = {
|
|
|
43
43
|
sszstEn: null,
|
|
44
44
|
taEn: null,
|
|
45
45
|
taBm: null,
|
|
46
|
+
sszstBm: null,
|
|
46
47
|
},
|
|
47
48
|
treeDefaultZds: [],
|
|
48
49
|
productOption: {},
|
|
@@ -499,7 +500,7 @@ modules = {
|
|
|
499
500
|
generateCode: false,
|
|
500
501
|
fromTable: false,
|
|
501
502
|
toTaBmZd: null,
|
|
502
|
-
treeFlag:null
|
|
503
|
+
treeFlag: null,
|
|
503
504
|
};
|
|
504
505
|
this.szTaMb.szTaZdMbDTOs.splice(0, 0, item);
|
|
505
506
|
},
|
|
@@ -517,6 +518,7 @@ modules = {
|
|
|
517
518
|
let row = rows[0];
|
|
518
519
|
this.$set(this.szTaMb, "sszst", row.taCode);
|
|
519
520
|
this.$set(this.szTaMb, "sszstEn", row.taEn);
|
|
521
|
+
this.$set(this.szTaMb, "sszstBm", row.taBm);
|
|
520
522
|
}
|
|
521
523
|
},
|
|
522
524
|
confirmInsertItemSzTaMb(rows) {
|
|
@@ -990,6 +992,10 @@ modules = {
|
|
|
990
992
|
toTaBmZdField = item;
|
|
991
993
|
}
|
|
992
994
|
});
|
|
995
|
+
} else {
|
|
996
|
+
if (this.szTaMb.taType == 1 && this.szTaMb.sszstBm) {
|
|
997
|
+
toTaBmZdEntity = this.szTaMb.sszstBm;
|
|
998
|
+
}
|
|
993
999
|
}
|
|
994
1000
|
this.toTaBmZdEntity = toTaBmZdEntity;
|
|
995
1001
|
this.toTaBmZdField = toTaBmZdField;
|
|
@@ -1000,11 +1006,11 @@ modules = {
|
|
|
1000
1006
|
let toTaBmZdEntity = this.toTaBmZdEntity;
|
|
1001
1007
|
let toTaBmZdField = this.toTaBmZdField;
|
|
1002
1008
|
if (!toTaBmZdEntity) {
|
|
1003
|
-
this.$baseAlert(this.$t1("
|
|
1009
|
+
this.$baseAlert(this.$t1("对应表不能为空"));
|
|
1004
1010
|
return;
|
|
1005
1011
|
}
|
|
1006
1012
|
if (!toTaBmZdField) {
|
|
1007
|
-
this.$baseAlert(this.$t1("
|
|
1013
|
+
this.$baseAlert(this.$t1("对应表字段不能为空"));
|
|
1008
1014
|
return;
|
|
1009
1015
|
}
|
|
1010
1016
|
this.szTaMb.szTaZdMbDTOs[this.currentIndex].toTaBmZd =
|