@teamix/pro 1.3.3 → 1.3.4

package/es/actions/dialog-form.js

@@ -1,5 +1,5 @@
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef", "extendParams"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -147,6 +147,7 @@ export function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
       propsFormRef = action.formRef,
+      propsExtendParams = action.extendParams,
       others = _objectWithoutProperties(action, _excluded2);
 
   var innerFormRef = /*#__PURE__*/createRef();
@@ -167,10 +168,12 @@ export function useDialogFormAction(action, context) {
         formRef: propsFormRef
       }, dialogFormProps));
     },
-    extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
+    extendParams: useFieldValuesForRequest ? ['{{fields}}', propsExtendParams] : propsExtendParams,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _innerFormRef$current;
+
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -206,7 +209,7 @@ export function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: innerFormRef.current.values
+                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -222,9 +225,9 @@ export function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _innerFormRef$current;
+      var _innerFormRef$current2;
 
-      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
   }, others), context);
 }

package/es/actions/dialog.js

@@ -32,7 +32,7 @@ import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
 import PopConfirm from '@teamix/pop-confirm';
-import { getTargetValue, uuid, getMessage } from '@teamix/utils';
+import { getTargetValue, getMessage } from '@teamix/utils';
 import ProForm, { createForm } from '../form';
 import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
@@ -210,9 +210,7 @@ export function useDialogAction(action, actionContext) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({
-      key: uuid()
-    }, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({}, addContext(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/React.createElement(React.Fragment, null, beforeContent && /*#__PURE__*/React.createElement("div", {
       className: "teamix-pro-dialog-before-content"

package/es/form/ProForm/useFormDisplayValues.js

@@ -12,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useForm } from '@formily/react';
 import { toJS } from '@formily/reactive';
-import { isArr, isPlainObj, isSignificative, getValueByValue } from '@teamix/utils';
+import { isArr, isPlainObj, isUsable, getValueByValue } from '@teamix/utils';
 import fieldTypeMap from '../fieldTypeMap';
 /**
  * 获取表单值的可显示值
@@ -44,7 +44,7 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var isFieldValue = Object.keys(fieldTypeMap).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
-  if (!isSignificative(values)) {
+  if (!isUsable(values)) {
     displayValues = {};
   } else if (isPlainObj(values) && !isFieldValue) {
     // 如果值是布局对象的值

package/es/form/SchemaForm/index.js

@@ -220,7 +220,8 @@ export default /*#__PURE__*/memo(function (_ref) {
       var _initializeDataSource = initializeDataSource(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 = initializeRules(rules, "".concat(suffix, "v")),
@@ -245,9 +246,9 @@ export default /*#__PURE__*/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/es/form/SchemaForm/initializeDataSource.d.ts

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

package/es/form/SchemaForm/initializeDataSource.js

@@ -4,11 +4,17 @@ import { isPlainObj } from '@teamix/utils';
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if (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/es/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/es/form/SchemaForm/reactions.js

@@ -1,14 +1,23 @@
+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; }
+
 import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-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,
@@ -48,8 +57,8 @@ var $common = function $common(services, requestConfig, context) {
 
 
 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;
 
@@ -65,16 +74,16 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
       loading: true
     });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
-      var _requestConfig$onComp3;
+      var _requestConfig$extraC, _requestConfig$onComp3;
 
       var isValueInDataSource = 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));
+      }, clearResult));
       return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({

package/es/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;
@@ -90,7 +91,7 @@ declare const formilyReact: {
     }>>;
     connect<T_2 extends originalFormilyReact.JSXComponent>(target: T_2, ...args: originalFormilyReact.IComponentMapper<T_2>[]): import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<Partial<import("react").ComponentProps<T_2>>> & import("react").RefAttributes<unknown>>;
     observer: typeof originalFormilyReact.observer;
-    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("@formily/reactive-react").IObserverProps>>;
+    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("_@formily_reactive-react@2.0.11@@formily/reactive-react").IObserverProps>>;
     useForm: <T_3 extends object = any>() => import("@formily/core").Form<T_3>;
     useField: <T_4 = import("@formily/core").GeneralField>() => T_4;
     useParentForm: () => import("@formily/core").Form<any> | import("@formily/core").ObjectField<any, any>;

package/es/form/typing.d.ts

@@ -23,6 +23,7 @@ export interface ProFormRequestConfig extends CommonRequestConfig {
     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;

package/es/form/utils.js

@@ -55,6 +55,8 @@ var mapSize = function mapSize(props, field) {
 
 
 var mapStatus = function mapStatus(props, field) {
+  var _field$data;
+
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
 
@@ -77,7 +79,7 @@ var mapStatus = function mapStatus(props, field) {
     state: state
   }; // 当组件处于loading状态时，仅可读不可写。
 
-  if (state === 'loading') {
+  if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
     result.readOnly = true;
   }
 

package/es/index.d.ts

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

package/es/index.js

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

package/lib/actions/dialog-form.js

@@ -23,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef", "extendParams"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -168,6 +168,7 @@ function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
       propsFormRef = action.formRef,
+      propsExtendParams = action.extendParams,
       others = _objectWithoutProperties(action, _excluded2);
 
   var innerFormRef = /*#__PURE__*/(0, _react.createRef)();
@@ -188,10 +189,12 @@ function useDialogFormAction(action, context) {
         formRef: propsFormRef
       }, dialogFormProps));
     },
-    extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
+    extendParams: useFieldValuesForRequest ? ['{{fields}}', propsExtendParams] : propsExtendParams,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _innerFormRef$current;
+
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -227,7 +230,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: innerFormRef.current.values
+                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -243,9 +246,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _innerFormRef$current;
+      var _innerFormRef$current2;
 
-      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
   }, others), context);
 }

package/lib/actions/dialog.js

@@ -236,9 +236,7 @@ function useDialogAction(action, actionContext) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
-      key: (0, _utils.uuid)()
-    }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"

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/index.js

@@ -266,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")),
@@ -291,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/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,16 +7,25 @@ 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,
@@ -60,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;
 
@@ -79,16 +88,16 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
       loading: 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));
+      }, clearResult));
       return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({

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;
@@ -90,7 +91,7 @@ declare const formilyReact: {
     }>>;
     connect<T_2 extends originalFormilyReact.JSXComponent>(target: T_2, ...args: originalFormilyReact.IComponentMapper<T_2>[]): import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<Partial<import("react").ComponentProps<T_2>>> & import("react").RefAttributes<unknown>>;
     observer: typeof originalFormilyReact.observer;
-    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("@formily/reactive-react").IObserverProps>>;
+    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("_@formily_reactive-react@2.0.11@@formily/reactive-react").IObserverProps>>;
     useForm: <T_3 extends object = any>() => import("@formily/core").Form<T_3>;
     useField: <T_4 = import("@formily/core").GeneralField>() => T_4;
     useParentForm: () => import("@formily/core").Form<any> | import("@formily/core").ObjectField<any, any>;

package/lib/form/typing.d.ts

@@ -23,6 +23,7 @@ export interface ProFormRequestConfig extends CommonRequestConfig {
     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;

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;
 
@@ -91,7 +93,7 @@ var mapStatus = function mapStatus(props, field) {
     state: state
   }; // 当组件处于loading状态时，仅可读不可写。
 
-  if (state === 'loading') {
+  if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
     result.readOnly = true;
   }
 

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.3";
+declare const version = "1.3.4";
 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.3';
+var version = '1.3.4';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",