@ucloud-fe/react-components 1.3.18 → 1.3.19

package/lib/components/Tree/Tree.js

@@ -64,8 +64,8 @@ var groupDataSource = function groupDataSource(dataSource) {
 
   (0, _newArrowCheck2.default)(this, _this);
   var group = {};
-  var allKeys = [];
-  var allDisabledKeys = [];
+  var validKeys = [];
+  var disabledKeys = [];
   if (!dataSource) dataSource = [];
 
   var _groupData2 = function _groupData(children, disabled) {
@@ -96,10 +96,10 @@ var groupDataSource = function groupDataSource(dataSource) {
       } else {
         if (finalDisabled) {
           disabledKeys.push(key);
-          allDisabledKeys.push(key);
+          disabledKeys.push(key);
         } else {
           keys.push(key);
-          allKeys.push(key);
+          validKeys.push(key);
         }
       }
     }.bind(this));
@@ -108,7 +108,7 @@ var groupDataSource = function groupDataSource(dataSource) {
 
   _groupData2(dataSource);
 
-  return [group, allKeys, allDisabledKeys];
+  return [group, validKeys, disabledKeys];
 }.bind(void 0);
 
 var keysToMap = function keysToMap() {
@@ -213,8 +213,8 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       _useState2$ = (0, _slicedToArray2.default)(_useState2[0], 3),
       group = _useState2$[0],
-      allKeys = _useState2$[1],
-      allDisabledKeys = _useState2$[2],
+      validKeys = _useState2$[1],
+      disabledKeys = _useState2$[2],
       setGroup = _useState2[1];
 
   var _useUncontrolled = (0, _useUncontrolled7.default)(_selectedKeys, defaultSelectedKeys || [], _onChange),
@@ -240,11 +240,11 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     var selectKeys = [];
     var unselectKeys = [];
     var newSelectedMap = keysToMap(newSelectedKeys);
-    var allMap = keysToMap(allKeys);
+    var validMap = keysToMap(validKeys);
 
     for (var newKey in newSelectedMap) {
       // don't in dataSource, ignore
-      if (!(newKey in allMap)) continue;
+      if (!(newKey in validMap)) continue;
 
       if (!(newKey in selectedMap)) {
         selectKeys.push(newKey);
@@ -253,7 +253,7 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 
     for (var oldKey in selectedMap) {
       // don't in dataSource, ignore
-      if (!(oldKey in allMap)) continue;
+      if (!(oldKey in validMap)) continue;
 
       if (!(oldKey in newSelectedMap)) {
         unselectKeys.push(oldKey);
@@ -264,7 +264,7 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       select: selectKeys,
       unselect: unselectKeys
     });
-  }.bind(this), [allKeys, onDiff, selectedMap]);
+  }.bind(this), [validKeys, onDiff, selectedMap]);
   var finalOnChange = (0, _react.useCallback)(function (selectedKeys) {
     (0, _newArrowCheck2.default)(this, _this7);
     onChange(selectedKeys);
@@ -299,11 +299,11 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         }
 
         var disabledSelectedKeys = [];
-        allDisabledKeys.forEach(function (v) {
+        disabledKeys.forEach(function (v) {
           (0, _newArrowCheck2.default)(this, _this9);
           if (selectedMap[v]) disabledSelectedKeys.push(v);
         }.bind(this));
-        var selectedKeys = [].concat((0, _toConsumableArray2.default)(allKeys), disabledSelectedKeys);
+        var selectedKeys = [].concat((0, _toConsumableArray2.default)(validKeys), disabledSelectedKeys);
         finalOnChange(selectedKeys);
       }.bind(this),
       unSelectAll: function unSelectAll() {
@@ -311,7 +311,7 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
 
         (0, _newArrowCheck2.default)(this, _this8);
         var disabledSelectedKeys = [];
-        allDisabledKeys.forEach(function (v) {
+        disabledKeys.forEach(function (v) {
           (0, _newArrowCheck2.default)(this, _this10);
           if (selectedMap[v]) disabledSelectedKeys.push(v);
         }.bind(this));
@@ -328,12 +328,12 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         }
 
         var disabledSelectedKeys = [];
-        allDisabledKeys.forEach(function (v) {
+        disabledKeys.forEach(function (v) {
           (0, _newArrowCheck2.default)(this, _this11);
           if (selectedMap[v]) disabledSelectedKeys.push(v);
         }.bind(this));
         var selectedKeys = [].concat(disabledSelectedKeys);
-        allKeys.forEach(function (v) {
+        validKeys.forEach(function (v) {
           (0, _newArrowCheck2.default)(this, _this11);
 
           if (!selectedMap[v]) {
@@ -343,7 +343,7 @@ var CommonTree = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
         finalOnChange(selectedKeys);
       }.bind(this)
     };
-  }.bind(this), [multiple, allDisabledKeys, allKeys, finalOnChange, selectedMap]);
+  }.bind(this), [multiple, disabledKeys, validKeys, finalOnChange, selectedMap]);
   var onSelect = (0, _react.useCallback)(function (_selectedMap) {
     (0, _newArrowCheck2.default)(this, _this7);
     var selectedKeys;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ucloud-fe/react-components",
-  "version": "1.3.18",
+  "version": "1.3.19",
   "title": "UCloud react components",
   "description": "UCloud react components",
   "keywords": [
@@ -72,7 +72,7 @@
     "mini-store": "^1.0.2",
     "moment": "^2.22.2",
     "prop-types": "^15.7.2",
-    "rc-dialog": "7.2.1",
+    "rc-dialog": "8.5.1",
     "rc-form": "2.4.12",
     "rc-slider": "8.6.13",
     "rc-trigger": "2.5.3",