bl-common-vue3 3.8.132 → 3.8.133

package/package.json

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

package/src/components/CustomTable/index.vue

@@ -1342,7 +1342,7 @@
       :url="requestInfo?.serviceUrl"
       :service="requestInfo?.service"
       :method="requestInfo?.serviceType"
-      :params="listParams"
+      :params="exportParams"
       :limit="exportLimit"
       :columnstitle="exportColumnsTitle"
       :merge_options="exportMergeOptions"
@@ -1892,6 +1892,7 @@ export default defineComponent({
       dictMenuAlias: "", // 后端返回的字典标识
       isExport: false,
       listParams: {},
+      exportParams: {},
       exportResultData: [], // 导出结果处理
       importVisible: false,
       tableScrollHeight: 0,
@@ -2440,7 +2441,8 @@ export default defineComponent({
       let columnIndexObj = {};
       let haveSlot = false;
       cloneDeep(realColumns.value).forEach((columnItem, index) => {
-        // 从后往前处理
+        // 不导出的展示列可能没有 dataIndex，也可能返回 VNode，不能参与数据转换。
+        if (columnItem.exportHidden) return;
         let virtualDataIndex = replaceObjDataIndex(columnItem.dataIndex);
         if (columnItem.columnType) {
           columnIndexObj[virtualDataIndex] = {
@@ -2488,20 +2490,21 @@ export default defineComponent({
           localRowSelection.value?.selectedRowKeys
         );
       }
+      // 导出组件会更新分页并追加选中条件，使用快照避免污染列表的后续查询。
+      state.exportParams = cloneDeep(state.listParams);
+      state.exportParams.filters = (state.exportParams.filters || []).filter(
+        (item) => item.field !== "ids"
+      );
       if (localRowSelection.value?.selectedRowKeys.length > 0) {
-        state.listParams.filters.push({
+        state.exportParams.filters.push({
           field: "ids",
           type: "custom",
-          value: localRowSelection.value?.selectedRowKeys,
+          value: [...localRowSelection.value.selectedRowKeys],
         });
-      } else {
-        state.listParams.filters = state.listParams.filters.filter(
-          (item) => item.field != "ids"
-        );
       }
       if (props.customExport) {
         /* 自定义导出 */
-        props.customExport(state.listParams);
+        props.customExport(state.exportParams);
       } else {
         /* 默认导出 */
         state.isExport = true;

package/src/components/PublicExtensionField/index.vue

@@ -1,7 +1,7 @@
 <template>
   <bl-drawer
     :title="t('ExtraManage.index.845270-0')"
-    :maskClosable="false"
+    :maskClosable="!editVisible"
     :visible="visible"
     :width="1040"
     :destroyOnClose="true"

package/test/customTableExport.test.js

@@ -0,0 +1,114 @@
+const assert = require('node:assert/strict');
+const {test, before, after} = require('node:test');
+const {readFileSync} = require('node:fs');
+const path = require('node:path');
+const Module = require('node:module');
+const Vue = require('vue');
+const {parse, compileTemplate} = require('@vue/compiler-sfc');
+const {transformSync} = require('@babel/core');
+const originalFrame = global.requestAnimationFrame;
+before(() => {global.requestAnimationFrame = () => 0;});
+after(() => {global.requestAnimationFrame = originalFrame;});
+const filename = path.resolve(__dirname, '../src/components/CustomTable/index.vue');
+const {descriptor} = parse(readFileSync(filename, 'utf8'));
+assert.deepEqual(compileTemplate({id: 'table-export-test', filename, source: descriptor.template.content}).errors, []);
+const loaded = new Module(filename, module);
+loaded.require = (name) => {
+  if (name === 'vue') return {...Vue, onMounted() {}, onBeforeUnmount() {}};
+  if (name === 'lodash' || name.startsWith('dayjs')) return require(name);
+  if (name.includes('locale')) return {t: key => key, loadLanguageAsync() {}};
+  if (name.endsWith('/util')) return {getCommonLocal() {}, getLang: () => 'zh-CN', isEnv: () => false,
+    i18nMapShow: (item, keys) => item[keys[0]]};
+  return {};
+};
+loaded._compile(transformSync(descriptor.script.content, {filename, configFile: false, babelrc: false,
+  plugins: ['@babel/plugin-transform-modules-commonjs']}).code, filename);
+const component = loaded.exports.default;
+const defaults = () => Object.fromEntries(Object.entries(component.props).map(([key, value]) => [key,
+  typeof value.default === 'function' && value.type !== Function ? value.default() : value.default]));
+const flush = async () => {for (let i = 0; i < 20; i++) await Promise.resolve();};
+
+async function table(columns, overrides = {}) {
+  const events = [];
+  const previousWindow = global.window;
+  global.window = {addEventListener() {}};
+  try {
+    const state = component.setup({...defaults(), loadDataAtInit: false, ...overrides}, {
+      slots: {}, expose() {}, attrs: {columns}, emit: (...args) => events.push(args),
+    });
+    await flush();
+    return {state, events};
+  } finally {global.window = previousWindow;}
+}
+
+test('export skips hidden presentation fields without a dataIndex', async () => {
+  const {state} = await table([
+    {key: 'company', dataIndex: 'company', title: 'Company'},
+    {key: 'extra_1', exportHidden: true, title: 'Attachment', customRender: () => {throw new Error('must not render');}},
+  ]);
+  assert.deepEqual(state.exportColumnsTitle.value, {company: 'Company'});
+  state.handleExportData([{company: 'Company A'}]);
+  assert.deepEqual(state.exportResultData.value, [{company: 'Company A'}]);
+});
+
+test('built-in export snapshots selection and pagination without changing subsequent list queries', async () => {
+  const {state} = await table([]);
+  const original = {page: 3, pageSize: 20, filters: [{field: 'status', value: 0}]};
+  state.listParams.value = structuredClone(original);
+  state.selectedRowKeys.value = [1, 3];
+  state.handleExport();
+  assert.equal(state.isExport.value, true);
+  assert.deepEqual(state.exportParams.value.filters, [...original.filters, {field: 'ids', type: 'custom', value: [1, 3]}]);
+  state.exportParams.value.page = 1;
+  state.exportParams.value.pageSize = 500;
+  state.selectedRowKeys.value.push(9);
+  assert.deepEqual(state.exportParams.value.filters.at(-1).value, [1, 3]);
+  assert.deepEqual(state.listParams.value, original);
+  state.selectedRowKeys.value = [9];
+  state.handleExport();
+  assert.deepEqual(state.exportParams.value.filters.at(-1).value, [9]);
+  assert.equal(state.exportParams.value.filters.length, 2);
+  state.selectedRowKeys.value = [];
+  state.handleExport();
+  assert.deepEqual(state.exportParams.value, original);
+});
+
+test('custom export receives the same isolated selection snapshot', async () => {
+  let exported;
+  const {state} = await table([], {customExport: params => {exported = params;}});
+  state.listParams.value = {page: 2, filters: []};
+  state.selectedRowKeys.value = [5];
+  state.handleExport();
+  assert.deepEqual(exported.filters, [{field: 'ids', type: 'custom', value: [5]}]);
+  exported.page = 1;
+  assert.equal(state.listParams.value.page, 2);
+  assert.equal(state.isExport.value, false);
+});
+
+test('built-in complete and partial imports refresh the table and display partial errors', async () => {
+  const {state, events} = await table([], {requestInfo: {service: '/org', serviceUrl: '/company/orgBranch', serviceType: 'get'}});
+  state.importVisible.value = true;
+  await state.handleImportSuccess();
+  await flush();
+  assert.equal(state.importVisible.value, false);
+  assert.equal(events.filter(([type, event]) => type === 'request' && event.params.url === '/company/orgBranch').length, 1);
+  state.importVisible.value = true;
+  const result = {errorFileKey: 'partial', success: 2, error: 1};
+  state.handleImportrefresh(result);
+  await flush();
+  assert.equal(state.importVisible.value, false);
+  assert.equal(state.ImportResultes.value, true);
+  assert.deepEqual(state.result.value, result);
+  assert.equal(events.filter(([type, event]) => type === 'request' && event.params.url === '/company/orgBranch').length, 2);
+});
+
+test('existing action slots still trigger the business export transformation callback', async () => {
+  const {state, events} = await table([
+    {key: 'company', dataIndex: 'company', title: 'Company'},
+    {key: 'action', dataIndex: 'id', title: 'Action'},
+  ]);
+  state.columnSlots.value = ['action'];
+  state.handleExportData([{id: 1, company: 'Company A'}]);
+  assert.deepEqual(state.exportColumnsTitle.value, {company: 'Company'});
+  assert.deepEqual(events.find(([name]) => name === 'changeExportData')[1], [{id: 1, company: 'Company A'}]);
+});