@fmdevui/fm-dev 1.0.59 → 1.0.60

package/index.mjs

@@ -1,4 +1,4 @@
-/*! fm-dev v1.0.59 */
+/*! fm-dev v1.0.60 */
 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';
@@ -52803,6 +52803,8 @@ var merge = createAssigner(function(object, source, srcIndex) {
 const vxeSize = useThemeConfig(pinia).themeConfig.globalComponentSize == "small" ? "mini" : useThemeConfig(pinia).themeConfig.globalComponentSize == "default" ? "small" : "medium";
 const useVxeTable = (opt, extras) => {
   opt.id = opt.id ? opt.id : String((/* @__PURE__ */ new Date()).getTime());
+  const spanFields = opt.spanFields ?? [];
+  const spanValueField = opt.spanValueField ?? "id";
   const options = reactive({
     id: opt.id,
     height: "auto",
@@ -52812,7 +52814,24 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
-    spanMethod: opt.spanMethod,
+    spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
+      const cellValue = row[spanValueField];
+      if (cellValue && spanFields.includes(column.field)) {
+        const prevRow = visibleData[rowIndex - 1];
+        let nextRow = visibleData[rowIndex + 1];
+        if (prevRow && prevRow[spanValueField] === cellValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          let countRowspan = 1;
+          while (nextRow && nextRow[spanValueField] === cellValue) {
+            nextRow = visibleData[++countRowspan + rowIndex];
+          }
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 };
+          }
+        }
+      }
+    } : opt.spanMethod,
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,

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

@@ -12,6 +12,8 @@ import { VNode } from 'vue';
 interface iVxeOption {
     id?: string;
     name?: string;
+    spanFields?: Array<string>;
+    spanValueField?: string;
     spanMethod: VxeTablePropTypes.SpanMethod<any>;
     columns: VxeGridPropTypes.Columns<any>;
     data?: VxeTablePropTypes.Data<any>;

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

@@ -10,6 +10,8 @@ var inpinia = require('../stores/inpinia.js');
 const vxeSize = themeConfig.useThemeConfig(inpinia.pinia).themeConfig.globalComponentSize == "small" ? "mini" : themeConfig.useThemeConfig(inpinia.pinia).themeConfig.globalComponentSize == "default" ? "small" : "medium";
 const useVxeTable = (opt, extras) => {
   opt.id = opt.id ? opt.id : String((/* @__PURE__ */ new Date()).getTime());
+  const spanFields = opt.spanFields ?? [];
+  const spanValueField = opt.spanValueField ?? "id";
   const options = vue.reactive({
     id: opt.id,
     height: "auto",
@@ -19,7 +21,24 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
-    spanMethod: opt.spanMethod,
+    spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
+      const cellValue = row[spanValueField];
+      if (cellValue && spanFields.includes(column.field)) {
+        const prevRow = visibleData[rowIndex - 1];
+        let nextRow = visibleData[rowIndex + 1];
+        if (prevRow && prevRow[spanValueField] === cellValue) {
+          return { rowspan: 0, colspan: 0 };
+        } else {
+          let countRowspan = 1;
+          while (nextRow && nextRow[spanValueField] === cellValue) {
+            nextRow = visibleData[++countRowspan + rowIndex];
+          }
+          if (countRowspan > 1) {
+            return { rowspan: countRowspan, colspan: 1 };
+          }
+        }
+      }
+    } : opt.spanMethod,
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,

package/package.json

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