cloud-web-corejs 1.0.54-dev.645 → 1.0.54-dev.647

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

@@ -276,7 +276,7 @@
             class="a-link"
             data-tit="新增"
             @click="addEditRow(null, obj)"
-            v-if="widget.options.isTreeTable"
+            v-if="widget.options.isTreeTable && canShowRowAdd(obj)"
           >
             <el-tooltip
               :enterable="false"
@@ -287,7 +287,12 @@
               ><i class="el-icon-circle-plus-outline"></i
             ></el-tooltip>
           </a>
-          <a @click="editRowEvent(obj)" class="a-link" data-tit="行编辑">
+          <a
+            @click="editRowEvent(obj)"
+            class="a-link"
+            data-tit="行编辑"
+            v-if="canShowRowEdit(obj)"
+          >
             <el-tooltip
               :enterable="false"
               effect="dark"

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

@@ -2710,10 +2710,87 @@ modules = {
         this.handleWbs();
       });
     },
+    getTableRowAuthCode(authName) {
+      if (!authName) {
+        return null;
+      }
+      let formRef = this.getFormRef();
+      if (formRef && formRef.reportTemplate) {
+        return formRef.reportTemplate.formCode + ":" + authName;
+      }
+      return null;
+    },
+    hasTableRowPermission(authName) {
+      if (!authName) {
+        return true;
+      }
+      let authCode = this.getTableRowAuthCode(authName);
+      if (!authCode) {
+        return true;
+      }
+      let dispermissions = this.$store.getters.dispermissions;
+      return !dispermissions.includes(authCode);
+    },
+    getRowAddAuthName() {
+      return (
+        this.widget.options.rowAddAuthName ?? this.widget.options.treeRowAddName
+      );
+    },
+    getRowEditAuthName() {
+      return (
+        this.widget.options.rowEditAuthName ??
+        this.widget.options.treeRowEditName
+      );
+    },
+    getRowAddShow() {
+      return (
+        this.widget.options.rowAddShow ?? this.widget.options.treeRowAddShow
+      );
+    },
+    getRowEditShow() {
+      return (
+        this.widget.options.rowEditShow ?? this.widget.options.treeRowEditShow
+      );
+    },
+    isRowButtonShow(script, obj) {
+      if (!script) {
+        return true;
+      }
+      let result = this.handleCustomEvent(script, ["tableParam"], [obj]);
+      return result !== false;
+    },
+    canShowRowAdd(obj) {
+      return (
+        this.hasTableRowPermission(this.getRowAddAuthName()) &&
+        this.isRowButtonShow(this.getRowAddShow(), obj)
+      );
+    },
+    canShowRowEdit(obj) {
+      let isAddRow = !this.hasSaveRow(obj?.row);
+      if (isAddRow) return true;
+      return (
+        this.hasTableRowPermission(this.getRowEditAuthName()) &&
+        this.isRowButtonShow(this.getRowEditShow(), obj)
+      );
+    },
+    editRowEvent(obj) {
+      if (!this.canShowRowEdit(obj)) {
+        return false;
+      }
+      if (this.hasEditingRow(obj.$table, 1)) {
+        return false;
+      }
+      let row = obj.row;
+      obj.$table.editCloneRow = this.$baseLodash.cloneDeep(obj.row);
+      obj.$table.setActiveRow(row);
+    },
     addSiblingEditRow(rowData, obj) {
       this.addEditRow(rowData, obj, null, true);
     },
     addEditRow(rowData, obj, toEnd, toSibling) {
+      if (rowData == null && obj && !this.canShowRowAdd(obj)) {
+        return false;
+      }
       let isEditTable = this.widget.options.isEditTable || false;
       let isTreeTable = this.widget.options.isTreeTable || false;
       let parent = obj?.row;