@fmdeui/fmui 1.0.112 → 1.0.114

package/es/packages/hooks/useVxeTableOptionsHook.mjs

@@ -7,25 +7,26 @@ import '../api/index.mjs';
 import { useBaseApi } from '../api/base/index.mjs';
 
 const useVxeTable = (opt, extras) => {
+  var _a, _b, _c;
   const vxeSize = useThemeConfig().themeConfig.globalComponentSize == "small" ? "mini" : useThemeConfig().themeConfig.globalComponentSize == "default" ? "small" : "medium";
   const userStore = useUserInfo();
   const processColumns = (columns) => {
     columns.forEach((col) => {
-      var _a;
-      if ((_a = col.dictExportConfig) == null ? void 0 : _a.code) {
+      var _a2;
+      if ((_a2 = col.dictExportConfig) == null ? void 0 : _a2.code) {
         if (!col.exportMethod) {
           col.exportMethod = ({ row }) => {
-            var _a2, _b;
+            var _a3, _b2;
             const val = row[col.field];
             if (val === null || val === void 0 || val === "") return "";
-            if ((_a2 = col.dictExportConfig) == null ? void 0 : _a2.multiple) {
+            if ((_a3 = col.dictExportConfig) == null ? void 0 : _a3.multiple) {
               const values = String(val).split(",");
               return values.map((v) => {
-                var _a3;
-                return ((_a3 = userStore.getDictItemByValue(col.dictExportConfig.code, v.trim())) == null ? void 0 : _a3.label) || v;
+                var _a4;
+                return ((_a4 = userStore.getDictItemByValue(col.dictExportConfig.code, v.trim())) == null ? void 0 : _a4.label) || v;
               }).join(", ");
             }
-            return ((_b = userStore.getDictItemByValue(col.dictExportConfig.code, String(val))) == null ? void 0 : _b.label) || val;
+            return ((_b2 = userStore.getDictItemByValue(col.dictExportConfig.code, String(val))) == null ? void 0 : _b2.label) || val;
           };
         }
       }
@@ -38,6 +39,45 @@ const useVxeTable = (opt, extras) => {
     processColumns(opt.columns);
   }
   opt.id = opt.id ? opt.id : opt.name;
+  const spanFields = (_a = opt.spanFields) != null ? _a : [];
+  const spanValueField = (_b = opt.spanValueField) != null ? _b : "id";
+  const spanMethod = spanFields.length > 0 ? ({ 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 ? 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,
     id: opt.id,
@@ -48,6 +88,7 @@ const useVxeTable = (opt, extras) => {
     align: "center",
     // 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
     // data: [] as Array<T>,
+    spanMethod,
     columns: opt.columns,
     showFooter: opt.showFooter,
     footerData: opt.footerData,
@@ -136,11 +177,11 @@ const useVxeTable = (opt, extras) => {
   }
   if (opt.remoteCustom && options.customConfig != void 0) {
     options.customConfig.restoreStore = async ({ id, storeData }) => {
-      var _a, _b, _c, _d;
+      var _a2, _b2, _c2, _d;
       const { data } = await useBaseApi("sysColumnCustom").get({ id }, "sysColumnCustomDetail");
-      if ((_a = data.result) == null ? void 0 : _a.fixedData) storeData.fixedData = data.result.fixedData;
-      if ((_b = data.result) == null ? void 0 : _b.resizableData) storeData.resizableData = data.result.resizableData;
-      if ((_c = data.result) == null ? void 0 : _c.sortData) storeData.sortData = data.result.sortData;
+      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 ((_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/es/packages/locale/index.mjs

@@ -1,23 +1,23 @@
 import { createI18n } from 'vue-i18n';
 import '../api/index.mjs';
-import de_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/de.mjs';
-import en_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/en.mjs';
-import es_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/es.mjs';
-import fi_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fi.mjs';
-import fr_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fr.mjs';
-import it_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/it.mjs';
-import ja_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ja.mjs';
-import ko_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ko.mjs';
-import no_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/no.mjs';
-import pl_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pl.mjs';
-import pt_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pt.mjs';
-import ru_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ru.mjs';
-import zh_cn_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-cn.mjs';
-import zh_tw_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-tw.mjs';
-import th_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/th.mjs';
-import id_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/id.mjs';
-import ms_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ms.mjs';
-import vi_default from '../../node_modules/.pnpm/element-plus@2.14.1_vue@3.5.35_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/vi.mjs';
+import de_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/de.mjs';
+import en_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/en.mjs';
+import es_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/es.mjs';
+import fi_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fi.mjs';
+import fr_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/fr.mjs';
+import it_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/it.mjs';
+import ja_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ja.mjs';
+import ko_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ko.mjs';
+import no_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/no.mjs';
+import pl_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pl.mjs';
+import pt_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/pt.mjs';
+import ru_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ru.mjs';
+import zh_cn_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-cn.mjs';
+import zh_tw_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/zh-tw.mjs';
+import th_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/th.mjs';
+import id_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/id.mjs';
+import ms_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/ms.mjs';
+import vi_default from '../../node_modules/.pnpm/element-plus@2.14.2_vue@3.5.39_typescript@6.0.3_/node_modules/element-plus/es/locale/lang/vi.mjs';
 import msMY from '../../_virtual/en-US.mjs';
 import deDE from '../../_virtual/de-DE.mjs';
 import esES from '../../_virtual/es-ES.mjs';

package/es/types/router/index.d.ts

@@ -1,10 +1,11 @@
-export type { RouteRecordRaw, RouteRecordSingleView, RouteRecordSingleViewWithChildren, RouteRecordMultipleViews, RouteRecordMultipleViewsWithChildren, RouteRecordRedirect } from 'vue-router';
+import { RouteMeta } from 'vue-router';
+export type { RouteRecordRaw, RouteRecordSingleView, RouteRecordSingleViewWithChildren, RouteRecordMultipleViews, RouteRecordMultipleViewsWithChildren, RouteRecordRedirect, RouteMeta } from 'vue-router';
 export type RouteItem<T = any> = {
     path: string;
     name?: string | symbol | undefined | null;
     redirect?: any;
     k?: T;
-    meta?: {
+    meta?: RouteMeta & {
         title?: string;
         isLink?: string;
         isHide?: boolean;