cloud-web-corejs 1.0.54-dev.541 → 1.0.54-dev.543

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

@@ -272,7 +272,12 @@
           </a>
         </template>
         <template v-else>
-          <a class="a-link" data-tit="新增" @click="addEditRow(null, obj)">
+          <a
+            class="a-link"
+            data-tit="新增"
+            @click="addEditRow(null, obj)"
+            v-if="widget.options.isTreeTable"
+          >
             <el-tooltip
               :enterable="false"
               effect="dark"

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

@@ -2359,7 +2359,7 @@ modules = {
           editDefaultRow = originOption.editDefaultRow || {};
         }
       }
-      
+
       // Object.assign(newRow, editDefaultRow, rowData);
       newRow.id
         = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
@@ -2422,20 +2422,19 @@ modules = {
     removeTreeRow(obj) {
       let row = obj.row;
       let $grid = this.getGridTable();
-      let childrenField = $grid.treeConfig.children;
+      let childrenField = $grid.treeConfig?.children;
       // let tableRows = this.formModel[this.fieldKeyName];
       // let index = tableRows.findIndex(item => item.id === row.id)
       let delIds = [];
-      if (row[childrenField]) {
-        let loopDo = (item) => {
-          if (item.id) delIds.push(item.id);
-          item[childrenField]
-            && item[childrenField].forEach((subItem) => {
-              loopDo(subItem);
-            });
-        };
-        loopDo(row);
-      }
+      let loopDo = (item) => {
+        if (item._X_ROW_KEY) delIds.push(item._X_ROW_KEY);
+        if(childrenField && item[childrenField]){
+          item[childrenField].forEach((subItem) => {
+            loopDo(subItem);
+          });
+        }
+      };
+      loopDo(row);
       /* delIds.forEach((id) => {
         let index = tableRows.findIndex((item) => item.id === id);
         let delRow = tableRows[index];
@@ -2443,8 +2442,20 @@ modules = {
         this.deleteRowWidgets(delRow);
       }); */
       let tableRows = this.getValue();
-      let newRows = tableRows.filter((item) => !delIds.includes(item.id));
-      this.setValue(newRows);
+      let delIndex = []
+      tableRows.map((item,index) => {
+        if(delIds.includes(item._X_ROW_KEY)){
+          delIndex.push(index);
+        }
+      });
+      delIndex.reverse().forEach((index) => {
+        tableRows.splice(index, 1);
+      });
+
+      // $grid.remove(obj.row);
+
+      // let newRows = tableRows.filter((item) => !delIds.includes(item.id));
+      // this.setValue(newRows);
       this.$nextTick(() => {
         this.handleWbs();
       });
@@ -2454,12 +2465,13 @@ modules = {
     },
     addEditRow(rowData, obj, toEnd, toSibling) {
       let isEditTable = this.widget.options.isEditTable || false;
+      let isTreeTable = this.widget.options.isTreeTable || false;
       let parent = obj?.row;
       let $grid = this.getGridTable();
       if (isEditTable && this.hasEditingRow($grid, 1)) {
         return false;
       }
-      let parentField = $grid.treeConfig.parentField;
+
       let newRow = {};
       let originOption = $grid.originOption;
       let editDefaultRow;
@@ -2470,15 +2482,19 @@ modules = {
           editDefaultRow = originOption.editDefaultRow || {};
         }
       }
-      // Object.assign(newRow, editDefaultRow, rowData);
+
       newRow.id
-        = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
-      if (!toSibling) {
-        newRow[parentField] = parent?.id || 0;
-      } else {
-        newRow[parentField] = obj?.row[parentField] || 0;
+          = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
+      if(isTreeTable){
+        let parentField = $grid.treeConfig.parentField;
+        if (!toSibling) {
+          newRow[parentField] = parent?.id || 0;
+        } else {
+          newRow[parentField] = obj?.row[parentField] || 0;
+        }
       }
 
+
       let newData = this.createNewTableData(isEditTable);
       newRow = Object.assign({}, newData, newRow, editDefaultRow, rowData);
 

package/src/components/xform/form-render/index.vue

@@ -113,7 +113,6 @@
 import "./container-item/index";
 import FieldComponents from "../../../components/xform/form-designer/form-widget/field-widget/index";
 import indexMixin from "../../../components/xform/form-render/indexMixin";
-import univerDialog from "../../../components/xform/form-designer/form-widget/dialog/univerDialog.vue";
 
 export default {
   name: "VFormRender",
@@ -134,12 +133,7 @@ export default {
     fileReferenceDialog: () =>
       import(
         "../../../components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue"
-      ),
-    univerDialog,
-    /* univerDialog: () =>
-      import(
-        "../../../components/xform/form-designer/form-widget/dialog/univerDialog.vue"
-      ), */
+      )
   },
   mixins: [indexMixin],
 };

package/src/components/xform/form-render/indexMixin.js

@@ -42,6 +42,7 @@ import JsPDF from "jspdf";
 import formulaDialog from "@base/components/xform/form-designer/form-widget/dialog/formulaDialog.vue";
 import baseFormulaDialog from "@base/components/xform/form-designer/form-widget/dialog/baseFormulaDialog.vue";
 import QRCode from "qrcode";
+import { openLuckysheetDialog } from "@base/components/luckysheet";
 
 let modules = {};
 const baseRefUtil = {
@@ -3715,9 +3716,8 @@ modules = {
         }
       });
     },
-    openUniverDialog(option) {
-      this.univerDialogOption = option;
-      this.showUniverDialog = true;
+    openLuckysheetDialog(option) {
+      openLuckysheetDialog(option);
     }
   },
 };