@teamix/pro 1.2.35 → 1.3.0

package/es/form/Filter/AdvancedFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["schema", "onSubmit", "onReset", "onResetClick", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol"];
+var _excluded = ["schema", "onSubmit", "onReset", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "forceClear"];
 
 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; }
 
@@ -35,12 +35,12 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
   var schema = props.schema,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
-      onResetClick = props.onResetClick,
       layout = props.layout,
       labelAlign = props.labelAlign,
       wrapperAlign = props.wrapperAlign,
       labelCol = props.labelCol,
       wrapperCol = props.wrapperCol,
+      forceClear = props.forceClear,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var prefixCls = usePrefixCls('', {
@@ -71,7 +71,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
             component: 'Reset',
             props: {
               onResetValidateSuccess: onReset,
-              onClick: onResetClick,
+              forceClear: !!forceClear,
               children: getMessage('reset')
             }
           }, {
@@ -86,7 +86,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
         }]
       }])
     }];
-  }, [schema, onReset, onResetClick]);
+  }, [schema, onReset]);
   var getTeamixLayout = useMemo(function () {
     return {
       breakpoints: [990],

package/es/form/Filter/LightFilter.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
 
 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; }
 
@@ -10,9 +10,8 @@ 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; }
 
-import React, { memo, useMemo, useCallback, useRef } from 'react';
+import React, { memo, useMemo, useCallback, useRef, useEffect } from 'react';
 import cls from 'classnames';
-import { toJS } from '@formily/reactive';
 import { usePrefixCls } from '@teamix/utils';
 import ProForm from '../ProForm';
 /**
@@ -27,24 +26,32 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var filterValue = useRef(defaultFilterValue || ((_schema$ = schema[0]) === null || _schema$ === void 0 ? void 0 : _schema$.name));
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-light'
-  }); // input类组件的按钮
-
-  var onBtnClick = useCallback(function () {
-    onChange && onChange(toJS(form.values));
-  }, [form]); // 筛选提交切换
+  });
+  useEffect(function () {
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = filterValue.current;
+    }
+  }, []); // 筛选提交切换
 
   var onFilterChange = useCallback(function (value) {
     filterValue.current = value;
-  }, [form]); // onChange
 
-  var onCurrentChange = useCallback(function (values) {
-    onChange && onChange(_defineProperty({}, filterValue.current, values[filterValue.current]));
-  }, [onChange, filterValue.current]);
+    if (activeFilterValueRef) {
+      activeFilterValueRef.current = value;
+    }
+  }, [form]); // 实际输出onFilter
+
+  var onFilter = useCallback(function () {
+    var key = filterValue.current;
+    var value = form.values[key];
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+  }, [onChange]);
   var LightSchema = useMemo(function () {
     return [{
       component: 'LightFilter',
@@ -52,7 +59,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         defaultFilterValue: defaultFilterValue,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onBtnClick
+          onClick: onFilter
         }
       },
       children: schema
@@ -64,7 +71,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema, onBtnClick, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: form,
     className: cls(prefixCls, props.className),
@@ -73,7 +80,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
     breakpoints: [],
     bordered: false,
     onSubmit: onSubmit,
-    onChange: onCurrentChange
+    onChange: onFilter
   }));
 });
 export default LightFilter;

package/es/form/Filter/index.js

@@ -70,12 +70,9 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = useSpecialProps(props),
-      hasDefault = _useSpecialProps.hasDefault,
       hasChangeDefault = _useSpecialProps.hasChangeDefault,
       hasRequired = _useSpecialProps.hasRequired;
 
-  var hasDefaultOrRequired = hasDefault || hasRequired;
-
   var _useState = useState(!!expand),
       _useState2 = _slicedToArray(_useState, 2),
       panelVisible = _useState2[0],
@@ -87,8 +84,9 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       setTagDataSource = _useState4[1];
 
   var filterItem = useRef([]);
-  var defaultForm = mode === 'panel' ? hasDefaultOrRequired || panelVisible ? 'advanced' : 'light' : 'simple';
+  var defaultForm = mode === 'panel' ? 'advanced' : 'simple';
   var currentForm = useRef(defaultForm);
+  var activeFilterValueRef = useRef();
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter'
   });
@@ -103,7 +101,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         initialValues = _ref.initialValues;
 
     if (!form.mounted) {
-      // 在form上自定义loading属性使用
+      // 借用form的loading属性来判断initialValues和initialRequest是否完成
       form.setState({
         loading: !!initialRequest || !!initialValues
       });
@@ -111,24 +109,34 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
     var loadingField = Object.values(form.fields).filter(function (field) {
       return !!field.loading;
-    }); // 等待表单mounted + 字段loading结束 + form的loading结束 => 表单初始化完成
+    }); // 等待表单mounted + 字段loading结束 + form默认值初始化 => 表单初始化完成
+
+    if (form.mounted && !loadingField.length && !form.loading) {
+      _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
-    if (form.mounted && loadingField.length === 0 && !form.loading) {
-      if (loadingField.length === 0 && !form.loading) {
-        _onFormInit = function onFormInit() {}; // init后销毁 isFormInit 方法
 
+      var values = getValidValues(form.values);
 
-        var values = getValidValues(form.values);
+      if (!isUsable(values) || !hasChangeDefault) {
+        // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
+        filterEnable.current = 'filter';
+        setTimeout(function () {
+          onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values));
+        }, 0);
 
-        if (!isUsable(values) || !hasChangeDefault) {
-          // 表单无默认值 或 无触发onChange的默认值配置，不会触发onFilter内的onInit，所以主动触发onInit
-          setTimeout(function () {
-            onInit === null || onInit === void 0 ? void 0 : onInit(toJS(form.values));
-          }, 0);
-          filterEnable.current = 'filter';
-        } else {
-          filterEnable.current = 'initialized';
+        if (mode === 'panel') {
+          // 移除lightForm的默认值
+          // 设置Tag
+          configFilterItem(advancedForm);
+
+          if (!panelVisible) {
+            setTimeout(function () {
+              configTag();
+            }, 0);
+          }
         }
+      } else {
+        filterEnable.current = 'initialized';
       }
     }
   }; // 配置当前激活的form实例
@@ -141,9 +149,11 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       var form = formMap[formName];
       formRef.current = form;
 
-      formRef.current.updateTags = function () {
-        configFilterItem(form);
-      };
+      if (!formRef.current.updateTags) {
+        formRef.current.updateTags = function () {
+          configFilterItem(form);
+        };
+      }
     }
   }; // 创建简单筛选表单实例
 
@@ -153,7 +163,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       validateFirst: true,
       effects: function effects() {
         onFormReact(function (form) {
-          if (defaultForm === 'simple') {
+          if (mode === 'inline') {
             _onFormInit(form, props);
           }
         });
@@ -165,11 +175,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return createForm({
       validateFirst: true,
       effects: function effects() {
-        onFormReact(function (form) {
-          if (defaultForm === 'light') {
-            _onFormInit(form, props);
-          }
-        });
         onFormInputChange(function () {
           setCurrentForm('light'); // 主动修改轻量筛选值
         });
@@ -182,7 +187,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       validateFirst: true,
       effects: function effects() {
         onFormReact(function (form) {
-          if (defaultForm === 'advanced') {
+          if (mode === 'panel') {
             _onFormInit(form, props);
           }
         });
@@ -250,14 +255,9 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     if (result) {
       // 展开高级筛选，Light回填Advanced
       if (currentForm.current === 'light') {
-        Object.entries(lightForm.values || {}).map(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 2),
-              key = _ref5[0],
-              value = _ref5[1];
-
-          // 有效值值回填，防止全部值回填改变，触发不必要的 reactions
-          advancedForm.setValuesIn(key, value);
-        });
+        var key = activeFilterValueRef.current;
+        var value = lightForm.values[key];
+        advancedForm.setValuesIn(key, value);
       }
     } else {
       // 收起高级筛选，配置标签数据
@@ -269,7 +269,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, [panelVisible, configTag]); // 简单搜索Filter
 
   var onSimpleFilter = useCallback( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -325,99 +325,72 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     }));
 
     return function (_x) {
-      return _ref6.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
 
-  var onLightFilter = useCallback( /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(currentForm.current === 'light')) {
-                _context2.next = 14;
-                break;
-              }
-
-              if (!(filterEnable.current === 'initialized')) {
-                _context2.next = 8;
-                break;
-              }
-
-              filterEnable.current = 'filter';
-              onInit === null || onInit === void 0 ? void 0 : onInit(values);
-              configFilterItem(advancedForm);
-              configTag();
-              _context2.next = 14;
-              break;
-
-            case 8:
-              if (!(filterEnable.current === 'filter')) {
-                _context2.next = 14;
-                break;
-              }
-
-              onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
-              _context2.next = 12;
-              return advancedForm.reset();
+  var onLightFilter = useCallback(function (values) {
+    if (currentForm.current === 'light') {
+      if (filterEnable.current === 'filter') {
+        var _Object$keys;
 
-            case 12:
-              // 不会触发高级筛选的onReset回调函数
-              configFilterItem(advancedForm);
-              configTag();
+        onFilter === null || onFilter === void 0 ? void 0 : onFilter(values); // 清空advancedForm的值，配置Tag
 
-            case 14:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-
-    return function (_x2) {
-      return _ref7.apply(this, arguments);
-    };
-  }(), [onFilter, onInit]); // 高级搜索Filter by Submit
+        var clearKeys = {};
+        (_Object$keys = Object.keys(advancedForm.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (key) {
+          clearKeys[key] = undefined;
+        });
+        advancedForm.setValues(clearKeys);
+        configFilterItem(advancedForm);
+        configTag();
+      }
+    }
+  }, [onFilter]); // 高级搜索Filter by Submit
 
   var onAdvancedFilter = useCallback(function (values) {
     setCurrentForm('advanced');
     onFilter === null || onFilter === void 0 ? void 0 : onFilter(values);
-    configFilterItem(advancedForm);
-    lightForm.reset();
+    configFilterItem(advancedForm); // 清空lightForm的值
+
+    lightForm.reset('*', {
+      forceClear: true
+    });
   }, [onFilter]); // 高级搜索Reset
 
   var onAdvancedReset = useCallback(function () {
     setCurrentForm('advanced');
     onReset === null || onReset === void 0 ? void 0 : onReset(toJS(advancedForm.values));
-    configFilterItem(advancedForm);
-    lightForm.reset();
+    configFilterItem(advancedForm); // 清空lightForm的值
+
+    lightForm.reset('*', {
+      forceClear: true
+    });
   }, [onReset]); // 高级搜索Filter by Change
 
   var onAdvancedChange = useCallback( /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(values) {
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               if (!(currentForm.current === 'advanced')) {
-                _context3.next = 9;
+                _context2.next = 9;
                 break;
               }
 
               if (!(filterEnable.current === 'initialized')) {
-                _context3.next = 9;
+                _context2.next = 9;
                 break;
               }
 
               filterEnable.current = 'filter';
 
               if (!hasRequired) {
-                _context3.next = 6;
+                _context2.next = 6;
                 break;
               }
 
-              _context3.next = 6;
+              _context2.next = 6;
               return advancedForm.validate();
 
             case 6:
@@ -430,14 +403,14 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
 
             case 9:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
         }
-      }, _callee3);
+      }, _callee2);
     }));
 
-    return function (_x3) {
-      return _ref8.apply(this, arguments);
+    return function (_x2) {
+      return _ref5.apply(this, arguments);
     };
   }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
 
@@ -453,7 +426,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     configFilterItem(advancedForm);
     configTag();
     onFilter === null || onFilter === void 0 ? void 0 : onFilter(toJS(advancedForm.values));
-  }, []); // initialValues和initialRequest的回调
+  }, [onFilter]); // initialValues和initialRequest的回调
 
   var onInitialComplete = useCallback(function (form) {
     form.setState({
@@ -472,9 +445,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
     inlineContent: mode === 'panel' ? /*#__PURE__*/React.createElement("div", {
-      className: cls("".concat(prefixCls, "-inline"), purePanel || hasDefaultOrRequired ? "".concat(prefixCls, "-inline-hidden") : '')
+      className: cls("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
     }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
+      activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
       onChange: debounce(onLightFilter, filterDebounce)
     }))) : /*#__PURE__*/React.createElement("div", {
@@ -492,12 +466,12 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete
     })) : null
-  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref9) {
-    var key = _ref9.key,
-        label = _ref9.label,
-        value = _ref9.value,
-        type = _ref9.type,
-        index = _ref9.index;
+  }, mode === 'panel' && !panelVisible ? /*#__PURE__*/React.createElement(Tag.Group, null, tagDataSource.map(function (_ref6) {
+    var key = _ref6.key,
+        label = _ref6.label,
+        value = _ref6.value,
+        type = _ref6.type,
+        index = _ref6.index;
     return /*#__PURE__*/React.createElement(Tag.Closeable, {
       key: isNum(index) ? key + label : key,
       afterClose: function afterClose() {

package/es/form/ProForm/index.scss

@@ -197,14 +197,14 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中
-.#{$form-array}-items-item-inner {
-  .#{$css-prefix}space-item {
-    > .#{$css-prefix}formily-icon {
-      margin-top: 9px;
-    }
-  }
-}
+// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
+// .#{$form-array}-items-item-inner {
+//   .#{$css-prefix}space-item {
+//     > .#{$css-prefix}formily-icon {
+//       margin-top: 9px;
+//     }
+//   }
+// }
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {

package/es/form/SchemaForm/initializeRequest.js

@@ -37,9 +37,8 @@ var initializeRequest = function initializeRequest(requestConfig, suffix) {
       };
     } else {
       var requestConfigName = "$requestConfig_".concat(suffix);
-      var requestIndex = (/\d{1,}\w(\d{0,})/g.exec(suffix) || [])[1];
       return {
-        reactions: ["{{$common($request,".concat(requestConfigName, ",context,").concat(requestIndex, ")}}")],
+        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
         scope: _defineProperty({}, requestConfigName, requestConfig)
       };
     }

package/es/form/SchemaForm/reactions.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: string | number) => Promise<unknown>;
-declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any, index: string) => (field: any) => any;
+declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
+declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
 declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };

package/es/form/SchemaForm/reactions.js

@@ -4,23 +4,21 @@ 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 { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
+import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
 var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  // let refresh
-  // if(isStr(type)){
-  //   refresh = field.data?.refreshMap?.[type]
-  // }else if(isNum(type)){
-  // }else{
-  //   refresh = field.data?.refresh;
-  // }
-  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
-  var refreshResult = isPlainObj(refresh) ? refresh : {};
   var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
+  /**
+   * // 主动触发的请求刷新
+   */
+  // 触发所有配置的请求
+
+  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
+  var refreshResult = isPureObj(refresh) ? refresh : {};
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -33,9 +31,9 @@ var $request = function $request(field, requestConfig, context, type) {
 }; // 通用请求配置上下文
 
 
-var $common = function $common(services, requestConfig, context, index) {
+var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, requestConfig, context, index || 'common').then(function (res) {
+    return services(field, requestConfig, context, 'request').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -61,7 +59,7 @@ var $dataSource = function $dataSource(services, requestConfig, context, readPre
       });
     }
 
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined

package/es/form/typing.d.ts

@@ -68,8 +68,9 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    activeFilterValueRef?: React.MutableRefObject<any>;
+    forceClear?: boolean;
     onReset?: (payload?: any) => void;
-    onResetClick?: () => void;
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -93,6 +94,8 @@ export interface QueryFilterProps extends ProFormProps {
     purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 是否强制清除 */
+    forceClear?: boolean;
     /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */

package/es/index.d.ts

@@ -9,7 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 export * from './actions';
@@ -23,6 +23,6 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table';
 export * from './utils';
-export * from './step';
-declare const version = "1.2.35";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
+export * from './timeline';
+declare const version = "1.3.0";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -11,7 +11,7 @@ import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils'; // import ProSidebar from './sidebar'
 
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon'; // 设置图标源
@@ -29,8 +29,8 @@ export * from './skeleton';
 export * from './table';
 export * from './utils'; // export * from './sidebar';
 
-export * from './step';
-var version = '1.2.35';
+export * from './timeline';
+var version = '1.3.0';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
-ProStep, hooks, nocode, templates, utils };
+ProTimeline, hooks, nocode, templates, utils };

package/es/nocode/configurators/PageHeader.js

@@ -80,11 +80,11 @@ var schema = [{
         }, {
           name: 'iconColor',
           title: '图标颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundColor',
           title: '图标背景颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundType',
           title: '图标背景形状',

package/es/table/components/Layout/index.js

@@ -152,13 +152,13 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/React.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/React.createElement("div", {
+      }, header && /*#__PURE__*/React.createElement(Header, _objectSpread({}, header))), /*#__PURE__*/React.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/React.createElement(QuickAction, {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {