cloud-web-corejs 1.0.54-dev.646 → 1.0.54-dev.648

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -153,8 +153,8 @@ modules = {
     buttonsColumnFixed: function () {
       return void 0 === this.widget.options.buttonsColumnFixed
         ? "right"
-        : !!this.widget.options.buttonsColumnFixed
-            && this.widget.options.buttonsColumnFixed;
+        : !!this.widget.options.buttonsColumnFixed &&
+            this.widget.options.buttonsColumnFixed;
     },
     formModel: {
       cache: !1,
@@ -188,8 +188,8 @@ modules = {
   },
   methods: {
     initTableCustomEvent() {
-      let tableConfig
-        = this.handleCustomEvent(this.widget.options.tableConfig) || {};
+      let tableConfig =
+        this.handleCustomEvent(this.widget.options.tableConfig) || {};
       this.eventConfig = tableConfig.eventConfig || {};
     },
     getTableColumnStatusWidgetLabelKey(obj) {
@@ -255,8 +255,8 @@ modules = {
       if (!formScriptEnabledTypes.includes(widgetType)) return;
 
       let formScriptEnabled = widget.options.formScriptEnabled || false;
-      let commonAttributeEnabled
-        = widget.options.commonAttributeEnabled || false;
+      let commonAttributeEnabled =
+        widget.options.commonAttributeEnabled || false;
       let commonAttributeCode = widget.options.commonAttributeCode;
       if (commonAttributeEnabled) {
         if (!commonAttributeCode) return;
@@ -453,10 +453,10 @@ modules = {
             let parentValue = row[parentField];
             // 根节点（parentField为null、undefined、空字符串或0）
             if (
-              parentValue === null
-              || parentValue === undefined
-              || parentValue === ""
-              || parentValue === 0
+              parentValue === null ||
+              parentValue === undefined ||
+              parentValue === "" ||
+              parentValue === 0
             ) {
               sortedRows.push(row);
               // 递归添加子节点
@@ -579,8 +579,8 @@ modules = {
       let ignoreFields = options?.ignoreFields || [];
       this.widget.widgetList.forEach((subWidget) => {
         if (
-          !ignoreFields.length
-          || !ignoreFields.includes(subWidget.options.name)
+          !ignoreFields.length ||
+          !ignoreFields.includes(subWidget.options.name)
         ) {
           let widgetRef = this.getWidgetRef(subWidget.options.name);
           if (widgetRef && widgetRef.setValue) widgetRef.setValue(null);
@@ -620,9 +620,9 @@ modules = {
         formCode = formConfig.addFormCode || formConfig.editFormCode;
       }
       let parentTarget = formRef.$attrs["parent-target"];
-      parentTarget
-        && parentTarget.$attrs.openEditDialog
-        && parentTarget.$attrs.openEditDialog(row, param, {
+      parentTarget &&
+        parentTarget.$attrs.openEditDialog &&
+        parentTarget.$attrs.openEditDialog(row, param, {
           formCode,
           ...option,
         });
@@ -833,8 +833,8 @@ modules = {
                 let currentData = obj.row;
                 let fieldKeyName = this.getFieldKeyName(fieldWidget);
                 let vabSearchName = fieldWidget.options.vabSearchName;
-                let multipleChoices
-                  = fieldWidget.options.multipleChoices || false;
+                let multipleChoices =
+                  fieldWidget.options.multipleChoices || false;
                 let labelField = vabSearchName || fieldKeyName;
                 if (!multipleChoices) {
                   result = currentData[labelField] ?? null;
@@ -891,8 +891,8 @@ modules = {
           }
         }
         if (t.tableColumnConfig) {
-          let tableColumnConfig
-            = this.handleCustomEvent(t.tableColumnConfig) || {};
+          let tableColumnConfig =
+            this.handleCustomEvent(t.tableColumnConfig) || {};
           col = extendDeeply(col, tableColumnConfig);
         }
         return col;
@@ -936,8 +936,8 @@ modules = {
         let valueField = fieldWidget.options.valueKey || "value";
         fieldWidget.options.optionItems.forEach((oItem) => {
           if (
-            oItem[valueField] === fieldModel
-            || this.findInArray(fieldModel, oItem[valueField]) !== -1
+            oItem[valueField] === fieldModel ||
+            this.findInArray(fieldModel, oItem[valueField]) !== -1
           ) {
             resultList.push(this.$t1(oItem[labelField]));
           }
@@ -976,8 +976,8 @@ modules = {
 
       let isQueryAllPage = !this.widget.options.isNotQueryAllPage;
 
-      let tableConfig
-        = this.handleCustomEvent(this.widget.options.tableConfig) || {};
+      let tableConfig =
+        this.handleCustomEvent(this.widget.options.tableConfig) || {};
       this.tableConfig = tableConfig;
 
       let tableConfig2 = this.$baseLodash.cloneDeep(tableConfig);
@@ -1093,12 +1093,12 @@ modules = {
         .filter((column) => !!column?.params?.editWidget)
         .map((column) => column.params.editWidget);
 
-      let height
-        = this.widget.options.tableHeight || (isQueryTable ? "auto" : null);
+      let height =
+        this.widget.options.tableHeight || (isQueryTable ? "auto" : null);
       if (
-        !this.widget.options.tableHeight
-        && isQueryTable
-        && this.previewState
+        !this.widget.options.tableHeight &&
+        isQueryTable &&
+        this.previewState
       ) {
         height = "550px";
       }
@@ -1205,11 +1205,11 @@ modules = {
                     } */
                     that.$nextTick(() => {
                       setTimeout(function () {
-                        dataTableConfig.callback
-                          && dataTableConfig.callback(rows);
+                        dataTableConfig.callback &&
+                          dataTableConfig.callback(rows);
                         tableOption.callback && tableOption.callback(rows);
-                        tableConfig.treeCallback
-                          && tableConfig.treeCallback(rows);
+                        tableConfig.treeCallback &&
+                          tableConfig.treeCallback(rows);
                       }, 0);
                     });
                   } else {
@@ -1302,8 +1302,8 @@ modules = {
 
       let exportItemConfig = null;
       if (
-        this.widget.options.exportItemColumns
-        && this.widget.options.exportItemColumns.length > 0
+        this.widget.options.exportItemColumns &&
+        this.widget.options.exportItemColumns.length > 0
       ) {
         let formatKeys = [
           "d1",
@@ -1354,8 +1354,8 @@ modules = {
         );
         exportItemConfig = {
           scriptCode:
-            this.widget.options.exportItemScriptCode
-            || this.widget.options.formScriptCode,
+            this.widget.options.exportItemScriptCode ||
+            this.widget.options.formScriptCode,
           columns: exportItemColumns,
           param: () => {
             if (this.widget.options.exportItemParam) {
@@ -1493,8 +1493,8 @@ modules = {
               }
 
               let reqPath = typeof path === "function" ? path() : path;
-              let accessReturnType
-                = this.widget.options.accessReturnType || "2";
+              let accessReturnType =
+                this.widget.options.accessReturnType || "2";
 
               return new Promise((resolve, reject) => {
                 let reqData = {
@@ -1530,8 +1530,8 @@ modules = {
                       if (res.type === "success") {
                         if (that.widget.options.isTreeTable) {
                           if (rows.length > 0) {
-                            let fullAllDataRowMap
-                              = $grid.$refs.xTable.fullAllDataRowMap;
+                            let fullAllDataRowMap =
+                              $grid.$refs.xTable.fullAllDataRowMap;
                             let parentField = $grid.treeConfig.parentField;
                             let expandAll = $grid.treeConfig.expandAll || false;
                             let isLazy = $grid.treeConfig.lazy;
@@ -1554,8 +1554,8 @@ modules = {
                                         lineData
                                       )
                                     ) {
-                                      let rest
-                                        = fullAllDataRowMap.get(lineData);
+                                      let rest =
+                                        fullAllDataRowMap.get(lineData);
                                       rest.treeLoaded = true;
                                     }
                                   });
@@ -1567,8 +1567,8 @@ modules = {
 
                             let row = rows.find((item) => !item[parentField]);
                             if (
-                              row
-                              && (!expandAll || !expandIds.includes(row.id))
+                              row &&
+                              (!expandAll || !expandIds.includes(row.id))
                             ) {
                               let hasChild = $grid.treeConfig.hasChild;
                               if (row[hasChild]) {
@@ -1583,8 +1583,8 @@ modules = {
                         }
                         that.$nextTick(() => {
                           setTimeout(function () {
-                            dataTableConfig.callback
-                              && dataTableConfig.callback(rows);
+                            dataTableConfig.callback &&
+                              dataTableConfig.callback(rows);
                             tableOption.callback && tableOption.callback(rows);
                             that.handleCustomEvent(
                               that.widget.options.formScriptCallback,
@@ -1742,13 +1742,13 @@ modules = {
                 if (["date-range", "time-range"].includes(wType)) {
                   item.filter = "between";
                 } else if (
-                  ["input-batch", "checkbox"].includes(wType)
-                  || (wType === "select" && wItem.options.multiple)
+                  ["input-batch", "checkbox"].includes(wType) ||
+                  (wType === "select" && wItem.options.multiple)
                 ) {
                   item.filter = "in";
                 } else if (
-                  ["radio", "time", "date"].includes(wType)
-                  || (wType === "select" && !wItem.options.multiple)
+                  ["radio", "time", "date"].includes(wType) ||
+                  (wType === "select" && !wItem.options.multiple)
                 ) {
                   item.filter = "eq";
                 } else {
@@ -1804,8 +1804,8 @@ modules = {
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           if (
-            item.formatS === "editSearch"
-            && item.widget?.options?.multipleChoices
+            item.formatS === "editSearch" &&
+            item.widget?.options?.multipleChoices
           ) {
             result.push(item.prop);
           }
@@ -1969,8 +1969,8 @@ modules = {
     },
     loadAccessData(flag) {
       if (
-        this.formModel[this.fieldKeyName]
-        && this.formModel[this.fieldKeyName].length
+        this.formModel[this.fieldKeyName] &&
+        this.formModel[this.fieldKeyName].length
       ) {
         this.initValue(this.formModel[this.fieldKeyName]);
       }
@@ -2039,9 +2039,9 @@ modules = {
     },
     isSingerlSearch(widget) {
       let widgetType = widget?.type;
-      let result
-        = widgetType === "singerSearch"
-        || (widgetType === "vabsearch" && !widget.options.multipleChoices);
+      let result =
+        widgetType === "singerSearch" ||
+        (widgetType === "vabsearch" && !widget.options.multipleChoices);
       return result;
     },
     getColumnNullValue(widget, defaultValueEnabled) {
@@ -2058,10 +2058,10 @@ modules = {
 
       let defaultValue = widget.options.defaultValue;
       if (
-        defaultValue !== undefined
-        && defaultValue !== null
-        && defaultValue !== ""
-        && defaultValueEnabled !== false
+        defaultValue !== undefined &&
+        defaultValue !== null &&
+        defaultValue !== "" &&
+        defaultValueEnabled !== false
       ) {
         nullValue = defaultValue;
       } else if (widgetType === "select" && widget.options.multiple) {
@@ -2199,13 +2199,13 @@ modules = {
           columnOption.required = row.required || false;
           columnSelectedWidget.options = columnOption;
           if ("editDelete" === formatS) {
-            columnSelectedWidget.options.hiddenByWf
-              = columnSelectedWidget.options.hiddenByWf ?? true;
-            columnSelectedWidget.options.prefixIcon
-              = columnSelectedWidget.options.prefixIcon || "el-icon-delete";
+            columnSelectedWidget.options.hiddenByWf =
+              columnSelectedWidget.options.hiddenByWf ?? true;
+            columnSelectedWidget.options.prefixIcon =
+              columnSelectedWidget.options.prefixIcon || "el-icon-delete";
           } else if ("editButton" === formatS) {
-            columnSelectedWidget.options.prefixIcon
-              = columnSelectedWidget.options.prefixIcon || "el-icon-edit";
+            columnSelectedWidget.options.prefixIcon =
+              columnSelectedWidget.options.prefixIcon || "el-icon-edit";
           }
         } else {
           columnSelectedWidget.options.required = row.required || false;
@@ -2214,44 +2214,44 @@ modules = {
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
             columnSelectedWidget.options.hiddenByWf = true;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
           } else if ("editButton" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-edit";
             columnSelectedWidget.options.label = "查看";
             columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
           } else if ("addSiblingEditRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增兄弟节点";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
           } else if ("addChildTreeRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增子节点";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
           } else if ("moveUpRow" === formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↑上移";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
           } else if ("moveDownRow" === formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↓下移";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
           } else if ("removeTreeRow" === formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-delete";
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick
-              = "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
+            columnSelectedWidget.options.onClick =
+              "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
           }
           columnOption = columnSelectedWidget.options;
         }
@@ -2388,9 +2388,9 @@ modules = {
     isVabsearchFlagWidget(widget) {
       let type = widget?.type;
       return (
-        type === "vabsearch"
-        || type === "singerSearch"
-        || type === "multiSearch"
+        type === "vabsearch" ||
+        type === "singerSearch" ||
+        type === "multiSearch"
       );
     },
     getColumnWidgetName(e) {
@@ -2431,8 +2431,8 @@ modules = {
       }
       let formRef = this.getFormRef();
       let dataTableConfig = formRef.$attrs.dataTableOption || {};
-      dataTableConfig.onCheckboxChange
-        && dataTableConfig.onCheckboxChange(param);
+      dataTableConfig.onCheckboxChange &&
+        dataTableConfig.onCheckboxChange(param);
     },
     handleCheckboxAll(param) {
       if (this.widget.options.onCheckboxAll) {
@@ -2611,8 +2611,8 @@ modules = {
       }
 
       // Object.assign(newRow, editDefaultRow, rowData);
-      newRow.id
-        = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
+      newRow.id =
+        "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
       if (!toSibling) {
         newRow[parentField] = parent?.id || 0;
       } else {
@@ -2627,8 +2627,8 @@ modules = {
         if (toEnd === true) {
           tableRows.push(newRow);
         } else if (toSibling === true) {
-          let addIndex
-            = tableRows.findIndex(
+          let addIndex =
+            tableRows.findIndex(
               (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
@@ -2649,8 +2649,8 @@ modules = {
           if (toEnd === true) {
             tableRows.push(newRow);
           } else if (toSibling === true) {
-            let addIndex
-              = tableRows.findIndex(
+            let addIndex =
+              tableRows.findIndex(
                 (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
@@ -2731,50 +2731,47 @@ modules = {
       let dispermissions = this.$store.getters.dispermissions;
       return !dispermissions.includes(authCode);
     },
-    getRowAddAuthName() {
-      return (
-        this.widget.options.rowAddAuthName ?? this.widget.options.treeRowAddName
-      );
+    getEditTreeButtonGroupConfig(obj) {
+      let columnConfig = obj?.column?.params?.columnConfig || {};
+      let tableOptions = this.widget.options || {};
+      return {
+        rowAddAuthName: columnConfig.rowAddAuthName,
+        rowEditAuthName: columnConfig.rowEditAuthName,
+        rowAddShow: columnConfig.rowAddShow,
+        rowEditShow: columnConfig.rowEditShow,
+      };
     },
-    getRowEditAuthName() {
-      return (
-        this.widget.options.rowEditAuthName
-        ?? this.widget.options.treeRowEditName
-      );
+    getRowAddAuthName(obj) {
+      return this.getEditTreeButtonGroupConfig(obj).rowAddAuthName;
     },
-    getRowAddShow() {
-      return (
-        this.widget.options.rowAddShow ?? this.widget.options.treeRowAddShow
-      );
+    getRowEditAuthName(obj) {
+      return this.getEditTreeButtonGroupConfig(obj).rowEditAuthName;
     },
-    getRowEditShow() {
-      return (
-        this.widget.options.rowEditShow ?? this.widget.options.treeRowEditShow
-      );
+    getRowAddShow(obj) {
+      return this.getEditTreeButtonGroupConfig(obj).rowAddShow;
+    },
+    getRowEditShow(obj) {
+      return this.getEditTreeButtonGroupConfig(obj).rowEditShow;
     },
     isRowButtonShow(script, obj) {
       if (!script) {
         return true;
       }
-      let result = this.handleCustomEvent(
-        script,
-        ["row", "rowIndex"],
-        [obj?.row, obj?.rowIndex]
-      );
+      let result = this.handleCustomEvent(script, ["tableParam"], [obj]);
       return result !== false;
     },
     canShowRowAdd(obj) {
       return (
-        this.hasTableRowPermission(this.getRowAddAuthName())
-        && this.isRowButtonShow(this.getRowAddShow(), obj)
+        this.hasTableRowPermission(this.getRowAddAuthName(obj)) &&
+        this.isRowButtonShow(this.getRowAddShow(obj), obj)
       );
     },
     canShowRowEdit(obj) {
       let isAddRow = !this.hasSaveRow(obj?.row);
       if (isAddRow) return true;
       return (
-        this.hasTableRowPermission(this.getRowEditAuthName())
-        && this.isRowButtonShow(this.getRowEditShow(), obj)
+        this.hasTableRowPermission(this.getRowEditAuthName(obj)) &&
+        this.isRowButtonShow(this.getRowEditShow(obj), obj)
       );
     },
     editRowEvent(obj) {
@@ -2814,8 +2811,8 @@ modules = {
         }
       }
 
-      newRow.id
-        = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
+      newRow.id =
+        "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
       if (isTreeTable) {
         let parentField = $grid.treeConfig.parentField;
         if (!toSibling) {
@@ -2833,8 +2830,8 @@ modules = {
         if (toEnd === true) {
           tableRows.push(newRow);
         } else if (toSibling === true) {
-          let addIndex
-            = tableRows.findIndex(
+          let addIndex =
+            tableRows.findIndex(
               (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
@@ -2855,8 +2852,8 @@ modules = {
           if (toEnd === true) {
             tableRows.push(newRow);
           } else if (toSibling === true) {
-            let addIndex
-              = tableRows.findIndex(
+            let addIndex =
+              tableRows.findIndex(
                 (item) => item._X_ROW_KEY === obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
@@ -2901,8 +2898,8 @@ modules = {
       let loopDo = (item, wbs) => {
         item.f_wbs = wbs;
         map[item._X_ROW_KEY] = wbs;
-        item[childrenField]
-          && item[childrenField].forEach((subitem, subindex) => {
+        item[childrenField] &&
+          item[childrenField].forEach((subitem, subindex) => {
             let sub_wbs = wbs + "." + (subindex + 1) + "";
             loopDo(subitem, sub_wbs);
           });

package/src/components/xform/form-render/container-item/list-h5-item.vue

@@ -1328,8 +1328,6 @@ export default {
           loop(wItem);
         });
       }
-      debugger;
-      let a = 1;
       return map;
     },
     loadTableData(param) {