@teamix/pro 1.3.8 → 1.3.9

package/lib/index.js

@@ -305,5 +305,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.8';
+var version = '1.3.9';
 exports.version = version;

package/lib/info/components/baseInfo/index.js

@@ -45,23 +45,33 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
     if (layout) {
-      var _layout$labelCol, _layout$wrapperCol;
+      var _layout$labelCol, _layout$wrapperCol, _layout$span;
 
       var labelCol = (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
       var wrapperCol = (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
+      var span = (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : defaultLayout.span;
+
+      if ((layout === null || layout === void 0 ? void 0 : layout.colNum) && layout.colNum > 0 && layout.colNum <= 4) {
+        span = 24 / layout.colNum;
+      }
+
+      formItemLayout.span = span;
       formItemLayout.labelCol = labelCol;
       formItemLayout.wrapperCol = wrapperCol;
     }
 
+    var newSpan = formItemLayout.span;
     var newLabelSpan = formItemLayout.labelCol.span;
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
+      newSpan = newSpan * (colspan !== null && colspan !== void 0 ? colspan : 1);
       newLabelSpan = newLabelSpan / colspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
+      span: newSpan,
       labelCol: {
         span: newLabelSpan
       },
@@ -74,12 +84,10 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
+      var _getFormItemLayout, _item$colSpan, _item$title, _item$valueType, _ref, _item$colSpan2;
 
-      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
-      var layoutSpan = item.colSpan ? ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
       return /*#__PURE__*/_react.default.createElement(Col, {
-        span: layoutSpan,
+        span: (_getFormItemLayout = getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0)) === null || _getFormItemLayout === void 0 ? void 0 : _getFormItemLayout.span,
         key: index
       }, /*#__PURE__*/_react.default.createElement(_ProInfoItem.default, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -95,7 +103,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           context: context,
           props: item.props
         }),
-        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
+        baseInfoLayout: getFormItemLayout((_item$colSpan2 = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan2 !== void 0 ? _item$colSpan2 : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));

package/lib/info/typing.d.ts

@@ -135,6 +135,7 @@ export declare type ProInfoProps = {
 export declare type IProHeaderInfoItem = {};
 export declare type BaseInfoLayoutProps = ProBaseInfoLayoutProps;
 export declare type ProBaseInfoLayoutProps = {
+    colNum?: number;
     span?: number;
     labelCol?: {
         span: number;

package/lib/sidebar/components/tree/index.js

@@ -13,8 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _treeNode = require("../tree-node");
 
-var _lodash = _interopRequireDefault(require("lodash.debounce"));
-
 require("./index.scss");
 
 require("../tree-node/index.scss");
@@ -25,7 +23,7 @@ var _hooks = require("@teamix/hooks");
 
 var _actionRef = require("../../utils/action-ref");
 
-var _lodash2 = _interopRequireDefault(require("lodash.clonedeep"));
+var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
 
 var _excluded = ["dataSource", "selectedKeys", "checkedKeys", "defaultExpandedKeys", "defaultExpandAll", "expandedKeys", "onSelect", "onCheck", "isNodeBlock", "searchKey", "actionRef", "onBeforeRenderNodeEvent", "beforeRenderNode", "className", "expandAll", "onDataSourceChange", "expandLevel"];
 
@@ -95,7 +93,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
 
   var processDataSource = function processDataSource(dataSource) {
-    var newDataSource = (0, _lodash2.default)(dataSource);
+    var newDataSource = (0, _lodash.default)(dataSource);
 
     if (beforeRenderNode) {
       (0, _utils2.loop)(newDataSource, function (item, level) {
@@ -174,7 +172,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   (0, _actionRef.useActionType)(actionRef, {
     setTreeNode: function setTreeNode(treeNode) {
-      var newDataSource = (0, _lodash2.default)(dataSource); // TODO 此处可做性能优化
+      var newDataSource = (0, _lodash.default)(dataSource); // TODO 此处可做性能优化
 
       (0, _utils2.loop)(newDataSource, function (item) {
         if (item.value === treeNode.value) {
@@ -239,7 +237,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }; // 过滤
 
 
-  var filterDataSource = (0, _lodash.default)(function (value) {
+  var filterDataSource = function filterDataSource(value) {
     var searchDataSource = processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
     var expandedKeys = [];
 
@@ -251,21 +249,22 @@ var ProSidebarTree = function ProSidebarTree(props) {
       return;
     }
 
-    (0, _utils2.loop)(searchDataSource, function (item) {
+    var _filterTreeData = (0, _utils2.filterTreeData)(searchDataSource, function (node) {
+      var _node$label;
+
+      return ((_node$label = node === null || node === void 0 ? void 0 : node.label) !== null && _node$label !== void 0 ? _node$label : '').includes(value);
+    }),
+        filterTreeValue = _filterTreeData.filterTreeValue;
+
+    (0, _utils2.loop)(filterTreeValue, function (item) {
       hasSearchValue(value, item) && expandedKeys.push(String(item['value']));
     }, {
       children: 'children'
     });
-    setExpandedKeys([].concat(expandedKeys));
     setMatchedKeys(matchedKeys);
     handleExpand(expandedKeys);
-    var filterDataSource = (0, _utils2.findNodeWithPath)(searchDataSource, function (node) {
-      var _node$label;
-
-      return ((_node$label = node === null || node === void 0 ? void 0 : node.label) !== null && _node$label !== void 0 ? _node$label : '').includes(value);
-    });
-    setDataSource(filterDataSource);
-  }, 100);
+    setDataSource(filterTreeValue);
+  };
 
   var filterTreeNode = function filterTreeNode(node) {
     return matchedKeys && matchedKeys.indexOf(node.props.eventKey) > -1;

package/lib/sidebar/index.js

@@ -22,6 +22,8 @@ var _ = require("..");
 
 var _actionRef = require("./utils/action-ref");
 
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
+
 var _typing = require("./typing");
 
 Object.keys(_typing).forEach(function (key) {
@@ -88,7 +90,7 @@ var ProSidebar = function ProSidebar(props) {
       _props$className = props.className,
       className = _props$className === void 0 ? '' : _props$className,
       style = props.style,
-      _searchOnChange = props.searchOnChange,
+      searchOnChange = props.searchOnChange,
       _props$showSearch = props.showSearch,
       showSearch = _props$showSearch === void 0 ? true : _props$showSearch,
       onSelect = props.onSelect,
@@ -222,12 +224,12 @@ var ProSidebar = function ProSidebar(props) {
     }), " ").concat(className),
     style: style
   }, /*#__PURE__*/_react.default.createElement(_sidebarContainer.default, _objectSpread(_objectSpread({
-    searchOnChange: function searchOnChange(value) {
+    searchOnChange: (0, _lodash.default)(function (value) {
       if (showSearch) {
-        _searchOnChange === null || _searchOnChange === void 0 ? void 0 : _searchOnChange(value);
+        searchOnChange === null || searchOnChange === void 0 ? void 0 : searchOnChange(value);
         setSearchKey(value);
       }
-    },
+    }, 300),
     onExpandAllChange: onExpandAllChange,
     onExpandLevelChange: onExpandLevelChange,
     showSearch: showSearch,

package/lib/sidebar/utils/index.d.ts

@@ -69,3 +69,15 @@ export declare function getTreeLevelKey(data: any[], level: number, aliasMap?: {
     key: string;
     children: string;
 }): any[];
+/**
+ * 深度遍历并查找节点（展开查找到的字节点路径）
+ * @param nodes 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+export declare function filterTreeData<T>(nodes: any[], predicate: (node: T) => boolean, aliasMap?: {
+    children: string;
+}): {
+    filterTreeValue: T[];
+};

package/lib/sidebar/utils/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.filterTreeData = filterTreeData;
 exports.findNodeWithPath = findNodeWithPath;
 exports.findNodeWithoutPath = findNodeWithoutPath;
 exports.getAllNodeKey = getAllNodeKey;
@@ -11,6 +12,8 @@ exports.getTreeLevelKey = getTreeLevelKey;
 exports.getTreeNodeLevel = getTreeNodeLevel;
 exports.loop = loop;
 
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -244,4 +247,61 @@ function getTreeLevelKey(data, level, aliasMap) {
     children: children
   });
   return result;
+}
+/**
+ * 深度遍历并查找节点（展开查找到的字节点路径）
+ * @param nodes 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+
+function filterTreeData(nodes, predicate, aliasMap) {
+  if (!(nodes && nodes.length)) {
+    return {
+      filterTreeValue: []
+    };
+  }
+
+  var _ref8 = aliasMap !== null && aliasMap !== void 0 ? aliasMap : {},
+      _ref8$children = _ref8.children,
+      children = _ref8$children === void 0 ? 'children' : _ref8$children;
+
+  var filterTreeValue = [];
+
+  var _iterator2 = _createForOfIteratorHelper(nodes),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var node = _step2.value;
+
+      var others = _extends({}, node);
+
+      if (predicate(node)) {
+        var _node$children3;
+
+        filterTreeValue.push(_objectSpread(_objectSpread({}, others), {}, {
+          children: filterTreeData((_node$children3 = node[children]) !== null && _node$children3 !== void 0 ? _node$children3 : [], predicate, aliasMap).filterTreeValue
+        }));
+      } else {
+        var subs = filterTreeData(node[children], predicate, aliasMap);
+
+        if (subs && subs.filterTreeValue.length) {
+          filterTreeValue.push(_objectSpread(_objectSpread({}, others), {}, {
+            children: subs.filterTreeValue
+          }));
+        }
+      }
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  return {
+    filterTreeValue: filterTreeValue
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",