bk-magic-vue 2.5.9-beta.24 → 2.5.9-beta.26

package/dist/bk-magic-vue.js

@@ -40353,20 +40353,27 @@
             }
           },
           rowSelectedChanged: function rowSelectedChanged(states, row, index) {
-            var _this5 = this;
             var changed = _toggleRowSelection(states, row);
             var selection = states.selection;
+            if (!this.table.shiftMulti.isShift()) {
+              if (selection.includes(row)) {
+                this.table.shiftMulti.setStartStore(row, index);
+              } else {
+                this.table.shiftMulti.setStartStore(null, null);
+              }
+            }
             if (this.table.shiftMulti.setStore(row, index)) {
               var _this$table$shiftMult = this.table.shiftMulti.getStore(),
                 start = _this$table$shiftMult.start,
                 end = _this$table$shiftMult.end;
               (this.table.data.slice(start.index, end.index + 1) || []).forEach(function (child) {
-                if (!states.selection.includes(child)) {
-                  states.selection.push(child);
+                if (states.selection.includes(child)) {
+                  var childIndex = states.selection.findIndex(function (col) {
+                    return col === child;
+                  });
+                  states.selection.splice(childIndex, 1);
                 }
-              });
-              setTimeout(function () {
-                _this5.table.$el.style.setProperty('user-select', 'inherit');
+                states.selection.push(child);
               });
             }
             if (changed) {
@@ -40438,13 +40445,13 @@
     }, {
       key: "isAllSelectionDisabled",
       get: function get() {
-        var _this6 = this;
+        var _this5 = this;
         if (!this.states.selectable) {
           return false;
         }
         var isEmpty = this.states.data && this.states.data.length === 0;
         var isDisabled = this.states.data.every(function (row, index) {
-          return !_this6.states.selectable(row, index);
+          return !_this5.states.selectable(row, index);
         });
         return isEmpty || isDisabled;
       }
@@ -42813,14 +42820,22 @@
     var handleKeyDown = function handleKeyDown(e) {
       if (e.key === 'Shift') {
         isShiftKeyDown = true;
+        document.body.style.userSelect = 'none';
       }
     };
     var handleKeyUp = function handleKeyUp(e) {
       if (e.key === 'Shift') {
         isShiftKeyDown = false;
+        document.body.style.userSelect = '';
         clearStore();
       }
     };
+    var setStartStore = function setStartStore(row, index) {
+      store.start = {
+        index: index,
+        row: row
+      };
+    };
     var setStore = function setStore(row, index) {
       if (!isShiftKeyDown) {
         return false;
@@ -42870,6 +42885,7 @@
     };
     return {
       isShiftKeyDown: isShiftKeyDown,
+      setStartStore: setStartStore,
       isShift: isShift,
       onUnmounted: onUnmounted,
       setStore: setStore,
@@ -43870,7 +43886,7 @@
           "nativeOn": {
             "click": function () {
               var _click2 = _asyncToGenerator( _regeneratorRuntime().mark(function _callee2(event) {
-                var isShift, result;
+                var result;
                 return _regeneratorRuntime().wrap(function _callee2$(_context2) {
                   while (1) switch (_context2.prev = _context2.next) {
                     case 0:
@@ -43883,16 +43899,12 @@
                       }
                       return _context2.abrupt("return");
                     case 5:
-                      isShift = store.table.shiftMulti.isShift();
-                      if (isShift) {
-                        store.table.$el.style.setProperty('user-select', 'none');
-                      }
-                      _context2.next = 9;
+                      _context2.next = 7;
                       return beforeChange();
-                    case 9:
+                    case 7:
                       result = _context2.sent;
                       result !== false && store.commit('rowSelectedChanged', row, $index);
-                    case 11:
+                    case 9:
                     case "end":
                       return _context2.stop();
                   }