@teamix/pro 1.3.14 → 1.3.15

package/lib/form/SchemaForm/reactions.js

@@ -7,7 +7,7 @@ exports.$validator = exports.$request = exports.$dataSource = exports.$common =
 
 var _utils = require("@teamix/utils");
 
-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; }
 
@@ -20,24 +20,23 @@ 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; }
 
 // 配置请求
-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 = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
-  /**
-   * 主动触发的请求刷新
-   */
-  // 触发所有配置的请求
+  var beforeRequestResult = (0, _utils.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 = (0, _utils.isPlainObj)(refresh) ? refresh : {};
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {}; // 执行通用数据请求
+
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
@@ -55,12 +54,12 @@ var $request = function $request(field, _ref, context, type) {
 
 exports.$request = $request;
 
-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);
     });
   };
 }; // 配置校验
@@ -68,13 +67,15 @@ var $common = function $common(services, requestConfig, context) {
 
 exports.$common = $common;
 
-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
@@ -82,13 +83,13 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-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 = (0, _utils.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 ? {
@@ -98,7 +99,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/lib/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;
@@ -64,7 +68,7 @@ export interface ProFormProps extends IFormLayoutProps {
     };
     children?: React.ReactNode;
     initialValues?: AnyObject;
-    initialRequest?: ProFormRequestConfig;
+    initialRequest?: ProFormCommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
     onChangeType?: 'form';
@@ -121,7 +125,7 @@ export interface QueryFilterProps extends ProFormProps {
     /** onChange事件的防抖时间 */
     filterDebounce?: number;
     /** 表单初始化（含异步默认值）后回调函数 */
-    onInit?: (values: any) => boolean;
+    onInit?: (values: any) => void;
     /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
     /** 表单重置回调函数 */

package/lib/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/lib/form/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.getFieldName = void 0;
+exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.mapMode = exports.mapDataSource = exports.initializeRequestExpression = exports.getFieldName = void 0;
 
 var _core = require("@formily/core");
 
@@ -13,8 +13,14 @@ var _utils = require("@teamix/utils");
 
 var _schemaNameMap = _interopRequireDefault(require("./schemaNameMap"));
 
+var _excluded = ["customRequest"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+
 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."); }
@@ -201,5 +207,44 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
 
   return [].concat(_toConsumableArray(arr), [v]);
 };
+/**
+ * 初始化请求配置为表达式
+ * @param config 请求配置
+ * @param suffix scope名称后缀
+ * @returns 表达式和scope上下文
+ */
+
+
+exports.mergeArrayValue = mergeArrayValue;
+
+var initializeRequestExpression = function initializeRequestExpression(config, mode, suffix) {
+  var schema = {};
+
+  if ((0, _utils.isPlainObj)(config)) {
+    var customRequest = config.customRequest,
+        requestConfig = _objectWithoutProperties(config, _excluded);
+
+    var requestConfigName = "$requestConfig_".concat(suffix);
+
+    if ((0, _utils.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;
+};
 
-exports.mergeArrayValue = mergeArrayValue;
+exports.initializeRequestExpression = initializeRequestExpression;

package/lib/index.d.ts

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

package/lib/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",