@fmdevui/fm-dev 1.0.60 → 1.0.61

package/index.mjs

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.60 */
+/*! fm-dev v1.0.61 */
 import { defineComponent, reactive, computed, watch, resolveComponent, createBlock, openBlock, withCtx, createVNode, createElementVNode, createTextVNode, toDisplayString as toDisplayString$1, withDirectives, createElementBlock, Fragment, renderList, vShow, ref, onMounted, nextTick, normalizeStyle, createCommentVNode, normalizeClass, withModifiers, mergeModels, useModel, effectScope, getCurrentInstance, shallowRef, isRef as isRef$1, inject, onUnmounted, h, Text, resolveDynamicComponent, markRaw, toRaw as toRaw$1, hasInjectionContext, unref, isReactive as isReactive$1, toRef, getCurrentScope, onScopeDispose, toRefs, resolveDirective } from 'vue';
 import crypto from 'crypto';
 import require$$0 from 'url';
@@ -52814,7 +52814,7 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
-    spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
+    spanMethod: spanFields.length > 0 ? ({ row, rowIndex, column, visibleData }) => {
       const cellValue = row[spanValueField];
       if (cellValue && spanFields.includes(column.field)) {
         const prevRow = visibleData[rowIndex - 1];
@@ -52831,7 +52831,8 @@ const useVxeTable = (opt, extras) => {
           }
         }
       }
-    } : opt.spanMethod,
+    } : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
+    },
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,

package/lib/core/hook/useVxeTableOptionsHook.d.ts

@@ -14,7 +14,7 @@ interface iVxeOption {
     name?: string;
     spanFields?: Array<string>;
     spanValueField?: string;
-    spanMethod: VxeTablePropTypes.SpanMethod<any>;
+    spanMethod?: VxeTablePropTypes.SpanMethod<any>;
     columns: VxeGridPropTypes.Columns<any>;
     data?: VxeTablePropTypes.Data<any>;
     sortConfig?: VxeTablePropTypes.SortConfig<any>;

package/lib/packages/core/hook/useVxeTableOptionsHook.js

@@ -21,7 +21,7 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
-    spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
+    spanMethod: spanFields.length > 0 ? ({ row, rowIndex, column, visibleData }) => {
       const cellValue = row[spanValueField];
       if (cellValue && spanFields.includes(column.field)) {
         const prevRow = visibleData[rowIndex - 1];
@@ -38,7 +38,8 @@ const useVxeTable = (opt, extras) => {
           }
         }
       }
-    } : opt.spanMethod,
+    } : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
+    },
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmdevui/fm-dev",
-  "version": "1.0.60",
+  "version": "1.0.61",
   "description": "Page level components developed based on Element Plus.",
   "author": "fmdevui",
   "keywords": [