bl-common-vue3 3.8.107 → 3.8.109

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.107",
+  "version": "3.8.109",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/common/utils/xlsx.js

@@ -1,6 +1,60 @@
 import fs from "file-saver";
 import * as XLSX from "kj-xlsx";
-export function xlsx(json, fields, filename = ".xlsx") {
+
+export function getVerticalMergeCells(json, fields, options = {}) {
+  const { groupField, mergeFields = [] } = options;
+  if (!groupField || !Array.isArray(mergeFields) || !mergeFields.length) {
+    return [];
+  }
+
+  const fieldKeys = Object.keys(fields);
+  const mergeColumnIndexes = mergeFields
+    .map((field) => fieldKeys.indexOf(field))
+    .filter((columnIndex) => columnIndex >= 0);
+  if (!mergeColumnIndexes.length) {
+    return [];
+  }
+
+  const merges = [];
+  let groupStartIndex = 0;
+
+  const appendGroupMerges = (groupEndIndex) => {
+    const groupValue = json[groupStartIndex]?.[groupField];
+    if (
+      groupEndIndex <= groupStartIndex ||
+      groupValue === undefined ||
+      groupValue === null ||
+      groupValue === ""
+    ) {
+      return;
+    }
+
+    mergeColumnIndexes.forEach((columnIndex) => {
+      merges.push({
+        // 工作表第 0 行是表头，数据行需要整体向下偏移一行。
+        s: { r: groupStartIndex + 1, c: columnIndex },
+        e: { r: groupEndIndex + 1, c: columnIndex },
+      });
+    });
+  };
+
+  for (let rowIndex = 1; rowIndex <= json.length; rowIndex++) {
+    const groupChanged =
+      rowIndex === json.length ||
+      json[rowIndex]?.[groupField] !== json[groupStartIndex]?.[groupField];
+    if (!groupChanged) {
+      continue;
+    }
+
+    appendGroupMerges(rowIndex - 1);
+    groupStartIndex = rowIndex;
+  }
+
+  return merges;
+}
+
+export function xlsx(json, fields, filename = ".xlsx", mergeOptions = {}) {
+  const merges = getVerticalMergeCells(json, fields, mergeOptions);
   //导出xlsx
   json.forEach((item) => {
     for (let i in item) {
@@ -14,6 +68,9 @@ export function xlsx(json, fields, filename = ".xlsx") {
   let sheetName = filename.replace(/[\\/?*[\]:]/g, "").slice(0, 31) || "Sheet1"; //excel的文件名称
   let wb = XLSX.utils.book_new(); //工作簿对象包含一SheetNames数组，以及一个表对象映射表名称到表对象。XLSX.utils.book_new实用函数创建一个新的工作簿对象。
   let ws = XLSX.utils.json_to_sheet(json, { header: Object.values(fields) }); //将JS对象数组转换为工作表。
+  if (merges.length) {
+    ws["!merges"] = merges;
+  }
   wb.SheetNames.push(sheetName);
   wb.Sheets[sheetName] = ws;
   const defaultCellStyle = {

package/src/components/CustomTable/index.vue

@@ -816,7 +816,7 @@
                           <template #title>
                             {{ i18nMapShow(item, ["name"], ["name"]) }}
                           </template>
-                          <template v-for="(child, childIndex) in item.children" :key="child.key">
+                          <template v-for="(child) in item.children" :key="child.key">
                             <a-menu-item v-if="child?.show ?? true" :key="child.key">
                               <a-button v-bind="{ ...(child?.props || {}), }" @click.stop="child?.onClick">
                                 <template #icon v-if="buttonIconSlots.indexOf(`${child.key}`) > -1">
@@ -4056,7 +4056,7 @@ export default defineComponent({
           'dateTimeRangePicker': 'date_time',
           'timeRangePicker': 'time',
         }
-        
+
         if(singleDateInputTypes.includes(input_type)) {
           valueShow = dateFormatMaps[inputTypeFormatMaps[input_type]]?dayjs(value).format(dateFormatMaps[inputTypeFormatMaps[input_type]]):value
         }

package/src/components/ExportComponents/index.vue

@@ -67,6 +67,10 @@ export default defineComponent({
       type: Object,
       default: () => ({})
     },
+    merge_options: {    //导出表格纵向合并配置
+      type: Object,
+      default: () => ({})
+    },
     custom_result: {    //导出表格头部
       type: Object,
       // eslint-disable-next-line vue/require-valid-default-prop
@@ -123,7 +127,7 @@ export default defineComponent({
                 console.log('导出文档')
                 setTimeout(() => {
                   let list = utils.deepClone(state.ExportList);
-                  xlsx(list, removeUndefined(props.columnstitle), props.title);
+                  xlsx(list, removeUndefined(props.columnstitle), props.title, props.merge_options);
                   context.emit("success", t('ExportComponents.index.921182-2'));
                   closeModal()
                 }, 200);
@@ -140,7 +144,7 @@ export default defineComponent({
                 console.log('导出文档')
                 setTimeout(() => {
                   let list = utils.deepClone(state.ExportList);
-                  xlsx(list, removeUndefined(props.columnstitle), props.title);
+                  xlsx(list, removeUndefined(props.columnstitle), props.title, props.merge_options);
                   context.emit("success", t('ExportComponents.index.921182-2'));
                   closeModal()
                 }, 200);
@@ -160,7 +164,7 @@ export default defineComponent({
         (val) => {
           setTimeout(() => {
             let list = utils.deepClone(val);
-            xlsx(list, removeUndefined(props.columnstitle), props.title);
+            xlsx(list, removeUndefined(props.columnstitle), props.title, props.merge_options);
             context.emit("success", t('ExportComponents.index.921182-2'));
             closeModal()
           }, 200);

package/src/components/VillageTree/index.vue

@@ -900,23 +900,8 @@ export default defineComponent({
           if (build) {
             /* 处理没有楼层的情况 */
             if (noLayer.value) {
-              const room = build.children.find(
-                (item) => item.id == refreshParams.roomId
-              );
-              if (room) {
-                getSubRooms(room, true).then(() => {
-                  if (refreshParams.selected && refreshParams.selected.roomId) {
-                    setSelected(room);
-                  }
-                  state.loadingTree = false;
-                });
-              }
-            } else {
-              const layer = build.children.find(
-                (item) => item.id == refreshParams.layerId
-              );
-              if (layer) {
-                const room = build.children.find(
+              getRoomList(build, true).then(() => {
+                const room = (build.children || []).find(
                   (item) => item.id == refreshParams.roomId
                 );
                 if (room) {
@@ -926,8 +911,35 @@ export default defineComponent({
                     }
                     state.loadingTree = false;
                   });
+                } else {
+                  state.loadingTree = false;
                 }
-              }
+              });
+            } else {
+              getLayerList(build, true).then(() => {
+                const layer = (build.children || []).find(
+                  (item) => item.id == refreshParams.layerId
+                );
+                if (layer) {
+                  getRoomList(layer, true).then(() => {
+                    const room = (layer.children || []).find(
+                      (item) => item.id == refreshParams.roomId
+                    );
+                    if (room) {
+                      getSubRooms(room, true).then(() => {
+                        if (refreshParams.selected && refreshParams.selected.roomId) {
+                          setSelected(room);
+                        }
+                        state.loadingTree = false;
+                      });
+                    } else {
+                      state.loadingTree = false;
+                    }
+                  });
+                } else {
+                  state.loadingTree = false;
+                }
+              });
             }
 
           }
@@ -949,17 +961,21 @@ export default defineComponent({
             }
           })
           if (build) {
-            const layer = build.children.find(
-              (item) => item.id == refreshParams.layerId
-            );
-            if (layer) {
-              getRoomList(layer, true).then(() => {
-                if (refreshParams.selected && refreshParams.selected.layerId) {
-                  setSelected(layer);
-                }
+            getLayerList(build, true).then(() => {
+              const layer = (build.children || []).find(
+                (item) => item.id == refreshParams.layerId
+              );
+              if (layer) {
+                getRoomList(layer, true).then(() => {
+                  if (refreshParams.selected && refreshParams.selected.layerId) {
+                    setSelected(layer);
+                  }
+                  state.loadingTree = false;
+                });
+              } else {
                 state.loadingTree = false;
-              });
-            }
+              }
+            });
           }
         }
       } else if (refreshParams.buildId) {