@fmdeui/fmui 1.0.113 → 1.0.114

package/es/hooks/useVxeTableOptionsHook.d.ts

@@ -38,6 +38,10 @@ interface iVxeOption {
     footerData?: VxeTablePropTypes.FooterData;
     footerMethod?: VxeTablePropTypes.FooterMethod<any>;
     remoteCustom?: boolean;
+    spanRules?: Array<{
+        valueField: string;
+        targetFields: string[];
+    }>;
 }
 /**
  * Vxe表格参数化Hook

package/es/packages/hooks/useVxeTableOptionsHook.mjs

@@ -7,7 +7,7 @@ import '../api/index.mjs';
 import { useBaseApi } from '../api/base/index.mjs';
 
 const useVxeTable = (opt, extras) => {
-  var _a, _b;
+  var _a, _b, _c;
   const vxeSize = useThemeConfig().themeConfig.globalComponentSize == "small" ? "mini" : useThemeConfig().themeConfig.globalComponentSize == "default" ? "small" : "medium";
   const userStore = useUserInfo();
   const processColumns = (columns) => {
@@ -58,7 +58,25 @@ const useVxeTable = (opt, extras) => {
         }
       }
     }
-  } : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
+  } : opt.spanMethod ? opt.spanMethod : opt.spanRules && ((_c = opt.spanRules) == null ? void 0 : _c.length) > 0 ? ({ row, rowIndex, column, visibleData }) => {
+    if (!opt.spanRules || opt.spanRules.length === 0) return void 0;
+    const rule = opt.spanRules.find((r) => r.targetFields.includes(column.field));
+    if (!rule) return;
+    const cellValue = row[rule.valueField];
+    if (!cellValue && cellValue !== 0) return;
+    const prevRow = visibleData[rowIndex - 1];
+    if (prevRow && prevRow[rule.valueField] === cellValue) {
+      return { rowspan: 0, colspan: 0 };
+    }
+    let rowspanCount = 1;
+    let nextIndex = rowIndex + 1;
+    while (nextIndex < visibleData.length && visibleData[nextIndex][rule.valueField] === cellValue) {
+      rowspanCount++;
+      nextIndex++;
+    }
+    if (rowspanCount > 1)
+      return { rowspan: rowspanCount, colspan: 1 };
+  } : ({ row, rowIndex, column, visibleData }) => {
   };
   const options = reactive({
     stripe: false,
@@ -159,11 +177,11 @@ const useVxeTable = (opt, extras) => {
   }
   if (opt.remoteCustom && options.customConfig != void 0) {
     options.customConfig.restoreStore = async ({ id, storeData }) => {
-      var _a2, _b2, _c, _d;
+      var _a2, _b2, _c2, _d;
       const { data } = await useBaseApi("sysColumnCustom").get({ id }, "sysColumnCustomDetail");
       if ((_a2 = data.result) == null ? void 0 : _a2.fixedData) storeData.fixedData = data.result.fixedData;
       if ((_b2 = data.result) == null ? void 0 : _b2.resizableData) storeData.resizableData = data.result.resizableData;
-      if ((_c = data.result) == null ? void 0 : _c.sortData) storeData.sortData = data.result.sortData;
+      if ((_c2 = data.result) == null ? void 0 : _c2.sortData) storeData.sortData = data.result.sortData;
       if ((_d = data.result) == null ? void 0 : _d.visibleData) storeData.visibleData = data.result.visibleData;
       return storeData;
     };

package/index.js

@@ -1,4 +1,4 @@
-/*! fmdeui-fmui v1.0.113 */
+/*! fmdeui-fmui v1.0.114 */
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vxe-table'), require('@vxe-ui/plugin-render-element'), require('@vxe-ui/plugin-export-xlsx'), require('vxe-pc-ui'), require('exceljs'), require('@element-plus/icons-vue'), require('vue'), require('element-plus'), require('lodash-es'), require('js-cookie'), require('pinia'), require('vue-router'), require('@vueuse/core'), require('crypto-js'), require('xlsx-js-style'), require('vue-i18n'), require('sortablejs'), require('screenfull'), require('push.js'), require('mitt'), require('@microsoft/signalr'), require('axios')) :
 	typeof define === 'function' && define.amd ? define(['exports', 'vxe-table', '@vxe-ui/plugin-render-element', '@vxe-ui/plugin-export-xlsx', 'vxe-pc-ui', 'exceljs', '@element-plus/icons-vue', 'vue', 'element-plus', 'lodash-es', 'js-cookie', 'pinia', 'vue-router', '@vueuse/core', 'crypto-js', 'xlsx-js-style', 'vue-i18n', 'sortablejs', 'screenfull', 'push.js', 'mitt', '@microsoft/signalr', 'axios'], factory) :
@@ -20438,7 +20438,7 @@
 	}
 
 	const useVxeTable = (opt, extras) => {
-	  var _a, _b;
+	  var _a, _b, _c;
 	  const vxeSize = useThemeConfig().themeConfig.globalComponentSize == "small" ? "mini" : useThemeConfig().themeConfig.globalComponentSize == "default" ? "small" : "medium";
 	  const userStore = useUserInfo();
 	  const processColumns = (columns) => {
@@ -20489,7 +20489,25 @@
 	        }
 	      }
 	    }
-	  } : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
+	  } : opt.spanMethod ? opt.spanMethod : opt.spanRules && ((_c = opt.spanRules) == null ? void 0 : _c.length) > 0 ? ({ row, rowIndex, column, visibleData }) => {
+	    if (!opt.spanRules || opt.spanRules.length === 0) return void 0;
+	    const rule = opt.spanRules.find((r) => r.targetFields.includes(column.field));
+	    if (!rule) return;
+	    const cellValue = row[rule.valueField];
+	    if (!cellValue && cellValue !== 0) return;
+	    const prevRow = visibleData[rowIndex - 1];
+	    if (prevRow && prevRow[rule.valueField] === cellValue) {
+	      return { rowspan: 0, colspan: 0 };
+	    }
+	    let rowspanCount = 1;
+	    let nextIndex = rowIndex + 1;
+	    while (nextIndex < visibleData.length && visibleData[nextIndex][rule.valueField] === cellValue) {
+	      rowspanCount++;
+	      nextIndex++;
+	    }
+	    if (rowspanCount > 1)
+	      return { rowspan: rowspanCount, colspan: 1 };
+	  } : ({ row, rowIndex, column, visibleData }) => {
 	  };
 	  const options = vue.reactive({
 	    stripe: false,
@@ -20590,11 +20608,11 @@
 	  }
 	  if (opt.remoteCustom && options.customConfig != void 0) {
 	    options.customConfig.restoreStore = async ({ id, storeData }) => {
-	      var _a2, _b2, _c, _d;
+	      var _a2, _b2, _c2, _d;
 	      const { data } = await useBaseApi("sysColumnCustom").get({ id }, "sysColumnCustomDetail");
 	      if ((_a2 = data.result) == null ? void 0 : _a2.fixedData) storeData.fixedData = data.result.fixedData;
 	      if ((_b2 = data.result) == null ? void 0 : _b2.resizableData) storeData.resizableData = data.result.resizableData;
-	      if ((_c = data.result) == null ? void 0 : _c.sortData) storeData.sortData = data.result.sortData;
+	      if ((_c2 = data.result) == null ? void 0 : _c2.sortData) storeData.sortData = data.result.sortData;
 	      if ((_d = data.result) == null ? void 0 : _d.visibleData) storeData.visibleData = data.result.visibleData;
 	      return storeData;
 	    };