@scenetechnology/cj_iview_table 0.0.70 → 0.0.71

package/README.md

@@ -62,10 +62,10 @@ cj_iview_table 是一个功能强大的表格组件，支持筛选、排序、
 | maxHeight | String | - | 最大高度 |
 | toolBar | Array/Boolean | true | 工具栏配置 |
 | defaultSize | Number | - | 默认分页大小 |
-| rowKey | String/Boolean | id | 开启跨分页保留选中时使用的唯一键，支持如 `id`、`user.id` |
-| selectedRowKeys | Array | [] | 外部传入的已选 rowKey 列表，可用于页面返回后恢复勾选 |
-| selectedRows | Array | [] | 外部传入的已选完整行数据，用于页面返回后直接恢复完整提交数据 |
-| reserveSelection | Boolean | false | 是否保留跨分页、跨筛选/搜索的多选结果 |
+| rowKey | String/Boolean | id | 开启跨分页保留选中时使用的唯一键，支持如 `id`、`user.id` |
+| selectedRowKeys | Array | [] | 外部传入的已选 rowKey 列表，可用于页面返回后恢复勾选 |
+| selectedRows | Array | [] | 外部传入的已选完整行数据，用于页面返回后直接恢复完整提交数据 |
+| reserveSelection | Boolean | false | 是否保留跨分页、跨筛选/搜索的多选结果 |
 | filterGridSpan | Number | 6 | 筛选栏栅格跨度 |
 | filterLabelWidth | Number | 80 | 筛选标签宽度 |
 | fields | Array | [] | 导出数据时需要包含的属性名 |
@@ -136,48 +136,48 @@ cj_iview_table 是一个功能强大的表格组件，支持筛选、排序、
 - `on-reserve-selection-change` 返回的是所有分页/筛选范围内累计保留的选中项
 
 ### 5. 跨页面返回后恢复勾选
-如果你会在离开列表页后再回来，需要由父页面自己保存已选 rowKey 列表，并在重新进入时通过 `selectedRowKeys` 传回组件。
+如果你会在离开列表页后再回来，需要由父页面自己保存已选 rowKey 列表，并在重新进入时通过 `selectedRowKeys` 传回组件。
 
 ```vue
-<cj_iview_table
-  :columns="columns"
-  :request="loadData"
-  row-key="id"
-  :reserveSelection="true"
-  :selectedRowKeys="savedSelectedRowKeys"
-  :selectedRows="savedSelectedRows"
-  @on-reserve-selection-change="handleReserveSelectionChange"
-  @on-reserve-selection-keys-change="handleReserveSelectionKeysChange"
-/>
+<cj_iview_table
+  :columns="columns"
+  :request="loadData"
+  row-key="id"
+  :reserveSelection="true"
+  :selectedRowKeys="savedSelectedRowKeys"
+  :selectedRows="savedSelectedRows"
+  @on-reserve-selection-change="handleReserveSelectionChange"
+  @on-reserve-selection-keys-change="handleReserveSelectionKeysChange"
+/>
 ```
 
 ```js
 export default {
-  data () {
-    return {
-      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))
+  data () {
+    return {
+      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))
     }
   }
 }
 ```
 
-说明：
-- `selectedRowKeys` 传的是 rowKey 数组，不是整行数据
-- `selectedRows` 传的是之前保存下来的完整行数据，组件会优先用它恢复完整提交数据
-- 组件会在数据重新加载后自动按这些 key 回显勾选
-- 如果某些 key 在当前数据集中不存在，会被自动忽略
-- 如果你希望“进入页面不翻页也能直接提交全部已选数据”，需要同时传 `selectedRowKeys` 和 `selectedRows`
+说明：
+- `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=a2ad3720&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;
@@ -37564,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);
+      }
     },
     /**
      * 当前表单属性值是否为空
@@ -37863,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 == '操作') {
@@ -38179,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=a2ad3720&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=a2ad3720&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=a2ad3720&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=a2ad3720&prod&lang=css
+;// ./packages/components/index.vue?vue&type=style&index=1&id=cfec47d4&prod&lang=css
 
 ;// ./packages/components/index.vue
 
@@ -38205,7 +38215,7 @@ var components_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "a2ad3720",
+  "cfec47d4",
   null
   
 )