cnhis-design-vue 3.1.28-beta.0 → 3.1.28-beta.1

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1138,6 +1138,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const colspanMethod = (payload) => {
       var _a;
+      const defaultSpan = {
+        rowspan: 1,
+        colspan: 1
+      };
       const {
         row,
         column
@@ -1147,36 +1151,32 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (isFunction(attr["span-method"]))
         return attr["span-method"](payload);
       if (state.isTree != 3) {
-        return {
-          rowspan: 1,
-          colspan: 1
-        };
+        return defaultSpan;
       }
-      let xTree = xGrid.value;
-      let fristKeyIndex = xTree.getTableColumn().tableColumn.findIndex((column2) => {
-        return !!column2.property;
-      });
-      let colspan = xTree.getTableColumn().tableColumn.length - fristKeyIndex;
-      if (xTree) {
-        const isOldVxeTree = row.childrenList && row.childrenList.length;
-        const isTransformVxeTree = ((_a = props.tableParams) == null ? void 0 : _a.isTransform) && !row.qianduan_parent_id;
-        if (isOldVxeTree || isTransformVxeTree) {
-          if (column.treeNode) {
-            return {
-              rowspan: 1,
-              colspan
-            };
-          } else if (!column.property) {
-            return {
-              rowspan: 1,
-              colspan: 1
-            };
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            };
-          }
+      const xTree = xGrid.value;
+      if (!xTree)
+        return defaultSpan;
+      const {
+        tableColumn = []
+      } = (xTree == null ? void 0 : xTree.getTableColumn()) || {};
+      const fristKeyIndex = tableColumn.findIndex((column2) => !!column2.property);
+      const fixedRightColsSpan = tableColumn.filter((column2) => column2.fixed === "right").length;
+      const colspan = tableColumn.length - fristKeyIndex - fixedRightColsSpan;
+      const isOldVxeTree = row.childrenList && row.childrenList.length;
+      const isTransformVxeTree = ((_a = props.tableParams) == null ? void 0 : _a.isTransform) && !row.qianduan_parent_id;
+      if (isOldVxeTree || isTransformVxeTree) {
+        if (column.treeNode) {
+          return {
+            rowspan: 1,
+            colspan
+          };
+        } else if (!column.property || column.fixed === "right") {
+          return defaultSpan;
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          };
         }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.28-beta.0",
+	"version": "3.1.28-beta.1",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "694e0b5356152587734f7ca08aaa6c7fbfe5060e"
+	"gitHead": "0539d078909e5911ab63a2c4fbac874e11012a15"
 }