@teamix/pro 1.3.6 → 1.3.9

package/es/info/utils/index.js

@@ -30,31 +30,4 @@ export function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return getDeepValue(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
-}
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-
-export var isLastRow = function isLastRow(columnsLength, layoutSpan, itemIndex) {
-  if (!columnsLength || !layoutSpan) return;
-  var lastRowColumnsIndexList = [];
-  var rowCount = 24 / layoutSpan;
-
-  if (columnsLength % rowCount === 0) {
-    while (rowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  } else {
-    var lastRowCount = columnsLength % rowCount;
-
-    while (lastRowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  }
-
-  return lastRowColumnsIndexList.includes(itemIndex + 1);
-};
+}

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';
 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';
@@ -121,7 +120,11 @@ var ProSidebarTree = function ProSidebarTree(props) {
 
   useEffect(function () {
     setDefaultExpandedKeys();
-  }, []); // 更新外部传入的 dataSource
+  }, []); // 监听 selectedKeys，用于受控
+
+  useEffect(function () {
+    setSelectedKeys(selectedKeysProp);
+  }, [selectedKeysProp]); // 更新外部传入的 dataSource
 
   useUpdateEffect(function () {
     setDataSource(processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []));
@@ -211,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 = [];
 
@@ -223,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/components/tree-node/components/IconSwitch/index.js

@@ -33,7 +33,7 @@ var ProIconSwitch = function ProIconSwitch(props) {
       setVisible = _useState2[1];
 
   useEffect(function () {
-    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : false);
+    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : true);
   }, [visibleProp]); // 点击操作
 
   var clickHandle = function clickHandle(e, state) {

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/es/table/components/Pagination/index.js

@@ -25,7 +25,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 // 自适应宽度的翻页器
 import React, { useState, useEffect } from 'react';
 import { Pagination, Balloon, Select, Button, Input, Icon } from '@alicloudfe/components';
-import { getMessage, baseClass } from '@teamix/utils';
+import { getMessage, baseClass, usePrefixCls } from '@teamix/utils';
 import { useResponsiveProps } from '@teamix/hooks';
 import './index.scss';
 var cls = baseClass('teamix-pro-pagination');
@@ -160,7 +160,7 @@ export default (function (props) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls('custom-jumper')
     }, /*#__PURE__*/React.createElement(Button, {
-      className: "next-prev next-pagination-item",
+      className: "".concat(usePrefixCls(), "prev ").concat(usePrefixCls(), "pagination-item"),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/React.createElement(Icon, {
@@ -182,7 +182,7 @@ export default (function (props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/React.createElement(Button, {
-      className: "next-next next-pagination-item",
+      className: "".concat(usePrefixCls(), "next ").concat(usePrefixCls(), "pagination-item"),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -200,7 +200,7 @@ export default (function (props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  next-pagination")
+          className: "".concat(cls('custom-mini-pagination'), "  ").concat(usePrefixCls(), "pagination")
         }, customTotalRender(total), customJumpRender());
       }
     }

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -47,8 +47,12 @@ var processColumns = function processColumns(columns) {
     columns = columns.filter(function (item) {
       return item.valueType !== 'selectGroup';
     });
-  }
+  } // hidden 为 true 时不展示
+
 
+  columns = columns.filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+  });
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;

package/es/table/index.js

@@ -36,7 +36,7 @@ import React, { useState, useEffect, useRef } from 'react';
 import { Table, Checkbox } from '@alicloudfe/components';
 import Pagination from './components/Pagination';
 import genProColumnToColumn from './utils/genProColumnToColumn';
-import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, getCookie } from '@teamix/utils';
+import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessage, pickProps, getCookie, usePrefixCls } from '@teamix/utils';
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
@@ -65,7 +65,7 @@ var processColumns = function processColumns(columns, initialColumns) {
   var _filterColumns;
 
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false;
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
   });
 
   if (isRoot) {
@@ -269,7 +269,7 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName('next-table-header-inner')) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat(usePrefixCls(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -692,6 +692,11 @@ var ProTable = function ProTable(props) {
             setTotal(total || (data === null || data === void 0 ? void 0 : data.length));
             setShowSkeleton(false);
             setCustomTableLoading(false);
+          } // 重新计算是否需要吸底
+
+
+          if (footerSuction) {
+            getFooterSuctionState();
           }
         });
       } else {
@@ -750,7 +755,7 @@ var ProTable = function ProTable(props) {
     onInit: function onInit(values) {
       // 表单初始化请求处理
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
-      !fullscreenState && _request({}, false, values);
+      !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
     },
     onFilter: function onFilter(values) {

package/es/table/typing.d.ts

@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
     valueType?: ProFieldType;
-    /** 【列配置】是否默认隐藏列 */
+    /** 是否隐藏表格列，列配置也不显示 */
+    hidden?: boolean;
+    /** 【列配置】是否默认隐藏表格列，但列配置显示 */
     columnFilters?: boolean;
     /** 【列配置】是否禁用隐藏列 */
     columnFiltersDisabled?: boolean;

package/lib/actions/dialog-form.d.ts

@@ -20,6 +20,8 @@ export interface DialogFormAction extends DialogAction {
     schema: ProFormSchema | Omit<ProFormProps, 'form'>;
     /** 外部传来的 formRef，用于获取内置 form 实例 */
     formRef?: React.MutableRefObject<ProFormType | undefined>;
+    /** 是否开启懒惰校验，只校验第一个非法规则，默认开启 */
+    validateFirst?: boolean;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/lib/actions/dialog-form.js

@@ -111,14 +111,17 @@ var DialogForm = function DialogForm(props) {
       formProps = props.formProps,
       context = props.context,
       formRef = props.formRef,
-      innerFormRef = props.innerFormRef;
+      innerFormRef = props.innerFormRef,
+      _props$validateFirst = props.validateFirst,
+      validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
       others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
 
   var form = (0, _form.createForm)({
-    initialValues: (0, _utils.getTargetValue)(initialValues, context)
+    initialValues: (0, _utils.getTargetValue)(initialValues, context),
+    validateFirst: validateFirst
   });
 
   var _useState = (0, _react.useState)(false),

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/actions/index.d.ts

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { ButtonProps } from '@alicloudfe/components/types/button';
 import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
+import { TooltipProps } from '@alicloudfe/components/types/balloon';
 import { LinkAction } from './link';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
@@ -29,7 +30,10 @@ export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
     disabled?: any;
+    tooltip?: ReactNode;
+    disabledTooltip?: ReactNode;
     icon?: string;
+    tooltipProps?: TooltipProps;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;

package/lib/actions/index.js

@@ -54,7 +54,7 @@ var _dangerPopConfirm = require("./danger-pop-confirm");
 require("./index.scss");
 
 var _excluded = ["type"],
-    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
+    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
@@ -202,18 +202,40 @@ var ProActionButton = function ProActionButton(props) {
       context = props.context,
       children = props.children,
       visible = props.visible,
+      disabled = props.disabled,
       _onClick = props.onClick,
+      tooltip = props.tooltip,
+      disabledTooltip = props.disabledTooltip,
+      tooltipProps = props.tooltipProps,
       others = _objectWithoutProperties(props, _excluded2);
 
   var actionProps = useAction(config, context);
-  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({}, actionProps), others), {}, {
+  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others), {}, {
     onClick: function onClick(e) {
       return _onClick(e, context);
     }
-  }) : _objectSpread(_objectSpread({}, actionProps), others);
-  return /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({
+  }) : _objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others);
+
+  var content = /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({
     type: type
   }, buttonProps), buttonContent(children, icon, iconSize, context));
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    var showToolTip = disabled ? disabledTooltip : tooltip;
+    content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+  }
+
+  return content;
 };
 
 exports.ProActionButton = ProActionButton;
@@ -241,9 +263,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
     }
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
-    className: (0, _classnames.default)('teamix-pro-action-menu-item', 'next-menu-item', {
-      'next-disabled': disabled
-    })
+    className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
   }, buttonProps), buttonContent(children, icon, undefined, context));
 };
 
@@ -405,6 +425,8 @@ function getActionConfig(action, index, context) {
       key: getKey(index, _key),
       actions: actions.map(function (a, j) {
         return getActionConfig(a, j, context);
+      }).filter(function (action) {
+        return action.visible !== false;
       })
     }, (0, _utils.getTargetValue)(_others, context));
   }

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/Filter/LightFilter.js

@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _reactive = require("@formily/reactive");
+
 var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
@@ -33,9 +35,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+var lightFilterObs = (0, _reactive.observable)({
+  onFilter: function onFilter() {}
+});
 /**
  * 轻量筛选
  */
+
 var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var _schema$;
 
@@ -87,7 +93,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onFilter
+          onClick: "{{lightFilterObs.onFilter}}"
         }
       },
       children: schema
@@ -99,8 +105,14 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         }
       }
     }];
-  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilterChange, defaultFilterValue]);
+  (0, _react.useEffect)(function () {
+    lightFilterObs.onFilter = onFilter;
+  }, [onChange]);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+    scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
+      lightFilterObs: lightFilterObs
+    }),
     form: form,
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: LightSchema,

package/lib/form/Filter/useSpecialProps.js

@@ -24,7 +24,7 @@ var useSpecialProps = function useSpecialProps(props) {
           dataSource = item.dataSource,
           children = item.children; // 字符串变量配置default值会触发onChange
 
-      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
       hasDefault = hasDefault || (0, _utils.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
 

package/lib/form/ProForm/index.js

@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -70,21 +70,30 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
+      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: true
+      validateFirst: validateFirst
     });
   }, []);
   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 () {
@@ -141,12 +150,13 @@ 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 = {
   colon: false,
-  labelAlign: 'left'
+  labelAlign: 'left',
+  validateFirst: true
 };
 var _default = ProForm;
 exports.default = _default;