@teamix/pro 1.3.12 → 1.3.15

package/es/form/SchemaForm/index.js

@@ -32,13 +32,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
-import { Affix } from '@alicloudfe/components';
-import { Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
-import ProFieldComponents from '../Components/ProField';
-import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
-import FormGroup from '../Components/FormGroup';
-import LightFilter from '../Components/LightFilter';
-import Text from '../Components/Text/index';
 import adapterType from './adapterType';
 import adapterComponent from './adapterComponent';
 import adapterDecorator from './adapterDecorator';
@@ -64,39 +57,10 @@ export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  var schemaScopeRef = useRef({}); // 创建 SchemaField，添加内置组件
+  var schemaScopeRef = useRef({}); // 创建 SchemaField
 
   var SchemaField = useMemo(function () {
-    return createSchemaField({
-      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
-        FormLayout: FormLayout,
-        FormItem: FormItem,
-        ArrayCollapse: ArrayCollapse,
-        ArrayCards: ArrayCards,
-        ArrayItems: ArrayItems,
-        ArrayTable: ArrayTable,
-        Space: Space,
-        FormGrid: FormGrid,
-        FormTab: FormTab,
-        FormCollapse: FormCollapse,
-        FormStep: FormStep,
-        Editable: Editable,
-        FormDialogFooter: FormDialog.Footer,
-        FormDrawerFooter: FormDrawer.Footer,
-        FormButtonGroup: FormButtonGroup,
-        Submit: Submit,
-        Reset: Reset,
-        EditableDialog: EditableDialog,
-        EditableDrawer: EditableDrawer,
-        EditablePopover: EditablePopover,
-        FormGroup: FormGroup,
-        Upload: Upload,
-        SelectTable: SelectTable,
-        Affix: Affix,
-        LightFilter: LightFilter,
-        Text: Text
-      })
-    });
+    return createSchemaField();
   }, []); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {

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

@@ -1,6 +1,5 @@
-import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
+    (requestConfig: any, suffix: string): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/es/form/SchemaForm/initializeDataSource.js

@@ -1,27 +1,22 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { isPlainObj } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
-  if (isPlainObj(dataSource)) {
-    var _requestConfig$extraC;
+  var _dataSource$extraConf;
 
-    var requestConfig = dataSource;
-    var requestConfigName = "$requestConfig_".concat(suffix);
-    return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
-      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
-      }
-    };
-  }
+  var _initializeRequestExp = initializeRequestExpression(dataSource, '$dataSource', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
 
-  return {
-    dataSource: dataSource,
+  return expression ? {
+    reactions: [expression],
+    scope: scope,
+    data: {
+      readOnlyOnLoading: (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$extraConf = dataSource.extraConfig) === null || _dataSource$extraConf === void 0 ? void 0 : _dataSource$extraConf.readOnly) !== false
+    }
+  } : {
     reactions: [],
-    scope: {}
+    scope: {},
+    dataSource: dataSource
   };
 };
 

package/es/form/SchemaForm/initializeRequest.js

@@ -17,37 +17,36 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 import { isArr } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
 
-var initializeRequest = function initializeRequest(requestConfig, suffix) {
-  if (requestConfig) {
-    if (isArr(requestConfig)) {
-      var reactionsMap = [];
-      var scopeMap = {};
-      requestConfig.forEach(function (item, index) {
-        var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
-            reactions = _initializeRequest.reactions,
-            scope = _initializeRequest.scope;
-
-        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
-        scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
-      });
-      return {
-        reactions: reactionsMap,
-        scope: scopeMap
-      };
-    } else {
-      var requestConfigName = "$requestConfig_".concat(suffix);
-      return {
-        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
-  }
+var initializeItem = function initializeItem(request, suffix) {
+  var _initializeRequestExp = initializeRequestExpression(request, '$common', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
 
-  return {
+  return expression ? {
+    reactions: [expression],
+    scope: scope
+  } : {
     reactions: [],
     scope: {}
   };
 };
 
+var initializeRequest = function initializeRequest(request, suffix) {
+  if (isArr(request)) {
+    return request.reduce(function (prev, current, index) {
+      var result = initializeItem(current, "".concat(suffix, "_").concat(index));
+      prev.reactions = [].concat(_toConsumableArray(prev.reactions), _toConsumableArray(result.reactions));
+      prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
+      return prev;
+    }, {
+      reactions: [],
+      scope: {}
+    });
+  }
+
+  return initializeItem(request, suffix);
+};
+
 export default initializeRequest;

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

@@ -1,7 +1,7 @@
 interface IInitializeRules {
-    (rules?: any, suffix?: string): {
+    (rules: any, suffix: string): {
         rules?: any;
-        reactions: any[];
+        reactions?: any[];
         scope: {
             [x: string]: any;
         };

package/es/form/SchemaForm/initializeRules.js

@@ -1,3 +1,5 @@
+var _excluded = ["validator"];
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -16,32 +18,37 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { isArr, isPlainObj } from '@teamix/utils';
+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; }
 
-var initializeRules = function initializeRules(rules, suffix) {
-  var initializeValidator = function initializeValidator(rule) {
-    var index = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
-
-    if (isPlainObj(rule === null || rule === void 0 ? void 0 : rule.validator)) {
-      var requestConfig = rule.validator;
-      var requestConfigName = "$requestConfig_".concat(suffix).concat(index);
-      return {
-        rules: _objectSpread(_objectSpread({}, rule), {}, {
-          validator: "{{$validator($request,".concat(requestConfigName, ",context)}}")
-        }),
-        scope: _defineProperty({}, requestConfigName, requestConfig)
-      };
-    }
-
-    return {
-      rules: rule,
-      scope: {}
-    };
+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 { isArr } from '@teamix/utils';
+import { initializeRequestExpression } from '../utils';
+
+var initializeRule = function initializeRule(rule, suffix) {
+  var _ref = rule || {},
+      validator = _ref.validator,
+      rest = _objectWithoutProperties(_ref, _excluded);
+
+  var _initializeRequestExp = initializeRequestExpression(validator, '$validator', suffix),
+      expression = _initializeRequestExp.expression,
+      scope = _initializeRequestExp.scope;
+
+  return expression ? {
+    scope: scope,
+    rules: _objectSpread({
+      validator: expression
+    }, rest)
+  } : {
+    scope: {},
+    rules: rule
   };
+};
 
+var initializeRules = function initializeRules(rules, suffix) {
   if (isArr(rules)) {
-    return rules.reduce(function (prev, current, subIndex) {
-      var result = initializeValidator(current, subIndex);
+    return rules.reduce(function (prev, current, index) {
+      var result = initializeRule(current, "".concat(suffix, "_").concat(index));
       prev.rules = [].concat(_toConsumableArray(prev.rules), [result.rules]);
       prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
       return prev;
@@ -51,7 +58,7 @@ var initializeRules = function initializeRules(rules, suffix) {
     });
   }
 
-  return initializeValidator(rules);
+  return initializeRule(rules, suffix);
 };
 
 export default initializeRules;

package/es/form/SchemaForm/initializeSelectTable.js

@@ -1,4 +1,4 @@
-var _excluded = ["name", "title", "children"];
+var _excluded = ["name", "children", "props"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -10,25 +10,99 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import cls from 'classnames';
+import { usePrefixCls, isStr, isPlainObj, isArr } from '@teamix/utils';
+import pureGenProColumnToColumn from '../../table/utils/pureGenProColumnToColumn';
+/**
+ * 将可被 ProForm 识别的上下文转换为仅被 ProTable 识别的上下文
+ * @param value
+ * @returns
+ */
+
+var adapterContext = function adapterContext(value) {
+  if (isStr(value)) {
+    var contextReg = /^\{\{.*?\}\}$/;
+
+    if (contextReg.test(value)) {
+      return "\0".concat(value, "\0");
+    }
+
+    return value;
+  }
+
+  if (isPlainObj(value)) {
+    var temp = {};
+    Object.entries(value).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          val = _ref2[1];
+
+      temp[key] = adapterContext(val);
+    });
+    return temp;
+  }
+
+  if (isArr(value)) {
+    return value.map(function (item) {
+      return adapterContext(item);
+    });
+  }
+
+  return value;
+};
+
 var initializeTableColumn = function initializeTableColumn(item) {
   var name = item.name,
-      title = item.title,
       children = item.children,
+      props = item.props,
       otherProps = _objectWithoutProperties(item, _excluded);
 
   return {
     name: name,
-    title: title,
     component: 'SelectTable.Column',
-    children: children,
-    props: _objectSpread({}, otherProps)
+    children: children === null || children === void 0 ? void 0 : children.map(function (item) {
+      return initializeTableColumn(item);
+    }),
+    props: _objectSpread(_objectSpread({}, otherProps), props)
   };
 };
 
 var initialize = function initialize(item) {
+  var _props$columns;
+
   var _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children;
+      children = _item$children === void 0 ? [] : _item$children,
+      props = item.props;
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-select-table-column-tree'
+  });
+  var columns = props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (value, index) {
+    var column = adapterContext(value);
+
+    if ((props === null || props === void 0 ? void 0 : props.isTree) && index === 0) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        className: cls(column.className, prefixCls)
+      });
+    }
+
+    return column;
+  });
   return _objectSpread(_objectSpread({}, item), {}, {
+    props: _objectSpread(_objectSpread({}, props), {}, {
+      columns: columns && pureGenProColumnToColumn(columns)
+    }),
     children: children.map(function (item) {
       return initializeTableColumn(item);
     })

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

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

package/es/form/SchemaForm/reactions.js

@@ -1,4 +1,4 @@
-var _excluded = ["extraConfig"];
+var _excluded = ["extraConfig", "onComplete"];
 
 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; }
 
@@ -12,24 +12,23 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-var $request = function $request(field, _ref, context, type) {
+var $request = function $request(field, context, _ref, type) {
   var _field$data;
 
   var extraConfig = _ref.extraConfig,
-      requestConfig = _objectWithoutProperties(_ref, _excluded);
+      onComplete = _ref.onComplete,
+      rest = _objectWithoutProperties(_ref, _excluded);
 
+  var requestConfig = rest;
   var params = requestConfig.params,
       beforeRequest = requestConfig.beforeRequest,
       formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
-  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
-  /**
-   * 主动触发的请求刷新
-   */
-  // 触发所有配置的请求
+  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {}; // 通过字段 data 的 refresh 主动触发的请求刷新
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = isPlainObj(refresh) ? refresh : {};
+  var refreshResult = isPlainObj(refresh) ? refresh : {}; // 执行通用数据请求
+
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -45,36 +44,38 @@ var $request = function $request(field, _ref, context, type) {
 }; // 通用请求配置上下文
 
 
-var $common = function $common(services, requestConfig, context) {
+var $common = function $common(services, context, requestConfig) {
   return function (field) {
-    return services(field, requestConfig, context, 'request').then(function (res) {
+    return services(field, context, requestConfig, 'request').then(function (res) {
       var _requestConfig$onComp;
 
-      return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
+      return requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
 }; // 配置校验
 
 
-var $validator = function $validator(services, requestConfig, context) {
+var $validator = function $validator(services, context, requestConfig) {
   return function (value, rules, _ref2) {
     var field = _ref2.field;
-    return services(field, requestConfig, context, 'validator').then(function (res) {
-      var _requestConfig$onComp2;
-
-      return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
+    return services(field, context, requestConfig, 'validator').then(function (res) {
+      if (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.onComplete) {
+        return requestConfig.onComplete(res, field, context);
+      } else {
+        return res;
+      }
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, context, requestConfig) {
   return function (field) {
     field.setState({
       loading: true
     });
-    return services(field, requestConfig, context, 'dataSource').then(function (res) {
-      var _requestConfig$extraC, _requestConfig$onComp3;
+    return services(field, context, requestConfig, 'dataSource').then(function (res) {
+      var _requestConfig$extraC, _requestConfig$onComp2;
 
       var isValueInDataSource = getValueByValue(res, field.value);
       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 ? {
@@ -84,7 +85,7 @@ var $dataSource = function $dataSource(services, requestConfig, context) {
         dataSource: res,
         loading: false
       }, clearResult));
-      return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
+      return requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
     }).catch(function () {
       field.setState({
         loading: false

package/es/form/typing.d.ts

@@ -1,7 +1,7 @@
 import type { ReactNode } from 'react';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
-import { CommonRequestConfig } from '@teamix/utils';
+import type { CommonRequestConfig } from '@teamix/utils';
 import React from 'react';
 interface AnyObject {
     [propName: string]: any;
@@ -18,12 +18,16 @@ declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker'
 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 {
+export interface ProFormCommonRequestConfig 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;
+}
+export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, 'url'> {
+    url?: string;
+    customRequest?: (field?: any, context?: any) => Promise<any>;
     extraConfig?: AnyObject;
+    onComplete?: (res?: any, field?: any, context?: any) => any;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -56,7 +60,7 @@ export interface ProFormSchemaItem {
 export declare type ProFormSchema = ProFormSchemaItem[];
 export interface ProFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: ProFormSchema;
+    schema?: ProFormSchema;
     scope?: any;
     context?: any;
     components?: {
@@ -64,7 +68,7 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: ProFormRequestConfig;
+    initialRequest?: ProFormCommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
     onChangeType?: 'form';
@@ -73,6 +77,9 @@ export interface ProFormProps extends IFormLayoutProps {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
 }
+export declare type ComposedProForm = React.FC<ProFormProps> & {
+    Field?: React.FC<any>;
+};
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
@@ -118,7 +125,7 @@ export interface QueryFilterProps extends ProFormProps {
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
     /** 表单初始化（含异步默认值）后回调函数 */
-    onInit?: (values: any) => boolean;
+    onInit?: (values: any) => void;
     /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
     /** 表单重置回调函数 */

package/es/form/utils.d.ts

@@ -37,4 +37,11 @@ declare const mapSchemaName: (obj: any) => any;
  * @returns 合并数组或合并其他值
  */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+declare const initializeRequestExpression: (config?: any, mode?: string | undefined, suffix?: string | undefined) => any;
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression, };

package/es/form/utils.js

@@ -1,3 +1,9 @@
+var _excluded = ["customRequest"];
+
+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; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,7 +32,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isVoidField } from '@formily/core';
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
-import { isArr, isObj, getValueByValue } from '@teamix/utils';
+import { isArr, isObj, getValueByValue, isPlainObj, isFn } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
 /**
  * 映射字段size，主要是default转medium
@@ -177,5 +183,42 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 
   return [].concat(_toConsumableArray(arr), [v]);
 };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+
+
+var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
+  var schema = {};
+
+  if (isPlainObj(config)) {
+    var customRequest = config.customRequest,
+        requestConfig = _objectWithoutProperties(config, _excluded);
+
+    var requestConfigName = "$requestConfig_".concat(suffix);
+
+    if (isFn(customRequest)) {
+      var _scope;
+
+      // 自定义请求方法 customRequest
+      var customRequestName = "$customRequest_".concat(suffix);
+      schema = {
+        expression: "{{".concat(mode, "(").concat(customRequestName, ",context,").concat(requestConfigName, ")}}"),
+        scope: (_scope = {}, _defineProperty(_scope, customRequestName, customRequest), _defineProperty(_scope, requestConfigName, requestConfig), _scope)
+      };
+    } else {
+      // pro 通用数据请求 $request
+      schema = {
+        expression: "{{".concat(mode, "($request,context,").concat(requestConfigName, ")}}"),
+        scope: _defineProperty({}, requestConfigName, requestConfig)
+      };
+    }
+  }
+
+  return schema;
+};
 
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, initializeRequestExpression };

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.12";
+declare const version = "1.3.15";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.12';
+var version = '1.3.15';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

package/es/table/components/ToolBar/Fullscreen.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import './index.scss';
 import { ProTableActionType } from '../../typing';
 declare type ProTableFullScreenProps = {
-    children: React.ReactNode;
+    children: (isFullScreen: boolean) => React.ReactNode | React.ReactNode;
     visible: boolean;
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
 };