bl-common-vue3 3.8.120 → 3.8.122

package/package.json

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

package/src/common/utils/xlsx.js

@@ -316,18 +316,14 @@ export async function createWorkbook(
   const sourceJson = styledExportOptions.enabled
     ? json.map((item) => ({ ...item }))
     : null;
-  //导出xlsx
-  json.forEach((item) => {
-    for (let i in item) {
-      // eslint-disable-next-line no-prototype-builtins
-      if (fields.hasOwnProperty(i)) {
-        item[fields[i]] = item[i];
-      }
-      delete item[i]; //删除原先的对象属性
-    }
-  });
+  const fieldKeys = Object.keys(fields);
+  // 字段 key 必须保留到取值阶段；不同字段允许使用相同表头，不能用表头文案作为对象 key，否则后写入的同名列会丢失。
+  const sheetRows = [
+    Object.values(fields),
+    ...json.map((item) => fieldKeys.map((field) => item?.[field])),
+  ];
   let wb = XLSX.utils.book_new(); //工作簿对象包含一SheetNames数组，以及一个表对象映射表名称到表对象。XLSX.utils.book_new实用函数创建一个新的工作簿对象。
-  let ws = XLSX.utils.json_to_sheet(json, { header: Object.values(fields) }); //将JS对象数组转换为工作表。
+  let ws = XLSX.utils.aoa_to_sheet(sheetRows); //按列顺序写入，允许不同字段展示相同的表头文案。
   if (merges.length) {
     ws["!merges"] = merges;
   }

package/src/components/DepartmentPositionModal/index.vue

@@ -84,7 +84,7 @@
                   :tree-data="postsTreeData"
                   :show-line="true"
                   :show-icon="true"
-                  :defaultExpandAll="true"
+                  v-model:expandedKeys="treeExpandedKeysPosts"
                   :selectedKeys="treeSelectedKeysPosts"
                   @select="onTreeSelectPosts"
                   :fieldNames="{ title: 'name', key: 'id', children:'children'}"
@@ -181,7 +181,7 @@
 
 <script>
 import { cloneDeep } from "lodash";
-import {defineComponent, nextTick, reactive, toRefs, watch} from "vue";
+import {defineComponent, nextTick, onUnmounted, reactive, toRefs, watch} from "vue";
 import {
   message,
   Empty,
@@ -204,6 +204,8 @@ import UserDetail from "../UserDetail/index.vue";
 import BlModal from "../BlModal/index.vue";
 import {t, loadLanguageAsync} from "../../locale";
 
+const POST_GROUP_COLLAPSE_THRESHOLD = 3;
+
 export default defineComponent({
   name: "DepartmentPositionModal",
   components: {
@@ -248,6 +250,7 @@ export default defineComponent({
       departmentSelectedNodes: {},
       postsTreeData: [],
       treeSelectedKeysPosts: [],
+      treeExpandedKeysPosts: [],
       postsSelectedNodes: [],
       alertVisible: true,
       userList: [],
@@ -360,11 +363,30 @@ export default defineComponent({
         },
         success: (res) => {
           state.postsTreeData = utils.transListToTreeData(res.list, "");
+          state.treeExpandedKeysPosts = getPostsExpandedKeys(state.postsTreeData);
           state.treePostSpin = false;
         },
       });
     };
 
+    const getPostsExpandedKeys = (list) => {
+      if (list.length > POST_GROUP_COLLAPSE_THRESHOLD) {
+        return [];
+      }
+
+      const keys = [];
+      const collectExpandedKeys = (nodes) => {
+        nodes.forEach((node) => {
+          if (node.children?.length) {
+            keys.push(node.id);
+            collectExpandedKeys(node.children);
+          }
+        });
+      };
+      collectExpandedKeys(list);
+      return keys;
+    };
+
     const onTreeSelectPosts = (keys, e) => {
       if (e.node.dataRef.parent_id) {
         state.treeSelectedKeysPosts = keys;
@@ -559,9 +581,13 @@ export default defineComponent({
 
     loadLanguageAsync(utils.getLang());
 
-    window.addEventListener('setBLLang', (event) => {
+    const handleLanguageChange = (event) => {
       const newLang = event.newValue; // 获取新的语言值
       loadLanguageAsync(newLang);
+    };
+    window.addEventListener('setBLLang', handleLanguageChange);
+    onUnmounted(() => {
+      window.removeEventListener('setBLLang', handleLanguageChange);
     });
 
     return {