cloud-web-corejs 1.0.54-dev.662 → 1.0.54-dev.663
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
CHANGED
|
@@ -1038,16 +1038,16 @@ export default {
|
|
|
1038
1038
|
cloned.columnOption = row.widget
|
|
1039
1039
|
? row.widget.options
|
|
1040
1040
|
: val !== null && typeof val === "object"
|
|
1041
|
-
|
|
1042
|
-
|
|
1041
|
+
? deepClone(val)
|
|
1042
|
+
: val;
|
|
1043
1043
|
return;
|
|
1044
1044
|
}
|
|
1045
1045
|
if (key === "editColumnOption") {
|
|
1046
1046
|
cloned.editColumnOption = row.editWidget
|
|
1047
1047
|
? row.editWidget.options
|
|
1048
1048
|
: val !== null && typeof val === "object"
|
|
1049
|
-
|
|
1050
|
-
|
|
1049
|
+
? deepClone(val)
|
|
1050
|
+
: val;
|
|
1051
1051
|
return;
|
|
1052
1052
|
}
|
|
1053
1053
|
if (val !== null && typeof val === "object") {
|
|
@@ -1196,6 +1196,8 @@ export default {
|
|
|
1196
1196
|
const source = this.optionModel.tableColumns || [];
|
|
1197
1197
|
this.sourceTableColumnsSnapshot = source;
|
|
1198
1198
|
this.tableData = this.cloneTableColumnsForEdit(source);
|
|
1199
|
+
debugger;
|
|
1200
|
+
let a = 1;
|
|
1199
1201
|
},
|
|
1200
1202
|
colSubmit() {
|
|
1201
1203
|
this.dialogVisible = !1;
|
|
@@ -1658,10 +1660,13 @@ export default {
|
|
|
1658
1660
|
columnOption.prefixIcon =
|
|
1659
1661
|
columnOption.prefixIcon || "el-icon-delete";
|
|
1660
1662
|
} else if ("editButton" == formatS) {
|
|
1661
|
-
columnOption.prefixIcon =
|
|
1662
|
-
columnOption.prefixIcon || "el-icon-edit";
|
|
1663
|
+
columnOption.prefixIcon = columnOption.prefixIcon || "el-icon-edit";
|
|
1663
1664
|
}
|
|
1664
|
-
} else if (
|
|
1665
|
+
} else if (
|
|
1666
|
+
!isChange &&
|
|
1667
|
+
columnOption &&
|
|
1668
|
+
Object.keys(columnOption).length
|
|
1669
|
+
) {
|
|
1665
1670
|
columnOption.required = row.required || false;
|
|
1666
1671
|
columnSelectedWidget.options = columnOption;
|
|
1667
1672
|
if ("editDelete" == formatS) {
|
|
@@ -1791,9 +1796,7 @@ export default {
|
|
|
1791
1796
|
if (row.formatS == "widgetRender") {
|
|
1792
1797
|
let formWidgetList = deepClone(this.designer.widgetList);
|
|
1793
1798
|
const widgetMap = this.buildColumnWidgetMap(
|
|
1794
|
-
this.sourceTableColumnsSnapshot
|
|
1795
|
-
|| this.optionModel.tableColumns
|
|
1796
|
-
|| []
|
|
1799
|
+
this.sourceTableColumnsSnapshot || this.optionModel.tableColumns || []
|
|
1797
1800
|
);
|
|
1798
1801
|
let tableData = this.restoreColumnWidgetRefs(
|
|
1799
1802
|
this.cloneTableColumnsForEdit(this.tableData),
|
|
@@ -1845,7 +1848,11 @@ export default {
|
|
|
1845
1848
|
index: index,
|
|
1846
1849
|
columnEditFields,
|
|
1847
1850
|
callback: (columnOption) => {
|
|
1848
|
-
this.confirmFormatConfigDialog(
|
|
1851
|
+
this.confirmFormatConfigDialog(
|
|
1852
|
+
columnOption,
|
|
1853
|
+
row,
|
|
1854
|
+
columnSelectedWidget
|
|
1855
|
+
);
|
|
1849
1856
|
},
|
|
1850
1857
|
});
|
|
1851
1858
|
},
|