@teamix/pro 1.3.7 → 1.3.10

package/lib/form/SchemaForm/index.js

@@ -65,8 +65,6 @@ var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
 
 var _utils = require("../utils");
 
-var _utils2 = require("@teamix/utils");
-
 var _warning = _interopRequireDefault(require("../warning"));
 
 var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
@@ -111,16 +109,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-
-  // 获取全局配置
-  var _ref2 = (0, _utils2.getGlobalConfig)('ProForm') || {},
-      globalComponents = _ref2.components,
-      globalScope = _ref2.scope; // 创建 SchemaField
-
+  var schemaScopeRef = (0, _react.useRef)({}); // 创建 SchemaField，添加内置组件
 
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), _ProField.default), {}, {
+      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
         ArrayCollapse: _formily.ArrayCollapse,
@@ -149,16 +142,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         Text: _index.default
       })
     });
-  }, []); // 合并 schema 中 request 的 scope
-
-  var mergedScope = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
-      $request: _reactions.$request,
-      $common: _reactions.$common,
-      $dataSource: _reactions.$dataSource,
-      $validator: _reactions.$validator
-    });
-  }, [scope]); // 格式化 schema
+  }, []); // 格式化 schema
 
   var formatSchema = (0, _react.useCallback)(function (schema) {
     var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -277,12 +261,12 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var defaultReactions = (0, _initializeReactions.default)(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
 
-      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-            k = _ref4[0],
-            v = _ref4[1];
+      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            k = _ref3[0],
+            v = _ref3[1];
 
-        mergedScope[k] = v;
+        schemaScopeRef.current[k] = v;
       });
       var formatParam = (0, _utils.mapSchemaName)(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
@@ -307,13 +291,20 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
     });
     return schemaProperties;
-  }, [mergedScope]);
+  }, []);
   var formilySchema = (0, _react.useMemo)(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(formilySchema);
+  }, [schema]);
+
+  var mergedScope = _objectSpread(_objectSpread({}, scope), {}, {
+    $request: _reactions.$request,
+    $common: _reactions.$common,
+    $dataSource: _reactions.$dataSource,
+    $validator: _reactions.$validator
+  }, schemaScopeRef.current);
 
   return /*#__PURE__*/_react.default.createElement(SchemaField, {
     schema: formilySchema,

package/lib/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.7";
+declare const version = "1.3.10";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

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.7';
+var version = '1.3.10';
 exports.version = version;

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) {
@@ -145,7 +143,11 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   (0, _react.useEffect)(function () {
     setDefaultExpandedKeys();
-  }, []); // 更新外部传入的 dataSource
+  }, []); // 监听 selectedKeys，用于受控
+
+  (0, _react.useEffect)(function () {
+    setSelectedKeys(selectedKeysProp);
+  }, [selectedKeysProp]); // 更新外部传入的 dataSource
 
   (0, _hooks.useUpdateEffect)(function () {
     setDataSource(processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []));
@@ -170,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) {
@@ -235,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 = [];
 
@@ -247,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.7",
+  "version": "1.3.10",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@formily/core": "2.0.15",
     "@formily/react": "2.0.15",
-    "@teamix/formily": "2.0.15",
+    "@teamix/formily": "2.0.15-1",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",