@teamix/pro 1.2.30 → 1.2.31

package/es/form/Filter/SimpleFilter.js

@@ -10,13 +10,13 @@ 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, useRef } from 'react';
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import cls from 'classnames';
-import { usePrefixCls } from '@teamix/utils';
+import { usePrefixCls, isValid } from '@teamix/utils';
 import ProForm from '../ProForm'; // 初始化Search组件，内置部分属性
 
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -85,6 +85,13 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  useEffect(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
+    searchValue.current = isValid(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: cls(prefixCls, props.className),
     schema: simpleSchema,

package/es/form/typing.d.ts

@@ -24,7 +24,7 @@ export interface ProFormSchemaItem {
     name?: string;
     description?: React.ReactNode;
     title?: string;
-    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | 'ProField' | any;
+    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | any;
     props?: AnyObject | any;
     decorator?: string | null;
     decoratorProps?: AnyObject;

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.30";
+declare const version = "1.2.31";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.30';
+var version = '1.2.31';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

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

@@ -84,7 +84,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 

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

@@ -51,10 +51,10 @@ var Filter = function Filter(props) {
       setVisible = _useState4[1];
 
   useEffect(function () {
-    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
+    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4, _actionRef$current$ge5;
 
     // 从全局状态中读取上次存储的条件
-    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current).filterRules) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3[column.dataIndex]) === null || _actionRef$current$ge4 === void 0 ? void 0 : _actionRef$current$ge4.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
+    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current)) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3.filterRules) === null || _actionRef$current$ge4 === void 0 ? void 0 : (_actionRef$current$ge5 = _actionRef$current$ge4[column.dataIndex]) === null || _actionRef$current$ge5 === void 0 ? void 0 : _actionRef$current$ge5.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
     setSelected(rules);
   }, []); // 获取过滤项
 
@@ -172,7 +172,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -187,7 +187,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
+      var rules = (_actionRef$current$ge6 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {}; // 再设置所有的列筛选状态
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
@@ -220,10 +220,10 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
+      var _actionRef$current$ge7, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      var rules = (_actionRef$current$ge7 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
       (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''

package/es/table/index.js

@@ -40,7 +40,7 @@ import { baseClass, useRequest, request as utilResquest, getDeepValue, getMessag
 import { ProSkeletonRaw as Skeleton } from '../skeleton';
 import './index.scss';
 import Layout from './components/Layout';
-import { emit, initActionRef, processDefaultFilter, useActionType } from './utils';
+import { actionRefUseStateOn, emit, initActionRef, processDefaultFilter, useActionType } from './utils';
 import getTableProps from './utils/getTableProps';
 import getTableSortIcons from './utils/getTableSortIcons';
 import useTableSelection from './utils/useTableSelection';
@@ -237,7 +237,24 @@ var ProTable = function ProTable(props) {
   var _useState19 = useState(true),
       _useState20 = _slicedToArray(_useState19, 2),
       showLoading = _useState20[0],
-      setShowLoading = _useState20[1]; // 存储定时器 id
+      setShowLoading = _useState20[1]; // 存储能够被 on 监听到的 ProTable 状态
+  // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
+
+
+  var _useState21 = useState({
+    fullScreenState: false,
+    filterRules: {},
+    filterColumns: []
+  }),
+      _useState22 = _slicedToArray(_useState21, 1),
+      actionRefState = _useState22[0]; // 存储 on 监听事件
+
+
+  var _useState23 = useState({
+    fullScreenState: {}
+  }),
+      _useState24 = _slicedToArray(_useState23, 1),
+      actionRefCallback = _useState24[0]; // 存储定时器 id
 
 
   var autoRefreshTimerRef = useRef(); // 获取header高度，用作全屏吸底吸底高度计算
@@ -261,16 +278,16 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState21 = useState(0),
-      _useState22 = _slicedToArray(_useState21, 2),
-      headerHeight = _useState22[0],
-      setHeaderHeight = _useState22[1]; // 全屏显示 className
+  var _useState25 = useState(0),
+      _useState26 = _slicedToArray(_useState25, 2),
+      headerHeight = _useState26[0],
+      setHeaderHeight = _useState26[1]; // 全屏显示 className
 
 
-  var _useState23 = useState(false),
-      _useState24 = _slicedToArray(_useState23, 2),
-      fullscreenState = _useState24[0],
-      setFullscreenState = _useState24[1]; // 非全屏状态下的
+  var _useState27 = useState(false),
+      _useState28 = _slicedToArray(_useState27, 2),
+      fullscreenState = _useState28[0],
+      setFullscreenState = _useState28[1]; // 非全屏状态下的
 
 
   var normalDataFilterFormRef = useRef();
@@ -281,10 +298,10 @@ var ProTable = function ProTable(props) {
   var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
-  var _useState25 = useState(false),
-      _useState26 = _slicedToArray(_useState25, 2),
-      footerSuctionState = _useState26[0],
-      setFooterSuctionState = _useState26[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
+  var _useState29 = useState(false),
+      _useState30 = _slicedToArray(_useState29, 2),
+      footerSuctionState = _useState30[0],
+      setFooterSuctionState = _useState30[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
 
   var getFooterSuctionState = function getFooterSuctionState() {
@@ -407,7 +424,42 @@ var ProTable = function ProTable(props) {
     if (propsDataSource) {
       setData(propsDataSource);
     }
-  }, [propsDataSource]); // 绑定 Actions
+  }, [propsDataSource]); // 初始化 ActionRef。
+
+  initActionRef(actionRef, {
+    getState: function getState() {
+      return actionRefState;
+    },
+    getCallback: function getCallback() {
+      return actionRefCallback;
+    },
+    setState: function setState(key, value) {
+      actionRefState[key] = value;
+      actionRefUseStateOn(actionRefCallback, key, value);
+    },
+    on: function on(fun, state, name) {
+      if (!actionRefCallback[state]) {
+        actionRefCallback[state] = {};
+      }
+
+      actionRefCallback[state][name] = fun;
+    },
+    off: function off(name) {
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
+          var _ref4 = _slicedToArray(_ref3, 1),
+              k = _ref4[0];
+
+          return k !== name;
+        }));
+        return [k, filterV];
+      }));
+    }
+  }); // 绑定 Actions
 
   useActionType(actionRef, {
     fullScreen: function fullScreen() {
@@ -633,8 +685,6 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    initActionRef();
     dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {

package/es/table/typing.d.ts

@@ -201,8 +201,6 @@ export declare type ProTableActionTypeMutations = {
     getState?: () => ProTableActionTypeState;
     /** 设置state 状态 */
     setState?: (key: string, value: any) => void;
-    /** 初始化 state 状态 */
-    initState?: () => void;
     /** 设置全屏状态 */
     setFullScreenState?: (state: boolean) => void;
     /** 绑定state监听事件 */
@@ -217,6 +215,8 @@ export declare type ProTableActionTypeMutations = {
     resetTableMaxBodyHeight?: () => void;
     /** 列筛选规则 */
     filterColumns?: any[];
+    /** 获取所有 on 监听事件 */
+    getCallback?: () => any;
 };
 /** action Mutations 定义 */
 export declare type ProTableActionTypeState = {

package/es/table/utils/columnRender.js

@@ -144,7 +144,7 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
 
     if (valueType === 'selectGroup') {
       newRender = _objectSpread(_objectSpread({
-        maxShowNumber: 1,
+        maxShowNumber: 'auto',
         foldText: 'more',
         editOnClick: function editOnClick() {},
         edit: true

package/es/table/utils/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
 import { ProTableActionType } from '../typing';
 import { ProTableProps, ProTableColumnProps } from '..';
-export declare function initActionRef(): void;
+export declare function actionRefUseStateOn(callback: any, state: string, ...args: any): void;
 /** table 组件内监听 不对外暴露 */
 export declare function on(fun: any, key: string): void;
 /** table 组件内销毁监听 不对外暴露 */
 export declare function off(key: string): void;
 /** table 组件内触发事件 不对外暴露 */
 export declare function emit(key: string, ...args: any): void;
+export declare function initActionRef(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
 export declare function cloneDeep<T>(obj: T): T;
 /**

package/es/table/utils/index.js

@@ -16,129 +16,76 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import cloneDeepLodash from 'lodash.clonedeep'; // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
-
-var state = {
-  fullScreenState: false,
-  filterRules: {},
-  filterColumns: []
-};
-
-var _initState = cloneDeepLodash(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
-
-
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = cloneDeepLodash(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
-
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
-
-    if (mutations.hasOwnProperty(key)) {
-      mutations[key] = value;
-    }
-  },
-  initState: function initState() {
-    state = cloneDeepLodash(_initState);
-  },
-  filterColumns: state.filterColumns,
-  setFullScreenState: function setFullScreenState(fullScreenState) {
-    state.fullScreenState = fullScreenState;
-    useOn('fullScreenState', fullScreenState);
-  },
-
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
-
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
-
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-            k = _ref2[0],
-            v = _ref2[1];
-
-        return _defineProperty({}, k, v.params);
-      }).reduce(function (acc, cur) {
-        acc = _objectSpread(_objectSpread({}, acc), cur);
-        return acc;
-      }, {});
-    }
+import cloneDeepLodash from 'lodash.clonedeep'; // 所有 ProTable 组件公用一套组件内事件转发机制
+
+var tableCallback = {}; // 组件内对全局状态的更改
+
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g, _actionRef$current2$g2;
+
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current, _actionRef$current$se;
+
+      (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'fullScreenState', fullScreenState);
+    },
+    filterColumns: (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$g = _actionRef$current2.getState) === null || _actionRef$current2$g === void 0 ? void 0 : (_actionRef$current2$g2 = _actionRef$current2$g.call(_actionRef$current2)) === null || _actionRef$current2$g2 === void 0 ? void 0 : _actionRef$current2$g2.filterColumns,
+
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3, _actionRef$current3$s;
+
+      (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setState) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, 'filterRules', rules);
+    },
+
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4, _actionRef$current4$g;
+
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getState) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4).filterRules;
+
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return _defineProperty({}, k, v.params);
+        }).reduce(function (acc, cur) {
+          acc = _objectSpread(_objectSpread({}, acc), cur);
+          return acc;
+        }, {});
+      }
 
-    return result;
-  },
-
-  /**
-   * 绑定监听函数
-   * @param fun 监听函数
-   * @param state 需要监听的state
-   * @param name 监听名（作为销毁唯一id使用）
-   */
-  on: function on(fun, state, name) {
-    if (!callback[state]) {
-      callback[state] = {};
+      return result;
     }
-
-    callback[state][name] = fun;
-  },
-  off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-          k = _ref5[0],
-          v = _ref5[1];
-
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref6) {
-        var _ref7 = _slicedToArray(_ref6, 1),
-            k = _ref7[0];
-
-        return k !== name;
-      }));
-      return [k, filterV];
-    }));
-  }
+  };
 }; // 调用绑定的监听函数
 
-var useOn = function useOn(state) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
+
+export function actionRefUseStateOn(callback, state) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref8) {
-      var _ref9 = _slicedToArray(_ref8, 2),
-          k = _ref9[0],
-          v = _ref9[1];
+    Object.entries(callback[state]).forEach(function (_ref4) {
+      var _ref5 = _slicedToArray(_ref4, 2),
+          k = _ref5[0],
+          v = _ref5[1];
 
       if (v) {
         v === null || v === void 0 ? void 0 : v.apply(void 0, args);
       }
     });
   }
-}; // 初始化 actionRef
-
-
-export function initActionRef() {
-  state = cloneDeepLodash(_initState);
-  callback = cloneDeepLodash(initCallback);
 }
 /** table 组件内监听 不对外暴露 */
 
@@ -165,12 +112,14 @@ export function emit(key) {
     fun.apply(void 0, args);
   }
 }
-export function useActionType(ref, action) {
-  // 合并自定义事件
-  var userAction = _objectSpread(_objectSpread({}, action), mutations);
+export function initActionRef(ref, action) {
+  var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
 
   ref.current = userAction;
 }
+export function useActionType(ref, action) {
+  ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+}
 export function cloneDeep(obj) {
   return cloneDeepLodash(obj);
 }

package/lib/form/Filter/SimpleFilter.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -104,6 +104,13 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  (0, _react.useEffect)(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) === null || _props$form$initialVa === void 0 ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) === null || _props$form$initialVa2 === void 0 ? void 0 : _props$form$initialVa2[1];
+    searchValue.current = (0, _utils.isValid)(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: (0, _classnames.default)(prefixCls, props.className),
     schema: simpleSchema,

package/lib/form/typing.d.ts

@@ -24,7 +24,7 @@ export interface ProFormSchemaItem {
     name?: string;
     description?: React.ReactNode;
     title?: string;
-    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | 'ProField' | any;
+    component?: IBaseComponent | IButtonComponent | IComboComponent | ILayoutComponent | any;
     props?: AnyObject | any;
     decorator?: string | null;
     decoratorProps?: AnyObject;

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.30";
+declare const version = "1.2.31";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

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

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

@@ -103,7 +103,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(Row, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 

package/lib/table/components/Filter/index.js

@@ -70,10 +70,10 @@ var Filter = function Filter(props) {
       setVisible = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
+    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4, _actionRef$current$ge5;
 
     // 从全局状态中读取上次存储的条件
-    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current).filterRules) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3[column.dataIndex]) === null || _actionRef$current$ge4 === void 0 ? void 0 : _actionRef$current$ge4.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
+    var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState) === null || _actionRef$current$ge2 === void 0 ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.call(_actionRef$current)) === null || _actionRef$current$ge3 === void 0 ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3.filterRules) === null || _actionRef$current$ge4 === void 0 ? void 0 : (_actionRef$current$ge5 = _actionRef$current$ge4[column.dataIndex]) === null || _actionRef$current$ge5 === void 0 ? void 0 : _actionRef$current$ge5.rules) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : [];
     setSelected(rules);
   }, []); // 获取过滤项
 
@@ -191,7 +191,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s;
 
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.filterDataSource) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2, column.dataIndex); // 先获取此列的param
 
@@ -206,7 +206,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge5 !== void 0 ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
+      var rules = (_actionRef$current$ge6 = (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState) === null || _actionRef$current3$g === void 0 ? void 0 : (_actionRef$current3$g2 = _actionRef$current3$g.call(_actionRef$current3)) === null || _actionRef$current3$g2 === void 0 ? void 0 : _actionRef$current3$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {}; // 再设置所有的列筛选状态
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: selected,
@@ -239,10 +239,10 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
+      var _actionRef$current$ge7, _actionRef$current9, _actionRef$current9$g, _actionRef$current9$g2, _actionRef$current10, _actionRef$current10$, _actionRef$current11, _actionRef$current11$;
 
       setSelected([]);
-      var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge6 !== void 0 ? _actionRef$current$ge6 : {};
+      var rules = (_actionRef$current$ge7 = (_actionRef$current9 = actionRef.current) === null || _actionRef$current9 === void 0 ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState) === null || _actionRef$current9$g === void 0 ? void 0 : (_actionRef$current9$g2 = _actionRef$current9$g.call(_actionRef$current9)) === null || _actionRef$current9$g2 === void 0 ? void 0 : _actionRef$current9$g2.filterRules) !== null && _actionRef$current$ge7 !== void 0 ? _actionRef$current$ge7 : {};
       (_actionRef$current10 = actionRef.current) === null || _actionRef$current10 === void 0 ? void 0 : (_actionRef$current10$ = _actionRef$current10.setFilterRules) === null || _actionRef$current10$ === void 0 ? void 0 : _actionRef$current10$.call(_actionRef$current10, _objectSpread(_objectSpread({}, rules), {}, _defineProperty({}, column.dataIndex, {
         rules: [],
         params: ''