@teamix/pro 1.3.2 → 1.3.3

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

@@ -78,14 +78,16 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems() {
+var useFilterItems = function useFilterItems(filterValues) {
   var schema = (0, _react2.useFieldSchema)();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
-    filterItems.push({
-      label: schema.title,
-      value: schema.name
-    });
+    if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      filterItems.push({
+        label: schema.title,
+        value: schema.name
+      });
+    }
   });
   return filterItems;
 }; // 是否输入框类型的组件
@@ -99,12 +101,13 @@ var isInputCategory = function isInputCategory(currentSchema) {
 var LightFilter = (0, _react2.observer)(function (props) {
   var _filterItems$, _main$;
 
-  var filterItems = useFilterItems();
   var size = props.size,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
+  var filterItems = useFilterItems(filterValues);
 
   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

@@ -15,7 +15,7 @@ var _utils = require("@teamix/utils");
 
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 
-var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "activeFilterValueRef"];
+var _excluded = ["form", "schema", "onSubmit", "onChange", "defaultFilterValue", "filterValues", "activeFilterValueRef"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,6 +44,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       onSubmit = props.onSubmit,
       onChange = props.onChange,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       activeFilterValueRef = props.activeFilterValueRef,
       otherProps = _objectWithoutProperties(props, _excluded);
 
@@ -66,15 +67,24 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   }, [form]); // 实际输出onFilter
 
   var onFilter = (0, _react.useCallback)(function () {
+    var _Object$keys;
+
     var key = filterValue.current;
-    var value = form.values[key];
-    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value));
+    var value = form.values[key]; // 删除旧值
+
+    (_Object$keys = Object.keys(form.values)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(function (item) {
+      if (item !== key) {
+        form.setValuesIn(item, undefined);
+      }
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(_defineProperty({}, key, value), value, key);
   }, [onChange]);
   var LightSchema = (0, _react.useMemo)(function () {
     return [{
       component: 'LightFilter',
       props: {
         defaultFilterValue: defaultFilterValue,
+        filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
           onClick: onFilter

package/lib/form/Filter/SimpleFilter.js

@@ -103,7 +103,7 @@ var SimpleFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
     }
-  }, [searchName, searchValue.current]);
+  }, [onChange, searchName, searchValue.current]);
   (0, _react.useEffect)(function () {
     var _props$form$initialVa, _props$form$initialVa2;
 

package/lib/form/Filter/index.js

@@ -45,7 +45,7 @@ var _useSpecialProps2 = _interopRequireDefault(require("./useSpecialProps"));
 
 require("./index.scss");
 
-var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "purePanel", "expand", "formRef", "defaultFilterValue", "filterValues", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand", "onChange"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -98,11 +98,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       expand = props.expand,
       formRef = props.formRef,
       defaultFilterValue = props.defaultFilterValue,
+      filterValues = props.filterValues,
       filterDebounce = props.filterDebounce,
       onFilter = props.onFilter,
       onInit = props.onInit,
       onReset = props.onReset,
       onExpand = props.onExpand,
+      onChange = props.onChange,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var _useSpecialProps = (0, _useSpecialProps2.default)(props),
@@ -188,6 +190,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       if (!formRef.current.updateTags) {
         formRef.current.updateTags = function () {
           configFilterItem(form);
+          configTag();
         };
       }
     }
@@ -363,7 +366,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x) {
       return _ref4.apply(this, arguments);
     };
-  }(), [onFilter, hasRequired, onInit]); // 轻量搜索Filter
+  }(), [onFilter, hasRequired, onInit]); // 简单搜索Change
+
+  var onSimpleChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'simple') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 轻量搜索Filter
 
   var onLightFilter = (0, _react.useCallback)(function (values) {
     if (currentForm.current === 'light') {
@@ -381,7 +390,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
         configTag();
       }
     }
-  }, [onFilter]); // 高级搜索Filter by Submit
+  }, [onFilter]); // 轻量搜索Change
+
+  var onLightChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'light') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 高级搜索Filter
 
   var onAdvancedFilter = (0, _react.useCallback)(function (values) {
     setCurrentForm('advanced');
@@ -401,9 +416,9 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     lightForm.reset('*', {
       forceClear: true
     });
-  }, [onReset]); // 高级搜索Filter by Change
+  }, [onReset]); // 高级搜索Init
 
-  var onAdvancedChange = (0, _react.useCallback)( /*#__PURE__*/function () {
+  var onAdvancedInit = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(values) {
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
@@ -448,7 +463,13 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [hasRequired, onInit]); // 关闭标签清空表单字段值
+  }(), [hasRequired, onInit]); // 高级搜索Change
+
+  var onAdvancedChange = (0, _react.useCallback)(function (values, fieldValue, fieldName) {
+    if (currentForm.current === 'advanced') {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, fieldValue, fieldName);
+    }
+  }, [onChange]); // 关闭标签清空表单字段值
 
   var onTagClose = (0, _react.useCallback)(function (key, index) {
     var newValue = undefined;
@@ -468,7 +489,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     form.setState({
       loading: false
     });
-  }, []); // 组件挂载
+  }, []);
+  var debounceFun = (0, _lodash.default)(function (fun, props) {
+    return fun(props);
+  }, filterDebounce); // 组件挂载
 
   (0, _react.useEffect)(function () {
     setCurrentForm(currentForm.current);
@@ -484,20 +508,30 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       className: (0, _classnames.default)("".concat(prefixCls, "-inline"), purePanel || hasRequired ? "".concat(prefixCls, "-inline-hidden") : '')
     }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       defaultFilterValue: defaultFilterValue,
+      filterValues: filterValues,
       activeFilterValueRef: activeFilterValueRef,
       form: lightForm,
-      onChange: (0, _lodash.default)(onLightFilter, filterDebounce)
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onLightFilter, values);
+        onLightChange(values, fieldValue, fieldName);
+      }
     }))) : /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-inline")
     }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: simpleForm,
-      onChange: (0, _lodash.default)(onSimpleFilter, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onSimpleFilter, values);
+        onSimpleChange(values, fieldValue, fieldName);
+      },
       onSubmit: onSimpleFilter,
       onInitialComplete: onInitialComplete
     }))),
     panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
       form: advancedForm,
-      onChange: (0, _lodash.default)(onAdvancedChange, filterDebounce),
+      onChange: function onChange(values, fieldValue, fieldName) {
+        debounceFun(onAdvancedInit, values);
+        onAdvancedChange(values, fieldValue, fieldName);
+      },
       onSubmit: onAdvancedFilter,
       onReset: onAdvancedReset,
       onInitialComplete: onInitialComplete

package/lib/form/SchemaForm/adapterDecorator.js

@@ -26,7 +26,7 @@ var _default = function _default(decorator, component) {
     return decorator;
   }
 
-  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
+  if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap.default)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
     return 'FormItem';
   }
 

package/lib/form/SchemaForm/adapterType.js

@@ -54,11 +54,8 @@ var typeMap = (_typeMap = {
   Range: 'string',
   Search: 'array',
   SelectGroup: 'array',
-  ArrayCollapse: 'array',
-  ArrayCards: 'array',
-  ArrayTable: 'array',
-  ArrayItems: 'array'
-}, _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
+  SelectTable: 'array'
+}, _defineProperty(_typeMap, 'SelectTable.Column', 'string'), _defineProperty(_typeMap, "ArrayCollapse", 'array'), _defineProperty(_typeMap, "ArrayCards", 'array'), _defineProperty(_typeMap, "ArrayTable", 'array'), _defineProperty(_typeMap, "ArrayItems", 'array'), _defineProperty(_typeMap, 'Editable.Popover', 'object'), _defineProperty(_typeMap, 'Editable.Dialog', 'object'), _defineProperty(_typeMap, 'Editable.Drawer', 'object'), _typeMap);
 
 var _default = function _default(type, component) {
   return type || typeMap[component] || 'void';

package/lib/form/SchemaForm/index.js

@@ -57,12 +57,16 @@ var _initializeFormTab = _interopRequireDefault(require("./initializeFormTab"));
 
 var _initializeFormCollapse = _interopRequireDefault(require("./initializeFormCollapse"));
 
+var _initializeSelectTable = _interopRequireDefault(require("./initializeSelectTable"));
+
 var _reactions = require("./reactions");
 
 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"];
@@ -107,10 +111,16 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  // 创建 SchemaField
+
+  // 获取全局配置
+  var _ref2 = (0, _utils2.getGlobalConfig)('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope; // 创建 SchemaField
+
+
   var SchemaField = (0, _react.useMemo)(function () {
     return (0, _react2.createSchemaField)({
-      components: _objectSpread(_objectSpread({}, _ProField.default), {}, {
+      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), _ProField.default), {}, {
         FormLayout: _formily.FormLayout,
         FormItem: _formily.FormItem,
         ArrayCollapse: _formily.ArrayCollapse,
@@ -133,6 +143,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         EditablePopover: _Editable.EditablePopover,
         FormGroup: _FormGroup.default,
         Upload: _formily.Upload,
+        SelectTable: _formily.SelectTable,
         Affix: _components.Affix,
         LightFilter: _LightFilter.default,
         Text: _index.default
@@ -141,7 +152,7 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
   }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = (0, _react.useMemo)(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
+    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
       $request: _reactions.$request,
       $common: _reactions.$common,
       $dataSource: _reactions.$dataSource,
@@ -210,6 +221,11 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
         if (['FormCollapse'].includes(originalComponent)) {
           newItem = (0, _initializeFormCollapse.default)(newItem);
+        } // 初始化选择表格 - SelectTable
+
+
+        if (['SelectTable'].includes(originalComponent)) {
+          newItem = (0, _initializeSelectTable.default)(newItem);
         }
       }
 
@@ -260,10 +276,10 @@ 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 (_ref2) {
-        var _ref3 = _slicedToArray(_ref2, 2),
-            k = _ref3[0],
-            v = _ref3[1];
+      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+            k = _ref4[0],
+            v = _ref4[1];
 
         mergedScope[k] = v;
       });

package/lib/form/SchemaForm/initializeSelectTable.d.ts

@@ -0,0 +1,3 @@
+import type { ProFormInitializeItem } from '../typing';
+declare const initialize: ProFormInitializeItem;
+export default initialize;

package/lib/form/SchemaForm/initializeSelectTable.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _excluded = ["name", "title", "children"];
+
+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; }
+
+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; }
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+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 initializeTableColumn = function initializeTableColumn(item) {
+  var name = item.name,
+      title = item.title,
+      children = item.children,
+      otherProps = _objectWithoutProperties(item, _excluded);
+
+  return {
+    name: name,
+    title: title,
+    component: 'SelectTable.Column',
+    children: children,
+    props: _objectSpread({}, otherProps)
+  };
+};
+
+var initialize = function initialize(item) {
+  var _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    children: children.map(function (item) {
+      return initializeTableColumn(item);
+    })
+  });
+};
+
+var _default = initialize;
+exports.default = _default;

package/lib/form/SchemaForm/reactions.js

@@ -19,6 +19,7 @@ var $request = function $request(field, requestConfig, context, type) {
 
   var params = requestConfig.params,
       beforeRequest = requestConfig.beforeRequest,
+      formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
   /**
@@ -33,6 +34,9 @@ var $request = function $request(field, requestConfig, context, type) {
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
+    formatResult: (0, _utils.isFn)(formatResult) ? function (res) {
+      return formatResult(res, field, context);
+    } : formatResult,
     onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
@@ -74,9 +78,6 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
     field.setState({
       loading: true
     });
-    field.setComponentProps({
-      readOnly: true
-    });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var _requestConfig$onComp3;
 
@@ -88,17 +89,11 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
         dataSource: res,
         loading: false
       }, clearValue));
-      field.setComponentProps({
-        readOnly: false
-      });
       return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({
         loading: false
       });
-      field.setComponentProps({
-        readOnly: false
-      });
     });
   };
 };

package/lib/form/typing.d.ts

@@ -14,12 +14,13 @@ export interface ProFormInitializeItem {
  * ProForm 实例类型
  */
 export declare type ProFormType = FormType;
-declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup' | 'SelectTable' | 'SelectTable.Column';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
 export interface ProFormRequestConfig extends CommonRequestConfig {
     beforeRequest?: (field?: any, context?: any) => any;
+    formatResult?: (res?: any, field?: any, context?: any) => any;
     onSuccess?: (res?: any, field?: any, context?: any) => any;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
@@ -72,6 +73,7 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    filterValues?: string[];
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
@@ -106,6 +108,8 @@ export interface QueryFilterProps extends ProFormProps {
     addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 顶部筛选区筛选项配置 */
+    filterValues?: string[];
     /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */

package/lib/form/utils.js

@@ -86,9 +86,16 @@ var mapStatus = function mapStatus(props, field) {
     return state;
   };
 
-  return _objectSpread(_objectSpread({}, props), {}, {
-    state: takeState(props.state) || takeStatus()
-  });
+  var state = takeState(props.state) || takeStatus();
+  var result = {
+    state: state
+  }; // 当组件处于loading状态时，仅可读不可写。
+
+  if (state === 'loading') {
+    result.readOnly = true;
+  }
+
+  return _objectSpread(_objectSpread({}, props), result);
 };
 
 exports.mapStatus = mapStatus;
@@ -108,7 +115,7 @@ var patchDataSource = function patchDataSource() {
     return result;
   };
 
-  return dataSource.map(removeEmptyChildren);
+  return (0, _utils.isArr)(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
 
 var mapDataSource = function mapDataSource(props, field) {

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.2";
+declare const version = "1.3.3";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, 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.3.2';
+var version = '1.3.3';
 exports.version = version;

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

@@ -1,3 +1,6 @@
+$item-padding-bottom: -8px;
+// /** 消除 baseInfo 被其他组件包裹后没有居中的问题*/
 .teamix-pro-info {
   width: 100%;
+  margin-bottom: $item-padding-bottom;
 }

package/lib/page-header/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
-import { LinkPath, ProTagItem } from '@teamix/utils';
+import { LinkPath, ProTagItem, CapsuleTabType } from '@teamix/utils';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -48,6 +48,8 @@ export declare type ProPageHeaderProps = {
     data?: ProPageHeaderDataItem[];
     /** 底部详情 */
     info?: ProInfoProps | React.ReactNode;
+    /** 切换 tabs */
+    tabs?: CapsuleTabType;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
 declare const ProPageHeader: React.FC<ProPageHeaderProps>;
 export default ProPageHeader;

package/lib/page-header/index.js

@@ -27,7 +27,7 @@ require("./index.scss");
 
 var _excluded = ["text", "children"],
     _excluded2 = ["color", "title", "num", "className"],
-    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -142,6 +142,14 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
+var renderTabs = function renderTabs(tabs) {
+  if (tabs) {
+    return /*#__PURE__*/_react.default.createElement(_utils.CapsuleTab, _objectSpread({}, tabs));
+  }
+
+  return null;
+};
+
 var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
@@ -162,6 +170,7 @@ var ProPageHeader = function ProPageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
+      tabs = props.tabs,
       others = _objectWithoutProperties(props, _excluded3);
 
   var history = (0, _reactRouterDom.useHistory)();
@@ -210,7 +219,7 @@ var ProPageHeader = function ProPageHeader(props) {
       size: "large"
     }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon)), /*#__PURE__*/_react.default.createElement("span", {
       className: cls('title-name')
-    }, title), (0, _utils.renderTags)(tags, 'large'));
+    }, title), (0, _utils.renderTags)(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/_react.default.createElement("header", _objectSpread({

package/lib/table/components/ToolBar/index.scss

@@ -27,7 +27,7 @@
       line-height: var(--checkbox-size,16px);
     }
   }
-  &-reset {
+  &-reset.next-btn {
     position: absolute;
     right: 0px;
     top: 6px;

package/lib/table/index.scss

@@ -124,4 +124,14 @@ $fullscreenPadding: 24px;
   .next-form-preview.next-form-preview {
     line-height: unset;
   }
+  &-row {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-color);
+    }
+  }
+  &-row.hovered {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-hover-color);
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -22,9 +22,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.8",
-    "@formily/react": "2.0.8",
-    "@teamix/formily": "2.0.8",
+    "@formily/core": "2.0.11",
+    "@formily/react": "2.0.11",
+    "@teamix/formily": "2.0.11",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",