xh-lab-rc 0.18.3 → 0.18.5

package/dist/LabOperateTree/index.js

@@ -147,7 +147,7 @@ var LabOperateTree = function LabOperateTree() {
               initOperateTree(_toConsumableArray(props.treeData), {});
             }
           }, props.leafOperateListElement),
-          open: openMarkData[v.SOURCE_PATH],
+          open: openMarkData[v.SOURCE_PATH] || false,
           onOpenChange: function onOpenChange(newOpen) {
             if (newOpen) {
               var _props$onOpenPopover;
@@ -175,7 +175,7 @@ var LabOperateTree = function LabOperateTree() {
     setOperateTreeData(newTreeData);
   };
 
-  // 选择第一个
+  // 选择第一个和展开收起
   useEffect(function () {
     var _props$treeData;
     if (((_props$treeData = props.treeData) === null || _props$treeData === void 0 ? void 0 : _props$treeData.length) > 0) {
@@ -183,22 +183,17 @@ var LabOperateTree = function LabOperateTree() {
       initOperateTree(props.treeData, openMarkData);
       setSelectedKeys([leafItemTreeList === null || leafItemTreeList === void 0 || (_leafItemTreeList$3 = leafItemTreeList[0]) === null || _leafItemTreeList$3 === void 0 ? void 0 : _leafItemTreeList$3.SOURCE_PATH]);
       props === null || props === void 0 || (_props$onSelect = props.onSelect) === null || _props$onSelect === void 0 || _props$onSelect.call(props, leafItemTreeList === null || leafItemTreeList === void 0 ? void 0 : leafItemTreeList[0]);
-      if (!(props !== null && props !== void 0 && props.expandAll)) {
+      if ((props === null || props === void 0 ? void 0 : props.expandAll) === undefined) {
         setExpandKeys(expandKeysList);
+      } else if ((props === null || props === void 0 ? void 0 : props.expandAll) === false) {
+        setExpandKeys([]);
+      } else if ((props === null || props === void 0 ? void 0 : props.expandAll) === true) {
+        setExpandKeys(allItemTreeList.map(function (v) {
+          return v.SOURCE_PATH;
+        }));
       }
     }
-  }, [props.treeData, props.showIcon, props.showOperateIcon]);
-
-  // 展开收起
-  useEffect(function () {
-    if (!(props !== null && props !== void 0 && props.expandAll)) {
-      setExpandKeys([]);
-    } else {
-      setExpandKeys(allItemTreeList.map(function (v) {
-        return v.SOURCE_PATH;
-      }));
-    }
-  }, [props.expandAll]);
+  }, [props.treeData, props.showIcon, props.showOperateIcon, props.expandAll]);
 
   // 受控勾选
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xh-lab-rc",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "description": " A react library for xinhelab",
   "license": "MIT",
   "module": "dist/index.js",