@teamix/pro 1.3.2 → 1.3.5

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/ProForm/useFormDisplayValues.js

@@ -56,7 +56,7 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var isFieldValue = Object.keys(_fieldTypeMap.default).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
-  if (!(0, _utils.isSignificative)(values)) {
+  if (!(0, _utils.isUsable)(values)) {
     displayValues = {};
   } else if ((0, _utils.isPlainObj)(values) && !isFieldValue) {
     // 如果值是布局对象的值

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);
         }
       }
 
@@ -250,7 +266,8 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d")),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
-          dataSourceScope = _initializeDataSource.scope; // 初始化rules validator
+          dataSourceScope = _initializeDataSource.scope,
+          dataSourceData = _initializeDataSource.data; // 初始化rules validator
 
 
       var _initializeRules = (0, _initializeRules2.default)(rules, "".concat(suffix, "v")),
@@ -260,10 +277,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;
       });
@@ -275,9 +292,9 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
         rules: defaultRules,
         reactions: defaultReactions,
         dataSource: defaultDataSource,
-        data: data || {
-          placeholder: true
-        }
+        data: _objectSpread(_objectSpread(_objectSpread({}, data), dataSourceData), {}, {
+          __placeholder: true
+        })
       })); // 递归子组件
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {

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

@@ -6,6 +6,7 @@ interface IInitializeDataSource {
         scope: {
             [x: string]: any;
         };
+        data?: any;
     };
 }
 declare const initializeDataSource: IInitializeDataSource;

package/lib/form/SchemaForm/initializeDataSource.js

@@ -11,11 +11,17 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if ((0, _utils.isPlainObj)(dataSource)) {
+    var _requestConfig$extraC;
+
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
       reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig)
+      scope: _defineProperty({}, requestConfigName, requestConfig),
+      // dataSource请求时，默认配置字段为只读
+      data: {
+        readOnlyOnLoading: (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.readOnly) !== false
+      }
     };
   }
 

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.d.ts

@@ -1,5 +1,5 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
+declare const $request: (field: any, { extraConfig, ...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) => (field: any) => any;

package/lib/form/SchemaForm/reactions.js

@@ -7,18 +7,28 @@ exports.$validator = exports.$request = exports.$dataSource = exports.$common =
 
 var _utils = require("@teamix/utils");
 
+var _excluded = ["extraConfig"];
+
 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 $request = function $request(field, requestConfig, context, type) {
+var $request = function $request(field, _ref, context, type) {
   var _field$data;
 
+  var extraConfig = _ref.extraConfig,
+      requestConfig = _objectWithoutProperties(_ref, _excluded);
+
   var params = requestConfig.params,
       beforeRequest = requestConfig.beforeRequest,
+      formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
   /**
@@ -33,6 +43,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
@@ -56,8 +69,8 @@ var $common = function $common(services, requestConfig, context) {
 exports.$common = $common;
 
 var $validator = function $validator(services, requestConfig, context) {
-  return function (value, rules, _ref) {
-    var field = _ref.field;
+  return function (value, rules, _ref2) {
+    var field = _ref2.field;
     return services(field, requestConfig, context, 'validator').then(function (res) {
       var _requestConfig$onComp2;
 
@@ -74,31 +87,22 @@ 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;
+      var _requestConfig$extraC, _requestConfig$onComp3;
 
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
-      var clearValue = isValueInDataSource ? {} : {
+      var clearResult = !isValueInDataSource && (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.clearInvalidValue) !== false ? {
         value: undefined
-      };
+      } : {};
       field.setState(_objectSpread({
         dataSource: res,
         loading: false
-      }, clearValue));
-      field.setComponentProps({
-        readOnly: false
-      });
+      }, clearResult));
       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/docs/ActionResponse.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './ActionResponse.less';
+declare type ActionResponseProps = {
+    response?: React.ReactNode;
+};
+export declare const ActionResponse: React.FC<ActionResponseProps>;
+export {};

package/lib/form/docs/ActionResponse.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ActionResponse = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+require("./ActionResponse.less");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var ActionResponse = function ActionResponse(props) {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "as-wrapper"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "as-actions"
+  }, props.children), props.response && /*#__PURE__*/_react.default.createElement("div", {
+    className: "as-response"
+  }, "Response\uFF1A", props.response));
+};
+
+exports.ActionResponse = ActionResponse;

package/lib/form/docs/ActionResponse.less

@@ -0,0 +1,25 @@
+.as-wrapper {
+  .as-actions {
+    & button {
+      margin-right: 5px;
+      background-color: #fff;
+      border: 2px solid #d4bbbb;
+      border-radius: 6px;
+      outline: none;
+      padding: 8px 20px;
+      cursor: pointer;
+      transition: all 0.15s ease-in-out;
+      &:hover {
+        border: 2px solid #9db8f3;
+      }
+    }
+  }
+
+  .as-response {
+    border: 2px dashed #f0bdbd;
+    font-size: 14px;
+    border-radius: 6px;
+    padding: 8px 20px;
+    margin-top: 10px;
+  }
+}

package/lib/form/index.d.ts

@@ -31,6 +31,7 @@ declare const formilyReact: {
         displayName: string;
     };
     RecursionField: import("react").FC<originalFormilyReact.IRecursionFieldProps>;
+    ExpressionScope: import("react").FC<originalFormilyReact.IExpressionScopeProps>;
     createSchemaField<Components extends originalFormilyReact.SchemaReactComponents>(options?: originalFormilyReact.ISchemaFieldReactFactoryOptions<Components> | undefined): {
         <Decorator extends originalFormilyReact.JSXComponent, Component extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.ISchemaFieldProps<Decorator, Component, import("@formily/core").ObjectField<Decorator, Component>>): JSX.Element;
         displayName: string;

package/lib/form/typing.d.ts

@@ -14,14 +14,16 @@ 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;
+    extraConfig?: AnyObject;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -72,6 +74,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 +109,8 @@ export interface QueryFilterProps extends ProFormProps {
     addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 顶部筛选区筛选项配置 */
+    filterValues?: string[];
     /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */

package/lib/form/utils.js

@@ -69,6 +69,8 @@ var mapSize = function mapSize(props, field) {
 exports.mapSize = mapSize;
 
 var mapStatus = function mapStatus(props, field) {
+  var _field$data;
+
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
 
@@ -86,9 +88,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' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
+    result.readOnly = true;
+  }
+
+  return _objectSpread(_objectSpread({}, props), result);
 };
 
 exports.mapStatus = mapStatus;
@@ -108,7 +117,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

@@ -9,6 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
+import ProSidebar from './sidebar';
 import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
@@ -22,7 +23,8 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
+export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.2";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };
+declare const version = "1.3.5";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };