cloud-web-corejs 1.0.54-dev.373 → 1.0.54-dev.374
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/excelExport/mixins.js +0 -2
- package/src/components/vb-tabs/x-tabs.vue +13 -9
- package/src/components/xform/form-designer/form-widget/dialog/formulaDialog.vue +1 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +2 -2
- package/src/components/xform/form-render/indexMixin.js +0 -2
- package/src/views/user/form/view/list.vue +1 -1
package/package.json
CHANGED
|
@@ -752,7 +752,6 @@ function getGrid(that, tableRef) {
|
|
|
752
752
|
resultStr = "[EXPNUM]" + resultStr;
|
|
753
753
|
}
|
|
754
754
|
} else if (exportType == "Image" || (showImageAtTable && exportType == "Image2")) {
|
|
755
|
-
debugger
|
|
756
755
|
let attachments = row[column.field];
|
|
757
756
|
if (attachments) {
|
|
758
757
|
if (Array.isArray(attachments)) {
|
|
@@ -826,7 +825,6 @@ function getGrid(that, tableRef) {
|
|
|
826
825
|
downLoadFile2();
|
|
827
826
|
},
|
|
828
827
|
startProcess2(datas) {
|
|
829
|
-
debugger
|
|
830
828
|
this.tableTarget = getGrid(this.option.vue, this.option.targetRef);
|
|
831
829
|
let that = this;
|
|
832
830
|
let options = this.option;
|
|
@@ -45,15 +45,17 @@ export default {
|
|
|
45
45
|
openEditTab(row, param, option) {
|
|
46
46
|
let paneKeyName = this.paneKeyName;
|
|
47
47
|
let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
|
|
48
|
+
let tabParam = option?.tabParam || {};
|
|
49
|
+
let dataId = row ? row[paneKeyName] : null;
|
|
50
|
+
let newTab = {
|
|
51
|
+
data: row,
|
|
52
|
+
showContent: false,
|
|
53
|
+
dataId: dataId,
|
|
54
|
+
param,
|
|
55
|
+
...tabParam,
|
|
56
|
+
};
|
|
48
57
|
if (!tab) {
|
|
49
|
-
|
|
50
|
-
tab = {
|
|
51
|
-
data: row,
|
|
52
|
-
showContent: false,
|
|
53
|
-
dataId: row[paneKeyName],
|
|
54
|
-
param,
|
|
55
|
-
...tabParam,
|
|
56
|
-
};
|
|
58
|
+
tab = newTab;
|
|
57
59
|
if (this.tabs.length >= 30) {
|
|
58
60
|
this.tabs.splice(0, 1, tab);
|
|
59
61
|
} else {
|
|
@@ -63,8 +65,10 @@ export default {
|
|
|
63
65
|
let paneName = this.getCurrentPaneName();
|
|
64
66
|
tab.paneName = paneName;
|
|
65
67
|
});
|
|
68
|
+
} else {
|
|
69
|
+
Object.assign(tab, newTab);
|
|
66
70
|
}
|
|
67
|
-
this.activeName = row[paneKeyName] + "";
|
|
71
|
+
this.activeName = row ? row[paneKeyName] + "" : "";
|
|
68
72
|
tab.showContent = false;
|
|
69
73
|
setTimeout(() => {
|
|
70
74
|
tab.showContent = true;
|
|
@@ -479,7 +479,7 @@ export default {
|
|
|
479
479
|
const thirdPart = arr[2];
|
|
480
480
|
const fieldId = firstPart.substring(2, firstPart.length);
|
|
481
481
|
const nodeType = thirdPart.substring(0, thirdPart.length - 2);
|
|
482
|
-
|
|
482
|
+
|
|
483
483
|
showFormula = showFormula.replaceAll(mi, secondPart);
|
|
484
484
|
if (nodeType == "field") {
|
|
485
485
|
realFormula = realFormula.replaceAll(mi, `[${fieldId}]`);
|
|
@@ -536,12 +536,12 @@ modules = {
|
|
|
536
536
|
}
|
|
537
537
|
this.resetEvent();
|
|
538
538
|
},
|
|
539
|
-
openEditDialog(row, param) {
|
|
539
|
+
openEditDialog(row, param, option) {
|
|
540
540
|
let formRef = this.getFormRef();
|
|
541
541
|
let parentTarget = formRef.$attrs["parent-target"];
|
|
542
542
|
parentTarget &&
|
|
543
543
|
parentTarget.$attrs.openEditDialog &&
|
|
544
|
-
parentTarget.$attrs.openEditDialog(row, param);
|
|
544
|
+
parentTarget.$attrs.openEditDialog(row, param, option);
|
|
545
545
|
},
|
|
546
546
|
importExcel() {},
|
|
547
547
|
getGrid(that, tableRef) {
|
|
@@ -2814,9 +2814,7 @@ modules = {
|
|
|
2814
2814
|
|
|
2815
2815
|
|
|
2816
2816
|
/* let dom1 = clonedElement.querySelector(".detail-wrap")
|
|
2817
|
-
debugger
|
|
2818
2817
|
if(dom1){
|
|
2819
|
-
debugger
|
|
2820
2818
|
let dom2 = dom1.children[1];
|
|
2821
2819
|
dom2.style.height = "auto;"
|
|
2822
2820
|
dom2.querySelector(".d-cont").style.height = "auto;"
|