@teamix/pro 1.3.8 → 1.3.9

package/es/actions/dialog.js

@@ -174,17 +174,22 @@ export function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false);
+                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+
+                  if (beforeRequest) {
+                    resolve(true);
+                  }
+
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 15:
+                case 16:
                 case "end":
                   return _context.stop();
               }

package/es/form/Components/LightFilter/index.js

@@ -16,12 +16,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { useState, useCallback } from 'react';
-import { observer, useFieldSchema, RecursionField } from '@formily/react';
+import React, { useState, useCallback, useContext } from 'react';
+import { observer, useFieldSchema, RecursionField, SchemaExpressionScopeContext } from '@formily/react';
 import { Select, Button } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import cls from 'classnames';
-import { usePrefixCls } from '@teamix/utils';
+import { usePrefixCls, getTargetValue } from '@teamix/utils';
 import { componentMap, inputCategory } from './componentMap';
 import './index.scss';
 
@@ -56,13 +56,14 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems(filterValues) {
+var useFilterItems = function useFilterItems(filterValues, scope) {
   var schema = useFieldSchema();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
     if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      var label = /{{.*}}/.test(schema.title) ? getTargetValue(schema.title, scope) : schema.title;
       filterItems.push({
-        label: schema.title,
+        label: label,
         value: schema.name
       });
     }
@@ -85,7 +86,8 @@ var LightFilter = observer(function (props) {
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
-  var filterItems = useFilterItems(filterValues);
+  var scope = useContext(SchemaExpressionScopeContext);
+  var filterItems = useFilterItems(filterValues, scope);
 
   var _useState = useState(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/es/form/ProForm/index.js

@@ -15,7 +15,7 @@ import cls from 'classnames';
 import { createForm, onFieldValueChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form } from '@teamix/formily';
-import { usePrefixCls, getLanguage } from '@teamix/utils';
+import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
 import SchemaForm from '../SchemaForm';
 import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
@@ -46,6 +46,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       validateFirst = _ref.validateFirst,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
+  // 获取全局配置
+  var _ref2 = getGlobalConfig('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope;
+
   var form = useMemo(function () {
     return outerForm || createForm({
       validateFirst: validateFirst
@@ -54,11 +59,14 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form'
   });
-  var mergedScope = useMemo(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
-      context: context
-    });
-  }, [scope, context]);
+
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+    context: context
+  }); // context需要实名不能解构
+
+
+  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+
   var onAutoSubmit = useAutoSubmit(onSubmit); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = useMemo(function () {
@@ -115,7 +123,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }), /*#__PURE__*/React.createElement(SchemaForm, {
     schema: schema,
     scope: mergedScope,
-    components: components
+    components: mergedComponents
   }), children);
 });
 ProForm.defaultProps = {

package/es/form/SchemaForm/index.js

@@ -30,7 +30,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import React, { memo, useCallback, useMemo } from 'react';
+import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
 import { Affix } from '@alicloudfe/components';
 import { Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
@@ -59,22 +59,16 @@ import initializeSelectTable from './initializeSelectTable';
 import { $request, $common, $dataSource, $validator } from './reactions';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFieldName, mapSchemaName } from '../utils';
-import { getGlobalConfig } from '@teamix/utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-
-  // 获取全局配置
-  var _ref2 = getGlobalConfig('ProForm') || {},
-      globalComponents = _ref2.components,
-      globalScope = _ref2.scope; // 创建 SchemaField
-
+  var schemaScopeRef = useRef({}); // 创建 SchemaField，添加内置组件
 
   var SchemaField = useMemo(function () {
     return createSchemaField({
-      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), ProFieldComponents), {}, {
+      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
         FormLayout: FormLayout,
         FormItem: FormItem,
         ArrayCollapse: ArrayCollapse,
@@ -103,16 +97,7 @@ export default /*#__PURE__*/memo(function (_ref) {
         Text: Text
       })
     });
-  }, []); // 合并 schema 中 request 的 scope
-
-  var mergedScope = useMemo(function () {
-    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
-      $request: $request,
-      $common: $common,
-      $dataSource: $dataSource,
-      $validator: $validator
-    });
-  }, [scope]); // 格式化 schema
+  }, []); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
     var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -231,12 +216,12 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var defaultReactions = initializeReactions(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 = mapSchemaName(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
@@ -261,13 +246,20 @@ export default /*#__PURE__*/memo(function (_ref) {
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
     });
     return schemaProperties;
-  }, [mergedScope]);
+  }, []);
   var formilySchema = useMemo(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(formilySchema);
+  }, [schema]);
+
+  var mergedScope = _objectSpread(_objectSpread({}, scope), {}, {
+    $request: $request,
+    $common: $common,
+    $dataSource: $dataSource,
+    $validator: $validator
+  }, schemaScopeRef.current);
 
   return /*#__PURE__*/React.createElement(SchemaField, {
     schema: formilySchema,

package/es/index.d.ts

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

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.8';
+var version = '1.3.9';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

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

@@ -26,23 +26,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
       },
@@ -55,12 +65,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.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.createElement(ProInfoItem, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -76,7 +84,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/es/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/es/sidebar/components/tree/index.js

@@ -36,10 +36,9 @@ import { Tree } from '@alicloudfe/components';
 import { baseClass } from '@teamix/utils';
 import React, { useEffect, useMemo, useState } from 'react';
 import { renderTreeNode, renderTreeNodeDependenceValue } from '../tree-node';
-import debounce from 'lodash.debounce';
 import './index.scss';
 import '../tree-node/index.scss';
-import { findNodeWithPath, getAllNodeKey, getTreeLevelKey, loop } from '../../utils';
+import { filterTreeData, getAllNodeKey, getTreeLevelKey, loop } from '../../utils';
 import { useUpdateEffect } from '@teamix/hooks';
 import { useActionType } from '../../utils/action-ref';
 import cloneDeep from 'lodash.clonedeep';
@@ -215,7 +214,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }; // 过滤
 
 
-  var filterDataSource = debounce(function (value) {
+  var filterDataSource = function filterDataSource(value) {
     var searchDataSource = processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
     var expandedKeys = [];
 
@@ -227,21 +226,22 @@ var ProSidebarTree = function ProSidebarTree(props) {
       return;
     }
 
-    loop(searchDataSource, function (item) {
+    var _filterTreeData = 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;
+
+    loop(filterTreeValue, function (item) {
       hasSearchValue(value, item) && expandedKeys.push(String(item['value']));
     }, {
       children: 'children'
     });
-    setExpandedKeys([].concat(expandedKeys));
     setMatchedKeys(matchedKeys);
     handleExpand(expandedKeys);
-    var filterDataSource = 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/es/sidebar/index.js

@@ -29,6 +29,7 @@ import ProSidebarContainer from './components/sidebar-container';
 import ProSidebarTree from './components/tree';
 import { getTreeLevel, ProSkeletonRaw } from '..';
 import { useActionType } from './utils/action-ref';
+import debounce from 'lodash.debounce';
 export * from './typing';
 export * from './utils';
 var cls = baseClass('teamix-pro-sidebar');
@@ -40,7 +41,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,
@@ -174,12 +175,12 @@ var ProSidebar = function ProSidebar(props) {
     }), " ").concat(className),
     style: style
   }, /*#__PURE__*/React.createElement(ProSidebarContainer, _objectSpread(_objectSpread({
-    searchOnChange: function searchOnChange(value) {
+    searchOnChange: debounce(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/es/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/es/sidebar/utils/index.js

@@ -1,3 +1,5 @@
+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; }
@@ -225,4 +227,60 @@ export function getTreeLevelKey(data, level, aliasMap) {
     children: children
   });
   return result;
+}
+/**
+ * 深度遍历并查找节点（展开查找到的字节点路径）
+ * @param nodes 数据
+ * @param predicate 条件
+ * @param aliasMap 标识
+ * @returns
+ */
+
+export 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/lib/actions/dialog.js

@@ -200,17 +200,22 @@ function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false);
+                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+
+                  if (beforeRequest) {
+                    resolve(true);
+                  }
+
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 15:
+                case 16:
                 case "end":
                   return _context.stop();
               }

package/lib/form/Components/LightFilter/index.js

@@ -78,13 +78,14 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems(filterValues) {
+var useFilterItems = function useFilterItems(filterValues, scope) {
   var schema = (0, _react2.useFieldSchema)();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
     if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      var label = /{{.*}}/.test(schema.title) ? (0, _utils.getTargetValue)(schema.title, scope) : schema.title;
       filterItems.push({
-        label: schema.title,
+        label: label,
         value: schema.name
       });
     }
@@ -107,7 +108,8 @@ var LightFilter = (0, _react2.observer)(function (props) {
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
-  var filterItems = useFilterItems(filterValues);
+  var scope = (0, _react.useContext)(_react2.SchemaExpressionScopeContext);
+  var filterItems = useFilterItems(filterValues, scope);
 
   var _useState = (0, _react.useState)(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/lib/form/ProForm/index.js

@@ -73,6 +73,11 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       validateFirst = _ref.validateFirst,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
+  // 获取全局配置
+  var _ref2 = (0, _utils.getGlobalConfig)('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope;
+
   var form = (0, _react.useMemo)(function () {
     return outerForm || (0, _core.createForm)({
       validateFirst: validateFirst
@@ -81,11 +86,14 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var prefixCls = (0, _utils.usePrefixCls)('', {
     prefix: 'teamix-pro-form'
   });
-  var mergedScope = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
-      context: context
-    });
-  }, [scope, context]);
+
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+    context: context
+  }); // context需要实名不能解构
+
+
+  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+
   var onAutoSubmit = (0, _useAutoSubmit.default)(onSubmit); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = (0, _react.useMemo)(function () {
@@ -142,7 +150,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }), /*#__PURE__*/_react.default.createElement(_SchemaForm.default, {
     schema: schema,
     scope: mergedScope,
-    components: components
+    components: mergedComponents
   }), children);
 });
 ProForm.defaultProps = {

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.8";
+declare const version = "1.3.9";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };