bl-common-vue3 3.8.121 → 3.8.123

package/package.json

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

package/src/common/utils/xlsx.js

@@ -155,16 +155,23 @@ const getFieldStyle = (field, isDetailField, fieldStyles) => {
 };
 
 export function getVerticalMergeCells(json, fields, options = {}) {
-  const { groupField, mergeFields = [] } = options;
-  if (!groupField || !Array.isArray(mergeFields) || !mergeFields.length) {
+  const { groupField, mergeFields = [], mergeSameValueFields = [] } = options;
+  if (
+    !groupField ||
+    !Array.isArray(mergeFields) ||
+    !Array.isArray(mergeSameValueFields)
+  ) {
     return [];
   }
 
   const fieldKeys = Object.keys(fields);
-  const mergeColumnIndexes = mergeFields
+  const sameValueFields = [...new Set(mergeSameValueFields)]
+    .filter((field) => fieldKeys.includes(field));
+  const mergeColumnIndexes = [...new Set(mergeFields)]
+    .filter((field) => !sameValueFields.includes(field))
     .map((field) => fieldKeys.indexOf(field))
     .filter((columnIndex) => columnIndex >= 0);
-  if (!mergeColumnIndexes.length) {
+  if (!mergeColumnIndexes.length && !sameValueFields.length) {
     return [];
   }
 
@@ -189,6 +196,23 @@ export function getVerticalMergeCells(json, fields, options = {}) {
         e: { r: groupEndIndex + 1, c: columnIndex },
       });
     });
+
+    // 相同值只在当前主分组内继续分段合并，避免相邻账单的相同所属期被合并到一起。
+    if (sameValueFields.length) {
+      const groupRows = json.slice(groupStartIndex, groupEndIndex + 1);
+      sameValueFields.forEach((field) => {
+        const fieldMerges = getVerticalMergeCells(groupRows, fields, {
+          groupField: field,
+          mergeFields: [field],
+        });
+        fieldMerges.forEach(({ s, e }) => {
+          merges.push({
+            s: { r: s.r + groupStartIndex, c: s.c },
+            e: { r: e.r + groupStartIndex, c: e.c },
+          });
+        });
+      });
+    }
   };
 
   for (let rowIndex = 1; rowIndex <= json.length; rowIndex++) {

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 {

package/test/xlsx.test.js

@@ -0,0 +1,110 @@
+const assert = require("node:assert/strict");
+const { test } = require("node:test");
+
+const loadXlsx = () => import("../src/common/utils/xlsx.js");
+const fields = {
+  bill_number: "Bill number",
+  receipt_amount: "Receipt",
+  vat_period: "VAT period",
+  invoice_amount: "Invoice",
+  tax_amount: "Tax",
+};
+const rows = [
+  { bill_id: 1, bill_number: "B1", vat_period: "202608", receipt_amount: 100, invoice_amount: 200, tax_amount: 60 },
+  { bill_id: 1, bill_number: "B1", vat_period: "202608", receipt_amount: 150, invoice_amount: "", tax_amount: "" },
+  { bill_id: 1, bill_number: "B1", vat_period: "202609", receipt_amount: 300, invoice_amount: 100, tax_amount: 40 },
+  { bill_id: 1, bill_number: "B1", vat_period: "202609", receipt_amount: "", invoice_amount: 110, tax_amount: "" },
+  { bill_id: 1, bill_number: "B1", vat_period: "202609", receipt_amount: "", invoice_amount: 120, tax_amount: "" },
+  { bill_id: 2, bill_number: "B2", vat_period: "202609", receipt_amount: 400, invoice_amount: 500, tax_amount: 50 },
+  { bill_id: 2, bill_number: "B2", vat_period: "202609", receipt_amount: 450, invoice_amount: "", tax_amount: "" },
+];
+const mergeOptions = {
+  groupField: "bill_id",
+  mergeFields: ["bill_number"],
+  mergeSameValueFields: ["vat_period"],
+};
+
+test("existing whole-bill merges remain compatible", async () => {
+  const { getVerticalMergeCells } = await loadXlsx();
+  assert.deepEqual(getVerticalMergeCells(rows, fields, {
+    groupField: "bill_id",
+    mergeFields: ["bill_number"],
+  }), [
+    { s: { r: 1, c: 0 }, e: { r: 5, c: 0 } },
+    { s: { r: 6, c: 0 }, e: { r: 7, c: 0 } },
+  ]);
+  assert.deepEqual(getVerticalMergeCells(rows, fields), []);
+  assert.deepEqual(getVerticalMergeCells([], fields, mergeOptions), []);
+});
+
+for (const enabled of [true, false]) {
+  test(`xlsx round trip preserves bill boundaries and detail values (styles: ${enabled})`, async () => {
+    const { createWorkbook } = await loadXlsx();
+    const { XLSX, wb, ws } = await createWorkbook(rows, fields, mergeOptions, {
+      enabled,
+      detailFields: ["vat_period", "receipt_amount", "invoice_amount", "tax_amount"],
+    });
+    XLSX.utils.book_append_sheet(wb, ws, "Bills");
+    const buffer = XLSX.write(wb, { bookType: "xlsx", type: "buffer" });
+    const restored = XLSX.read(buffer, { type: "buffer" }).Sheets.Bills;
+    assert.deepEqual(restored["!merges"].map(XLSX.utils.encode_range).sort(), [
+      "A2:A6", "A7:A8", "C2:C3", "C4:C6", "C7:C8",
+    ]);
+    assert.equal(restored.C2.v, "202608");
+    assert.equal(restored.C4.v, "202609");
+    assert.equal(restored.C7.v, "202609");
+    rows.forEach((row, index) => {
+      const rowNumber = index + 2;
+      assert.equal(restored[`B${rowNumber}`]?.v ?? "", row.receipt_amount);
+      assert.equal(restored[`D${rowNumber}`]?.v ?? "", row.invoice_amount);
+      assert.equal(restored[`E${rowNumber}`]?.v ?? "", row.tax_amount);
+    });
+    if (enabled) {
+      assert.equal(ws.C2.s.alignment.vertical, "center");
+    }
+  });
+}
+
+test("same-value merges support custom columns even without whole-bill fields", async () => {
+  const { getVerticalMergeCells } = await loadXlsx();
+  const customFields = Object.fromEntries(Array.from({ length: 30 }, (_, index) => [`field_${index}`, `Column ${index}`]));
+  customFields.vat_period = "VAT period";
+  assert.deepEqual(getVerticalMergeCells(rows, customFields, {
+    groupField: "bill_id",
+    mergeSameValueFields: ["vat_period"],
+  }), [
+    { s: { r: 1, c: 30 }, e: { r: 2, c: 30 } },
+    { s: { r: 3, c: 30 }, e: { r: 5, c: 30 } },
+    { s: { r: 6, c: 30 }, e: { r: 7, c: 30 } },
+  ]);
+});
+
+test("blank values and isolated periods break merges", async () => {
+  const { getVerticalMergeCells } = await loadXlsx();
+  const periods = ["202608", "202608", "", "", null, null, undefined, undefined, "202609", "202608", "202608"];
+  const details = periods.map((vat_period) => ({ bill_id: 1, vat_period }));
+  assert.deepEqual(getVerticalMergeCells(details, fields, {
+    groupField: "bill_id",
+    mergeSameValueFields: ["vat_period"],
+  }), [
+    { s: { r: 1, c: 2 }, e: { r: 2, c: 2 } },
+    { s: { r: 10, c: 2 }, e: { r: 11, c: 2 } },
+  ]);
+  assert.deepEqual(getVerticalMergeCells(details, { bill_number: "Bill" }, {
+    groupField: "bill_id",
+    mergeSameValueFields: ["vat_period"],
+  }), []);
+});
+
+test("same-value rules take precedence without creating overlapping ranges", async () => {
+  const { getVerticalMergeCells } = await loadXlsx();
+  assert.deepEqual(getVerticalMergeCells(rows, fields, {
+    groupField: "bill_id",
+    mergeFields: ["vat_period", "vat_period"],
+    mergeSameValueFields: ["vat_period", "vat_period"],
+  }), [
+    { s: { r: 1, c: 2 }, e: { r: 2, c: 2 } },
+    { s: { r: 3, c: 2 }, e: { r: 5, c: 2 } },
+    { s: { r: 6, c: 2 }, e: { r: 7, c: 2 } },
+  ]);
+});