iov-design 2.15.32 → 2.15.34

package/lib/iov-design.common.js

@@ -11001,10 +11001,8 @@ var doFlattenColumns = function doFlattenColumns(columns) {
         isCrossPageSelection: false,
         // 全选下拉出现/隐藏事件
         showSelectionDropdown: false,
-        // 1-全选当前页 2-取消全选当前页 3-全选所有页 4-取消全选所有页
-        selectionType: 0,
         // 已取消勾选的数据
-        unSelectedRow: [],
+        unSelectionData: [],
 
         // 过滤
         filters: {}, // 不可响应的
@@ -11082,6 +11080,8 @@ var doFlattenColumns = function doFlattenColumns(columns) {
       return selection.indexOf(row) > -1;
     },
     clearSelection: function clearSelection() {
+      var emitChange = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+
       var states = this.states;
       states.isAllSelected = false;
       var oldSelection = states.selection;
@@ -11097,7 +11097,7 @@ var doFlattenColumns = function doFlattenColumns(columns) {
       });
       if (oldSelection.length) {
         states.selection = isDisabledSelection;
-        this.table.$emit('selection-change', states.selection, false);
+        emitChange && this.table.$emit('selection-change', states.selection, states.isCrossPageSelection);
       }
     },
     cleanSelection: function cleanSelection() {
@@ -11141,7 +11141,7 @@ var doFlattenColumns = function doFlattenColumns(columns) {
           this.table.$emit('select', newSelection, row);
         }
         if (this.states.isCrossPageSelection) {
-          this.table.$emit('selection-change', this.states.unSelectedRow, true);
+          this.table.$emit('selection-change', this.states.unSelectionData, true);
         } else {
           this.table.$emit('selection-change', newSelection, false);
         }
@@ -11149,6 +11149,71 @@ var doFlattenColumns = function doFlattenColumns(columns) {
     },
 
 
+    /**
+    * 选择数据事件
+    * @param  {num} command 选择事件类型 1-全选当前页 2-清空当前页 3-全选所有页 4-清空所有页
+    */
+    onSelectionChange: function onSelectionChange(command) {
+      switch (command) {
+        // 全选当前页
+        case 1:
+          this.onChangeCurrentPage(true, command);
+          break;
+        // 清空当前页
+        case 2:
+          this.onChangeCurrentPage(false, command);
+          break;
+        // 全选所有页
+        case 3:
+          this.states.isCrossPageSelection = true;
+          this.onChangeCurrentPage(true, command);
+          break;
+        // 清空所有页
+        case 4:
+          this.onChangeCurrentPage(false, command);
+          break;
+        default:
+          break;
+      }
+    },
+    onChangeCurrentPage: function onChangeCurrentPage(selected, command) {
+      var states = this.states;
+      var _states$data = states.data,
+          data = _states$data === undefined ? [] : _states$data,
+          selection = states.selection;
+
+      data.forEach(function (row, index) {
+        if (states.selectable) {
+          if (states.selectable.call(null, row, index)) {
+            toggleRowStatus(selection, row, selected);
+          }
+        } else {
+          toggleRowStatus(selection, row, selected);
+        }
+      });
+      this.updateAllSelected();
+
+      // 先点击跨页全选，再点击清空当前页/取消几条勾选数据, 最后点击全选当前页
+      if (states.isCrossPageSelection) {
+        // 重新计算未选中数据
+        this.getUnSelectedRow(states.selection);
+      }
+
+      if (command === 4) {
+        states.isCrossPageSelection = false;
+        this.clearSelection(false);
+        states.unSelectionData = [];
+      }
+
+      // 触发el-table的'selection-change'事件
+      if (states.isCrossPageSelection) {
+        this.table.$listeners['selection-change'](states.unSelectionData, states.isCrossPageSelection);
+      } else {
+        this.table.$listeners['selection-change'](states.selection, states.isCrossPageSelection);
+      }
+    },
+
+
     /**
     * 获取取消勾选数据项
     * @param  {arr} selection 当前已选择所有数据项
@@ -11158,17 +11223,17 @@ var doFlattenColumns = function doFlattenColumns(columns) {
 
       if (!this.states.isCrossPageSelection) return;
 
-      var rowKey = this.table.rowKey;
+      var rowKey = this.states.rowKey;
 
       // 从全部勾选数据中过滤出当前页勾选的数据
 
-      var selected = this.table.data.filter(function (item) {
+      var selected = this.states.data.filter(function (item) {
         return selection.some(function (row) {
           return row[rowKey] === item[rowKey];
         });
       });
       // 通过当前页数据与当前页已勾选的数据, 过滤出当前页未勾选的数据
-      var unselected = this.table.data.filter(function (item) {
+      var unselected = this.states.data.filter(function (item) {
         return !selected.some(function (row) {
           return row[rowKey] === item[rowKey];
         });
@@ -11176,30 +11241,30 @@ var doFlattenColumns = function doFlattenColumns(columns) {
 
       // 取消勾选数据中是否存在当页面已勾选的数据项, 如有则删除
       var index = [];
-      this.states.unSelectedRow.forEach(function (item, i) {
+      this.states.unSelectionData.forEach(function (item, i) {
         if (selected.some(function (s) {
           return s[rowKey] === item[rowKey];
         })) {
           index.push(i);
         }
       });
-      this.states.unSelectedRow = this.states.unSelectedRow.filter(function (item, i) {
+      this.states.unSelectionData = this.states.unSelectionData.filter(function (item, i) {
         return !index.includes(i);
       });
 
       // 取消勾选数据中如果不存在当前页未勾选的数据, 则将当前未勾选的数据添push到取消勾选数据中
       unselected.forEach(function (item) {
-        if (!_this.states.unSelectedRow.some(function (s) {
+        if (!_this.states.unSelectionData.some(function (s) {
           return s[rowKey] === item[rowKey];
         })) {
-          _this.states.unSelectedRow.push(item);
+          _this.states.unSelectionData.push(item);
         }
       });
     },
     _toggleAllSelection: function _toggleAllSelection() {
       var states = this.states;
-      var _states$data = states.data,
-          data = _states$data === undefined ? [] : _states$data,
+      var _states$data2 = states.data,
+          data = _states$data2 === undefined ? [] : _states$data2,
           selection = states.selection;
       // when only some rows are selected (but not all), select or deselect all of them
       // depending on the value of selectOnIndeterminate
@@ -11225,7 +11290,7 @@ var doFlattenColumns = function doFlattenColumns(columns) {
       if (selectionChanged) {
         if (states.isCrossPageSelection) {
           this.getUnSelectedRow(newSelection);
-          this.table.$emit('selection-change', states.unSelectedRow || [], true);
+          this.table.$emit('selection-change', states.unSelectionData || [], true);
         } else {
           this.table.$emit('selection-change', selection ? selection.slice() : [], false);
         }
@@ -13218,52 +13283,47 @@ var convertToRows = function convertToRows(originColumns) {
         var states = this.store.states;
         var _states$data = states.data,
             data = _states$data === undefined ? [] : _states$data,
-            selection = states.selection;
-        var rowKey = this.table.rowKey;
-        // 全选所有页
+            selection = states.selection,
+            unSelectionData = states.unSelectionData,
+            rowKey = states.rowKey;
 
+        var selectionRowKeys = selection.map(function (item) {
+          return item[rowKey];
+        });
+        var unSelectionRowKeys = unSelectionData.map(function (item) {
+          return item[rowKey];
+        });
+        // console.log(data, 'data');
+        // console.log(selection, unSelectionRowKeys, 'selection');
+        // 全选所有页
         if (this.store.states.isCrossPageSelection) {
-
-          states.isAllSelected = true;
-
           data.forEach(function (row, index) {
             if (states.selectable) {
               if (states.selectable.call(null, row, index)) {
                 // 如果已勾选数据中不包含当前页数据(如跳转至新的一页), 则勾选
-                if (!selection.some(function (o) {
-                  return o[rowKey] === row[rowKey];
-                })) {
+                if (!selectionRowKeys.includes(row[rowKey])) {
                   toggleRowStatus(selection, row, true);
                 }
-                if (states.unSelectedRow.some(function (o) {
-                  return o[rowKey] === row[rowKey];
-                })) {
-                  // 如果取消勾选数据中包含当前页数据项, 则取消勾选
+                // 如果取消勾选数据中包含当前页数据项, 则取消勾选
+                if (unSelectionRowKeys.includes(row[rowKey])) {
                   toggleRowStatus(selection, row, false);
-                  states.isAllSelected = false;
                 }
               }
             } else {
               // 如果已勾选数据中不包含当前页数据(如跳转至新的一页), 则勾选
-              if (!selection.some(function (o) {
-                return o[rowKey] === row[rowKey];
-              })) {
+              if (!selectionRowKeys.includes(row[rowKey])) {
                 toggleRowStatus(selection, row, true);
               }
               // 如果取消勾选数据中包含当前页数据项, 则取消勾选
-              if (states.unSelectedRow.some(function (o) {
-                return o[rowKey] === row[rowKey];
-              })) {
+              if (unSelectionRowKeys.includes(row[rowKey])) {
                 toggleRowStatus(selection, row, false);
-                states.isAllSelected = false;
               }
             }
           });
-          // console.log(states, 'states===========================');
-        } else {
-          // states.isAllSelected = false;
-          states.selection = [];
         }
+        this.store.getUnSelectedRow(states.selection);
+        this.store.updateAllSelected();
+        console.log('isAllSelected', states.isAllSelected);
       },
 
       deep: true
@@ -13391,97 +13451,8 @@ var convertToRows = function convertToRows(originColumns) {
     * 选择数据事件
     * @param  {num} command 选择事件类型 1-全选当前页 2-清空当前页 3-全选所有页 4-清空所有页
     */
-    onCommand: function onCommand(command) {
-      this.store.states.selectionType = command;
-      var states = this.store.states;
-      var _states$data2 = states.data,
-          data = _states$data2 === undefined ? [] : _states$data2,
-          selection = states.selection;
-      // console.log(this, 'this===========================');
-
-      switch (command) {
-        // 全选当前页
-        case 1:
-          states.isAllSelected = true;
-          data.forEach(function (row, index) {
-            if (states.selectable) {
-              if (states.selectable.call(null, row, index)) {
-                toggleRowStatus(selection, row, true);
-              }
-            } else {
-              toggleRowStatus(selection, row, true);
-            }
-          });
-          // console.log(states, 'states1===========================');
-          // 先点击跨页全选，再点击清空当前页/取消几条勾选数据, 最后点击全选当前页
-          if (states.isCrossPageSelection) {
-            // 重新计算未选中数据
-            this.store.getUnSelectedRow(states.selection);
-            // 触发el-table的'selection-change'事件
-            this.table.$listeners['selection-change'](states.unSelectedRow, true);
-          } else {
-            this.table.$listeners['selection-change'](this.table.selection, false);
-          }
-          break;
-        // 清空当前页
-        case 2:
-          // 先点击跨页选择，再点击清空当前页
-          if (states.isCrossPageSelection) {
-            // 标记当前页未选中, 如果有选中的数据，清空选中数据
-            states.isAllSelected = false;
-            var oldSelection = states.selection;
-            // 表格中有选中的数据项是disabled状态时，清空时保留该数据
-            var isDisabledSelection = states.data.filter(function (row, index) {
-              // 判断selectable是不可选中状态, 且当前数据项已被选中
-              if (states.selectable && !states.selectable.call(null, row, index) && oldSelection.some(function (item) {
-                return item[states.rowKey] === row[states.rowKey];
-              })) {
-                return row;
-              }
-            });
-            if (oldSelection.length) {
-              states.selection = isDisabledSelection;
-            }
-            // 重新计算未选中数据
-            this.store.getUnSelectedRow(states.selection);
-            // 触发el-table的'selection-change'事件
-            this.table.$listeners['selection-change'](states.unSelectedRow, true);
-          } else {
-            states.unSelectedRow = [];
-            this.table.clearSelection();
-          }
-          // console.log(states, 'states2===========================');
-          break;
-        // 全选所有页
-        case 3:
-          states.isCrossPageSelection = true;
-          states.unSelectedRow = [];
-          states.isAllSelected = true;
-          data.forEach(function (row, index) {
-            if (states.selectable) {
-              if (states.selectable.call(null, row, index)) {
-                toggleRowStatus(selection, row, true);
-              }
-            } else {
-              toggleRowStatus(selection, row, true);
-            }
-          });
-          // console.log(states, 'states3===========================');
-          // 重新计算未选中数据
-          this.store.getUnSelectedRow(states.selection);
-          // 触发el-table的'selection-change'事件
-          this.table.$listeners['selection-change'](states.unSelectedRow, true);
-          break;
-        // 清空所有页
-        case 4:
-          states.isCrossPageSelection = false;
-          states.unSelectedRow = [];
-          // console.log(states, 'states4===========================');
-          this.table.clearSelection();
-          break;
-        default:
-          break;
-      }
+    onSelectionChange: function onSelectionChange(command) {
+      this.store.onSelectionChange(command);
     },
     handleFilterClick: function handleFilterClick(event, column) {
       event.stopPropagation();
@@ -14660,16 +14631,14 @@ var cellForced = {
       var _this = this;
 
       var store = _ref.store;
-
-      // console.log(store, 'store===========');
       var _store$states = store.states,
-          isCrossPageSelection = _store$states.isCrossPageSelection,
           selection = _store$states.selection,
           data = _store$states.data,
           rowKey = _store$states.rowKey;
 
       var indeterminate = selection.length > 0 && !(selection.length === data.length);
-      if (isCrossPageSelection) {
+
+      if (rowKey) {
         // 全选: v-model - true, indeterminate - false
         // 半选: v-model - false, indeterminate - true
         // 不选：v-model - false, indeterminate - false
@@ -14685,7 +14654,6 @@ var cellForced = {
           });
         });
       }
-      // console.log(indeterminate, 'indeterminate===========');
       return [h('el-checkbox', {
         attrs: {
           disabled: data && data.length === 0,
@@ -14704,7 +14672,7 @@ var cellForced = {
           },
           on: {
             'command': function command(_command) {
-              return _this.onCommand(_command, _this.scope);
+              return _this.onSelectionChange(_command, _this.scope);
             },
             'visible-change': this.onVisibleChange
           }
@@ -14715,25 +14683,25 @@ var cellForced = {
           [h(
             'el-dropdown-item',
             {
-              attrs: { command: 1 }
+              attrs: { disabled: data && data.length === 0, command: 1 }
             },
             ['\u5168\u9009\u5F53\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 3 }
+              attrs: { disabled: data && data.length === 0, command: 3 }
             },
             ['\u5168\u9009\u6240\u6709\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 2 }
+              attrs: { disabled: data && data.length === 0, command: 2 }
             },
             ['\u6E05\u7A7A\u5F53\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 4 }
+              attrs: { disabled: data && data.length === 0, command: 4 }
             },
             ['\u6E05\u7A7A\u6240\u6709\u9875']
           )]
@@ -25311,7 +25279,6 @@ tab_pane.install = function (Vue) {
     type: String,
     hit: Boolean,
     dot: Boolean,
-    disableTransitions: Boolean,
     color: String,
     size: String,
     icon: String,
@@ -25368,13 +25335,7 @@ tab_pane.install = function (Vue) {
       )]
     );
 
-    return this.disableTransitions ? tagEl : h(
-      'transition',
-      {
-        attrs: { name: 'el-zoom-in-center' }
-      },
-      [tagEl]
-    );
+    return tagEl;
   }
 });
 // CONCATENATED MODULE: ./packages/tag/src/tag.vue?vue&type=script&lang=js&
@@ -44046,7 +44007,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.32',
+  version: '2.15.34',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,

package/lib/table-column.js

@@ -131,16 +131,14 @@ var cellForced = {
       var _this = this;
 
       var store = _ref.store;
-
-      // console.log(store, 'store===========');
       var _store$states = store.states,
-          isCrossPageSelection = _store$states.isCrossPageSelection,
           selection = _store$states.selection,
           data = _store$states.data,
           rowKey = _store$states.rowKey;
 
       var indeterminate = selection.length > 0 && !(selection.length === data.length);
-      if (isCrossPageSelection) {
+
+      if (rowKey) {
         // 全选: v-model - true, indeterminate - false
         // 半选: v-model - false, indeterminate - true
         // 不选：v-model - false, indeterminate - false
@@ -156,7 +154,6 @@ var cellForced = {
           });
         });
       }
-      // console.log(indeterminate, 'indeterminate===========');
       return [h('el-checkbox', {
         attrs: {
           disabled: data && data.length === 0,
@@ -175,7 +172,7 @@ var cellForced = {
           },
           on: {
             'command': function command(_command) {
-              return _this.onCommand(_command, _this.scope);
+              return _this.onSelectionChange(_command, _this.scope);
             },
             'visible-change': this.onVisibleChange
           }
@@ -186,25 +183,25 @@ var cellForced = {
           [h(
             'el-dropdown-item',
             {
-              attrs: { command: 1 }
+              attrs: { disabled: data && data.length === 0, command: 1 }
             },
             ['\u5168\u9009\u5F53\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 3 }
+              attrs: { disabled: data && data.length === 0, command: 3 }
             },
             ['\u5168\u9009\u6240\u6709\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 2 }
+              attrs: { disabled: data && data.length === 0, command: 2 }
             },
             ['\u6E05\u7A7A\u5F53\u9875']
           ), h(
             'el-dropdown-item',
             {
-              attrs: { command: 4 }
+              attrs: { disabled: data && data.length === 0, command: 4 }
             },
             ['\u6E05\u7A7A\u6240\u6709\u9875']
           )]