easy3wui 1.5.85-beta.2 → 1.5.85-beta.3

package/lib/Easy3wTree/index.js

@@ -62,6 +62,7 @@ var TreeNode = _tree2['default'].TreeNode;
  *       onSearchCallback: 搜索回调函数 非必须 Function  返回值：(arrDataVisible, searchValue, expandedKeys)
  * bidPureComponent: 绑定组件方法 非必须 Function
  * intUpdateCount: 数据更新次数 必须 Number
+ * selectedKeys: 选中节点key 非必须 Array
 */
 
 var Easy3wTree = function (_Component) {
@@ -83,10 +84,8 @@ var Easy3wTree = function (_Component) {
     var arrDefaultExpandedKeys = _this.touchGetDEK(arrData);
     _this.searchRef = _react2['default'].createRef();
     _this.state = {
-      // 两数量值，用于彻底更新树，树数据更新，重新渲染，使defaultExpandedKeys生效
-      treevisible: true, // 显示树
-      arrDefaultExpandedKeys: arrDefaultExpandedKeys, // 树默认展开节点
-      arrSearchExpandedKeys: [], // 查询时，树默认展开节点
+      // 两数量值，用于彻底更新树，树数据更新
+      expandedKeys: arrDefaultExpandedKeys, // 展开的节点
       arrDataVisible: arrData || [], // 树数据源-显示数据
       selectedKeys: [] // 选中节点key
     };
@@ -106,7 +105,9 @@ var Easy3wTree = function (_Component) {
   // 递归过滤树结构，并设置展开节点的 keys
 
   // #endregion
-  // 节点点击事件
+  // 节点点击事件--选择
+
+  // 节点点击事件--展开
 
   // 处理树组织
 
@@ -117,9 +118,7 @@ var Easy3wTree = function (_Component) {
     var _state = this.state,
         arrDataVisible = _state.arrDataVisible,
         selectedKeys = _state.selectedKeys,
-        treevisible = _state.treevisible,
-        arrDefaultExpandedKeys = _state.arrDefaultExpandedKeys,
-        arrSearchExpandedKeys = _state.arrSearchExpandedKeys;
+        expandedKeys = _state.expandedKeys;
     var _props = this.props,
         objTreeProps = _props.objTreeProps,
         objSearchProps = _props.objSearchProps,
@@ -144,18 +143,21 @@ var Easy3wTree = function (_Component) {
           spinLoading: !(arrData && arrData.length),
           noStyle: true
         },
-        treevisible ? _react2['default'].createElement(
+        _react2['default'].createElement(
           _tree2['default'],
           (0, _extends3['default'])({
-            defaultExpandedKeys: arrSearchExpandedKeys && arrSearchExpandedKeys.length > 0 ? arrSearchExpandedKeys : arrDefaultExpandedKeys // 树默认展开节点key Array
-            , selectedKeys: selectedKeys // 选中节点key Array
+            expandedKeys: expandedKeys,
+            selectedKeys: selectedKeys // 选中节点key Array
             , showLine: true,
             showIcon: true
             // multiple 多选
-            , onSelect: this.touchSelect
+            , onSelect: this.touchSelect,
+            onExpand: function onExpand(keys) {
+              return _this2.tuochExpand(keys);
+            } // 更新展开的keys
           }, objTreeProps),
           this.touchRenderTreeNodes(arrDataVisible)
-        ) : ''
+        )
       )
     );
   };
@@ -171,29 +173,26 @@ Easy3wTree.defaultProps = {
   },
   objSearchProps: {
     searchFlag: true
-  }
+  },
+  selectedKeys: []
 };
 
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
   this.componentDidUpdate = function (prevProps) {
-    var arrDefaultExpandedKeys = _this3.state.arrDefaultExpandedKeys;
     var _props2 = _this3.props,
         intUpdateCount = _props2.intUpdateCount,
         arrData = _props2.arrData;
 
     if (intUpdateCount !== prevProps.intUpdateCount) {
-      var arrDEKeys = _this3.touchGetDEK(arrData);
+      var expandedKeys = _this3.state.expandedKeys;
+
+      var arrDefaultExpandedKeys = _this3.touchGetDEK(arrData);
       // eslint-disable-next-line react/no-did-update-set-state
       _this3.setState({
         arrDataVisible: arrData || [], // 树数据源-显示数据
-        arrDefaultExpandedKeys: arrDefaultExpandedKeys && arrDefaultExpandedKeys.length ? arrDefaultExpandedKeys : arrDEKeys, // 树默认展开节点
-        treevisible: false // 隐藏树
-      }, function () {
-        _this3.setState({
-          treevisible: true // 显示树
-        });
+        expandedKeys: expandedKeys && expandedKeys.length ? expandedKeys : arrDefaultExpandedKeys // 展开的节点
       });
     }
   };
@@ -203,7 +202,8 @@ var _initialiseProps = function _initialiseProps() {
     if (arrData && arrData.length > 0) {
       var item = arrData[0];
       var objTreeProps = _this3.props.objTreeProps;
-      var keyField = objTreeProps.keyField;
+      var _objTreeProps$keyFiel = objTreeProps.keyField,
+          keyField = _objTreeProps$keyFiel === undefined ? 'key' : _objTreeProps$keyFiel;
 
       arrDefaultExpandedKeys = item[keyField] ? [item[keyField]] : [];
     }
@@ -250,27 +250,23 @@ var _initialiseProps = function _initialiseProps() {
     }
     _this3.setState({
       arrDataVisible: arrDataVisible, // 树数据源-显示数据
-      arrSearchExpandedKeys: arrSearchExpandedKeys, // 查询时，树默认展开节点
-      treevisible: false // 隐藏树
-    }, function () {
-      _this3.setState({
-        treevisible: true // 显示树
-      });
+      expandedKeys: arrSearchExpandedKeys // 查询时，树默认展开节点
     });
   };
 
-  this.touchFilterTreeData = function (arrAllData, searchValue, expandedKeys) {
-    var _props$objTreeProps = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps === undefined ? {} : _props$objTreeProps;
-    var titleField = objTreeProps.titleField,
-        keyField = objTreeProps.keyField;
+  this.touchFilterTreeData = function (arrAllData, searchValue, searchExpandedKeys) {
+    var objTreeProps = _this3.props.objTreeProps;
+    var _objTreeProps$titleFi = objTreeProps.titleField,
+        titleField = _objTreeProps$titleFi === undefined ? 'title' : _objTreeProps$titleFi,
+        _objTreeProps$keyFiel2 = objTreeProps.keyField,
+        keyField = _objTreeProps$keyFiel2 === undefined ? 'key' : _objTreeProps$keyFiel2;
 
     var filteredData = arrAllData.map(function (item) {
       // 递归过滤子节点
-      var children = item.children ? _this3.touchFilterTreeData(item.children, searchValue, expandedKeys) : [];
+      var children = item.children ? _this3.touchFilterTreeData(item.children, searchValue, searchExpandedKeys) : [];
       // 如果节点名字匹配，或者子节点匹配
       if (item[titleField].includes(searchValue) || children.length > 0) {
-        expandedKeys.push(item[keyField]); // 记录展开的节点 key
+        searchExpandedKeys.push(item[keyField]); // 记录展开的节点 key
         return (0, _extends3['default'])({}, item, {
           children: children // 返回匹配的子节点
         });
@@ -283,8 +279,8 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.touchSelect = function (selectedKeys, info) {
-    var _props$objTreeProps2 = _this3.props.objTreeProps,
-        objTreeProps = _props$objTreeProps2 === undefined ? {} : _props$objTreeProps2;
+    var _props$objTreeProps = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps === undefined ? {} : _props$objTreeProps;
     var onSelectCallback = objTreeProps.onSelectCallback;
 
     if (onSelectCallback && typeof onSelectCallback === 'function') {
@@ -295,13 +291,29 @@ var _initialiseProps = function _initialiseProps() {
     });
   };
 
+  this.tuochExpand = function (expandedKeys) {
+    var _props$objTreeProps2 = _this3.props.objTreeProps,
+        objTreeProps = _props$objTreeProps2 === undefined ? {} : _props$objTreeProps2;
+    var onExpandCallback = objTreeProps.onExpandCallback;
+
+    if (onExpandCallback && typeof onExpandCallback === 'function') {
+      onExpandCallback(expandedKeys);
+    }
+    _this3.setState({
+      expandedKeys: expandedKeys // 选中节点key Array
+    });
+  };
+
   this.touchRenderTreeNodes = function (arrDataVisible) {
     var _props$objTreeProps3 = _this3.props.objTreeProps,
         objTreeProps = _props$objTreeProps3 === undefined ? {} : _props$objTreeProps3;
     var touchRenderNode = objTreeProps.touchRenderNode,
-        titleField = objTreeProps.titleField,
-        countField = objTreeProps.countField,
-        keyField = objTreeProps.keyField;
+        _objTreeProps$titleFi2 = objTreeProps.titleField,
+        titleField = _objTreeProps$titleFi2 === undefined ? 'title' : _objTreeProps$titleFi2,
+        _objTreeProps$countFi = objTreeProps.countField,
+        countField = _objTreeProps$countFi === undefined ? 'count' : _objTreeProps$countFi,
+        _objTreeProps$keyFiel3 = objTreeProps.keyField,
+        keyField = _objTreeProps$keyFiel3 === undefined ? 'key' : _objTreeProps$keyFiel3;
 
     return arrDataVisible.map(function (item) {
       var children = item.children;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.85-beta.2",
+  "version": "1.5.85-beta.3",
   "description": "easy3wui components for react",
   "keywords": [
     "react",