@scenetechnology/cj_iview_table 0.0.69 → 0.0.71

package/README.md

@@ -64,6 +64,7 @@ cj_iview_table 是一个功能强大的表格组件，支持筛选、排序、
 | defaultSize | Number | - | 默认分页大小 |
 | rowKey | String/Boolean | id | 开启跨分页保留选中时使用的唯一键，支持如 `id`、`user.id` |
 | selectedRowKeys | Array | [] | 外部传入的已选 rowKey 列表，可用于页面返回后恢复勾选 |
+| selectedRows | Array | [] | 外部传入的已选完整行数据，用于页面返回后直接恢复完整提交数据 |
 | reserveSelection | Boolean | false | 是否保留跨分页、跨筛选/搜索的多选结果 |
 | filterGridSpan | Number | 6 | 筛选栏栅格跨度 |
 | filterLabelWidth | Number | 80 | 筛选标签宽度 |
@@ -144,6 +145,8 @@ cj_iview_table 是一个功能强大的表格组件，支持筛选、排序、
   row-key="id"
   :reserveSelection="true"
   :selectedRowKeys="savedSelectedRowKeys"
+  :selectedRows="savedSelectedRows"
+  @on-reserve-selection-change="handleReserveSelectionChange"
   @on-reserve-selection-keys-change="handleReserveSelectionKeysChange"
 />
 ```
@@ -152,10 +155,15 @@ cj_iview_table 是一个功能强大的表格组件，支持筛选、排序、
 export default {
   data () {
     return {
-      savedSelectedRowKeys: JSON.parse(sessionStorage.getItem('table-selected-row-keys') || '[]')
+      savedSelectedRowKeys: JSON.parse(sessionStorage.getItem('table-selected-row-keys') || '[]'),
+      savedSelectedRows: JSON.parse(sessionStorage.getItem('table-selected-rows') || '[]')
     }
   },
   methods: {
+    handleReserveSelectionChange (selectedRows) {
+      this.savedSelectedRows = selectedRows
+      sessionStorage.setItem('table-selected-rows', JSON.stringify(selectedRows))
+    },
     handleReserveSelectionKeysChange (selectedRowKeys) {
       this.savedSelectedRowKeys = selectedRowKeys
       sessionStorage.setItem('table-selected-row-keys', JSON.stringify(selectedRowKeys))
@@ -166,8 +174,10 @@ export default {
 
 说明：
 - `selectedRowKeys` 传的是 rowKey 数组，不是整行数据
+- `selectedRows` 传的是之前保存下来的完整行数据，组件会优先用它恢复完整提交数据
 - 组件会在数据重新加载后自动按这些 key 回显勾选
 - 如果某些 key 在当前数据集中不存在，会被自动忽略
+- 如果你希望“进入页面不翻页也能直接提交全部已选数据”，需要同时传 `selectedRowKeys` 和 `selectedRows`
 
 ## 使用示例
 

package/dist/cj_iview_table.common.js

@@ -25799,7 +25799,7 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/babel-loader/lib/index.js!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=template&id=6e06842e&scoped=true
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/babel-loader/lib/index.js!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=template&id=cfec47d4&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -36514,6 +36514,10 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
       type: Array,
       default: () => []
     },
+    selectedRows: {
+      type: Array,
+      default: () => []
+    },
     reserveSelection: {
       type: Boolean,
       default: false
@@ -36999,9 +37003,18 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
     selectedRowKeys: {
       immediate: true,
       deep: true,
-      handler(newVal) {
+      handler() {
         if (this.shouldReserveSelection()) {
-          this.applySelectedRowKeys(newVal);
+          this.applyExternalSelection();
+        }
+      }
+    },
+    selectedRows: {
+      immediate: true,
+      deep: true,
+      handler() {
+        if (this.shouldReserveSelection()) {
+          this.applyExternalSelection();
         }
       }
     },
@@ -37033,6 +37046,18 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
       }
       return Array.from(new Set(selectedRowKeys.map(item => this.normalizeRowKeyValue(item)).filter(Boolean)));
     },
+    createReserveSelectionMapFromRows(rows = []) {
+      if (!Array.isArray(rows)) {
+        return {};
+      }
+      return rows.reduce((result, row) => {
+        const rowKey = this.normalizeRowKeyValue(this.getRowIdentity(row));
+        if (rowKey) {
+          result[rowKey] = row;
+        }
+        return result;
+      }, {});
+    },
     setReserveSelectionState(nextMap = {}, nextKeys = []) {
       const normalizedKeys = this.normalizeSelectedRowKeys(nextKeys);
       const normalizedMap = normalizedKeys.reduce((result, key) => {
@@ -37045,18 +37070,16 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
       this.reserveSelectionKeys = normalizedKeys;
       this.selectionItems = normalizedKeys.map(key => normalizedMap[key]).filter(Boolean);
     },
-    applySelectedRowKeys(selectedRowKeys = []) {
+    applyExternalSelection() {
       if (!this.shouldReserveSelection()) {
         return;
       }
-      const normalizedKeys = this.normalizeSelectedRowKeys(selectedRowKeys);
+      const normalizedKeys = this.normalizeSelectedRowKeys(this.selectedRowKeys);
       const selectedKeySet = new Set(normalizedKeys);
-      const nextMap = normalizedKeys.reduce((result, key) => {
-        if (this.reserveSelectionMap[key]) {
-          result[key] = this.reserveSelectionMap[key];
-        }
-        return result;
-      }, {});
+      const nextMap = {
+        ...this.reserveSelectionMap,
+        ...this.createReserveSelectionMapFromRows(this.selectedRows)
+      };
       this.dataSource.forEach(row => {
         const rowKey = this.normalizeRowKeyValue(this.getRowIdentity(row));
         if (rowKey && selectedKeySet.has(rowKey)) {
@@ -37541,7 +37564,11 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
       if (!isSelection) {
         return this.$emit('onToolBar', index);
       }
-      this.$emit('onToolBar', index, this.selectionItems);
+      if (this.shouldReserveSelection()) {
+        this.$emit('onToolBar', index, this.selectionItems, this.getReserveSelectionKeys());
+      } else {
+        this.$emit('onToolBar', index, this.selectionItems);
+      }
     },
     /**
      * 当前表单属性值是否为空
@@ -37840,7 +37867,13 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
             } = dataValue.content;
             this.columnSettingId = dataValue.id;
             this.columnSettingObj = dataValue.content;
-            let columnsList = this.sortAndFilterColumns(lodash_default().cloneDeep(this.columns), checkColumnData);
+            let columnsList;
+            // 如果checkColumnData为空数组，显示所有列
+            if (checkColumnData && checkColumnData.length > 0) {
+              columnsList = this.sortAndFilterColumns(lodash_default().cloneDeep(this.columns), checkColumnData);
+            } else {
+              columnsList = lodash_default().cloneDeep(this.columns);
+            }
             let freezeNum = columnsList[0] && columnsList[0].type == 'selection' ? freeze + 1 : freeze;
             columnsList.forEach((item, index) => {
               if (item.title == '操作') {
@@ -38156,15 +38189,15 @@ var vue_treeselect_cjs_default = /*#__PURE__*/__webpack_require__.n(vue_treesele
 });
 ;// ./packages/components/index.vue?vue&type=script&lang=js
  /* harmony default export */ var packages_componentsvue_type_script_lang_js = (componentsvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=0&id=6e06842e&prod&scoped=true&lang=less
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=0&id=cfec47d4&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=0&id=6e06842e&prod&scoped=true&lang=less
+;// ./packages/components/index.vue?vue&type=style&index=0&id=cfec47d4&prod&scoped=true&lang=less
 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=1&id=6e06842e&prod&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/components/index.vue?vue&type=style&index=1&id=cfec47d4&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./packages/components/index.vue?vue&type=style&index=1&id=6e06842e&prod&lang=css
+;// ./packages/components/index.vue?vue&type=style&index=1&id=cfec47d4&prod&lang=css
 
 ;// ./packages/components/index.vue
 
@@ -38182,7 +38215,7 @@ var components_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "6e06842e",
+  "cfec47d4",
   null
   
 )