@teamix/pro 1.2.20 → 1.2.24

package/es/form/SchemaForm/index.js

@@ -55,8 +55,9 @@ import initializeFormGroup from './initializeFormGroup';
 import initializeFormStep from './initializeFormStep';
 import initializeFormTab from './initializeFormTab';
 import initializeFormCollapse from './initializeFormCollapse';
+import { $request, $common, $dataSource, $validator } from './reactions';
 import fieldTypeMap from '../fieldTypeMap';
-import { getRandomName, mapSchemaName } from '../utils';
+import { getFieldName, mapSchemaName } from '../utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
@@ -96,12 +97,17 @@ export default /*#__PURE__*/memo(function (_ref) {
   }, []); // 合并 schema 中 request 的 scope
 
   var mergedScope = useMemo(function () {
-    return _objectSpread({}, scope);
+    return _objectSpread(_objectSpread({}, scope), {}, {
+      $request: $request,
+      $common: $common,
+      $dataSource: $dataSource,
+      $validator: $validator
+    });
   }, [scope]); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
     var schemaProperties = {};
-    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item, index) {
       var newItem = warning(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -165,7 +171,7 @@ export default /*#__PURE__*/memo(function (_ref) {
           component = _newItem2.component,
           type = _newItem2.type,
           _newItem2$name = _newItem2.name,
-          name = _newItem2$name === void 0 ? getRandomName(component === null || component === void 0 ? void 0 : component.replace(/\./g, '')) : _newItem2$name,
+          name = _newItem2$name === void 0 ? getFieldName(component === null || component === void 0 ? void 0 : component.replace(/\./g, ''), index) : _newItem2$name,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -190,18 +196,18 @@ export default /*#__PURE__*/memo(function (_ref) {
       var defaultDecoratorProps = _objectSpread(_objectSpread({}, tooltipProps), decoratorProps); // 初始化request
 
 
-      var _initializeRequest = initializeRequest(request),
+      var _initializeRequest = initializeRequest(request, index),
           requestReactions = _initializeRequest.reactions,
           requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = initializeDataSource(dataSource),
+      var _initializeDataSource = initializeDataSource(dataSource, index),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules
 
 
-      var _initializeRules = initializeRules(rules),
+      var _initializeRules = initializeRules(rules, index),
           defaultRules = _initializeRules.rules,
           rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 
@@ -239,15 +245,15 @@ export default /*#__PURE__*/memo(function (_ref) {
     });
     return schemaProperties;
   }, [mergedScope]);
-  var proFormSchema = useMemo(function () {
+  var formilySchema = useMemo(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(proFormSchema);
+  }, [schema]); // console.log(formilySchema);
 
   return /*#__PURE__*/React.createElement(SchemaField, {
-    schema: proFormSchema,
+    schema: formilySchema,
     components: components,
     scope: mergedScope
   });

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

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

package/es/form/SchemaForm/initializeDataSource.js

@@ -1,19 +1,14 @@
 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 { $request, $dataSource } from './reactions';
-import { getRandomName } from '../utils';
 
-var initializeDataSource = function initializeDataSource(dataSource) {
+var initializeDataSource = function initializeDataSource(dataSource, index) {
   if (isPlainObj(dataSource)) {
-    var _scope;
-
     var requestConfig = dataSource;
-    var requestScopeName = getRandomName('$request');
-    var dataSourceScopeName = getRandomName('$dataSource');
+    var requestConfigName = "$requestConfig_".concat(index);
     return {
-      reactions: ["{{".concat(dataSourceScopeName, "(").concat(requestScopeName, ",").concat(requestConfig.onComplete, ",context)}}")],
-      scope: (_scope = {}, _defineProperty(_scope, requestScopeName, $request(requestConfig)), _defineProperty(_scope, dataSourceScopeName, $dataSource), _scope)
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
+      scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }
 

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

@@ -1,6 +1,6 @@
-import type { ProFormRequestConfig } from '../';
+import type { ProFormRequestConfig } from '../typing';
 interface IInitializeRequest {
-    (requestConfig?: ProFormRequestConfig): {
+    (requestConfig?: ProFormRequestConfig, index?: number): {
         reactions: any[];
         scope: {
             [x: string]: any;

package/es/form/SchemaForm/initializeRequest.js

@@ -1,17 +1,11 @@
 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 { $request, $context } from '../SchemaForm/reactions';
-import { getRandomName } from '../utils';
-
-var initializeRequest = function initializeRequest(requestConfig) {
+var initializeRequest = function initializeRequest(requestConfig, index) {
   if (requestConfig) {
-    var _scope;
-
-    var requestScopeName = getRandomName('$request');
-    var contextScopeName = getRandomName('$context');
+    var requestConfigName = "$requestConfig_".concat(index);
     return {
-      reactions: ["{{".concat(contextScopeName, "(").concat(requestScopeName, ",").concat(requestConfig.onComplete, ",context)}}")],
-      scope: (_scope = {}, _defineProperty(_scope, requestScopeName, $request(requestConfig)), _defineProperty(_scope, contextScopeName, $context), _scope)
+      reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
+      scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }
 

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

@@ -1,5 +1,11 @@
 interface IInitializeRules {
-    (rules?: any): any;
+    (rules?: any, index?: number): {
+        rules?: any;
+        reactions: any[];
+        scope: {
+            [x: string]: any;
+        };
+    };
 }
 declare const initializeRules: IInitializeRules;
 export default initializeRules;

package/es/form/SchemaForm/initializeRules.js

@@ -17,23 +17,19 @@ 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';
-import { $request } from '../SchemaForm/reactions';
-import { getRandomName } from '../utils';
-import { $validator } from './reactions';
 
-var initializeRules = function initializeRules(rules) {
+var initializeRules = function initializeRules(rules, index) {
   var initializeValidator = function initializeValidator(rule) {
-    if (isPlainObj(rule === null || rule === void 0 ? void 0 : rule.validator)) {
-      var _scope;
+    var subIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
 
-      var validator = rule.validator;
-      var requestScopeName = getRandomName('$request');
-      var validatorScopeName = getRandomName('$validator');
+    if (isPlainObj(rule === null || rule === void 0 ? void 0 : rule.validator)) {
+      var requestConfig = rule.validator;
+      var requestConfigName = "$requestConfig_".concat(index, "_").concat(subIndex);
       return {
         rules: _objectSpread(_objectSpread({}, rule), {}, {
-          validator: "{{".concat(validatorScopeName, "(").concat(requestScopeName, ",").concat(validator.onComplete, ",context)}}")
+          validator: "{{$validator($request,".concat(requestConfigName, ",context)}}")
         }),
-        scope: (_scope = {}, _defineProperty(_scope, requestScopeName, $request(validator)), _defineProperty(_scope, validatorScopeName, $validator), _scope)
+        scope: _defineProperty({}, requestConfigName, requestConfig)
       };
     }
 
@@ -44,8 +40,8 @@ var initializeRules = function initializeRules(rules) {
   };
 
   if (isArr(rules)) {
-    return rules.reduce(function (prev, current) {
-      var result = initializeValidator(current);
+    return rules.reduce(function (prev, current, subIndex) {
+      var result = initializeValidator(current, subIndex);
       prev.rules = [].concat(_toConsumableArray(prev.rules), [result.rules]);
       prev.scope = _objectSpread(_objectSpread({}, prev.scope), result.scope);
       return prev;

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

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

package/es/form/SchemaForm/reactions.js

@@ -6,54 +6,52 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-var $request = function $request(requestConfig) {
-  return function (field, context) {
-    var _field$data;
+var $request = function $request(field, requestConfig, context) {
+  var _field$data;
 
-    var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-    var beforeRequest = requestConfig.beforeRequest,
-        onSuccess = requestConfig.onSuccess;
-    var refreshResult = isPlainObj(refresh) ? refresh : {};
-    var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
-    return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
-      params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
-      beforeRequest: function beforeRequest() {
-        return beforeRequestResult;
-      },
-      onSuccess: isFn(onSuccess) ? function (res) {
-        return onSuccess(res, field, context);
-      } : onSuccess
-    }), context);
-  };
-}; // 配置上下文
+  var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
+  var beforeRequest = requestConfig.beforeRequest,
+      onSuccess = requestConfig.onSuccess;
+  var refreshResult = isPlainObj(refresh) ? refresh : {};
+  var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
+  return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
+    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    beforeRequest: function beforeRequest() {
+      return beforeRequestResult;
+    },
+    onSuccess: isFn(onSuccess) ? function (res) {
+      return onSuccess(res, field, context);
+    } : onSuccess
+  }), context);
+}; // 通用请求配置上下文
 
 
-var $context = function $context(services, onComplete, context) {
+var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, context).then(function (res) {
-      return onComplete && onComplete(res, field, context);
+    return services(field, requestConfig, context).then(function (res) {
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
 }; // 配置校验
 
 
-var $validator = function $validator(services, onComplete, context) {
+var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field, context).then(function (res) {
-      return onComplete && onComplete(res, field, context);
+    return services(field, requestConfig, context).then(function (res) {
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, onComplete, context) {
+var $dataSource = function $dataSource(services, requestConfig, context) {
   return function (field) {
     field.setState({
       loading: true,
       readOnly: true
     });
-    return services(field, context).then(function (res) {
+    return services(field, requestConfig, context).then(function (res) {
       var isValueInDataSource = getValueByValue(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
@@ -63,7 +61,7 @@ var $dataSource = function $dataSource(services, onComplete, context) {
         loading: false,
         readOnly: false
       }, clearValue));
-      return onComplete && onComplete(res, field, context);
+      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     }).catch(function () {
       field.setState({
         loading: false,
@@ -73,4 +71,4 @@ var $dataSource = function $dataSource(services, onComplete, context) {
   };
 };
 
-export { $request, $context, $dataSource, $validator };
+export { $request, $common, $dataSource, $validator };

package/es/form/global.scss

@@ -1,6 +1,7 @@
 @import '~@alicloudfe/components/lib/common-var.scss';
 
 $form-item-cls: #{$css-prefix}formily-item;
+$form-array: #{$css-prefix}formily-array;
 $teamix-pro-form: teamix-pro-form;
 $teamix-pro-field: teamix-pro-field;
 

package/es/form/typing.d.ts

@@ -60,7 +60,7 @@ export interface ProFormProps extends IFormLayoutProps {
     initialValues?: AnyObject;
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, fieldValue?: any, fieldName?: string) => any;
+    onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
@@ -75,14 +75,23 @@ export interface QueryFilterProps extends ProFormProps {
      * @deprecated triggerType已弃用
      */
     triggerType?: 'keydown' | 'change' | 'submit';
+    /** 表单展示形式 */
     mode?: 'inline' | 'panel';
+    /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
+    /** 顶部筛选区后缀 */
     addonAfter?: ReactNode;
+    /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
+    /** 表单初始化（含异步默认值）后回调函数 */
     onInit?: (values: any) => boolean;
+    /** 表单筛选回调函数 */
     onFilter?: (values: any) => void;
+    /** 表单重置回调函数 */
     onReset?: (payload?: any) => void;
 }
 /**

package/es/form/utils.d.ts

@@ -15,14 +15,15 @@ declare const mapStatus: (props: any, field: any) => any;
 declare const mapDataSource: (props: any, field: any) => any;
 declare const mapMode: (props: any, field: any) => any;
 /**
- * 为未配置name的字段添加随机字段名称
- * @param prefix 随机字段名称前缀，默认为name
- * @returns 随机字段名称
+ * 创建字段名称
+ * @param prefix 字段名称前缀，接收字段component名称，默认为FieldName
+ * @param index 字段索引
+ * @returns 字段唯一名称
  */
-interface IGetRandomName {
-    (prefix?: string): string;
+interface IGetFieldName {
+    (prefix: string, index?: number): string;
 }
-declare const getRandomName: IGetRandomName;
+declare const getFieldName: IGetFieldName;
 /**
  * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
  * @param obj
@@ -36,4 +37,4 @@ declare const mapSchemaName: (obj: any) => any;
  * @returns 合并数组或合并其他值
  */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getRandomName, mapSchemaName, };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName, };

package/es/form/utils.js

@@ -113,9 +113,10 @@ var mapMode = function mapMode(props, field) {
   });
 };
 
-var getRandomName = function getRandomName() {
-  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
-  return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
+var getFieldName = function getFieldName() {
+  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'FieldName';
+  var index = arguments.length > 1 ? arguments[1] : undefined;
+  return "".concat(prefix, "-").concat(index);
 };
 /**
  * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
@@ -168,4 +169,4 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   return [].concat(_toConsumableArray(arr), [v]);
 };
 
-export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getRandomName, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getFieldName, mapSchemaName };

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.2.19";
+declare const version = "1.2.24";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -27,7 +27,7 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table'; // export * from './sidebar';
 
-var version = '1.2.19';
+var version = '1.2.24';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 hooks, nocode, templates, utils };

package/es/table/components/Filter/index.js

@@ -24,6 +24,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+// 表格项列筛选
 import React, { useEffect, useMemo, useState } from 'react';
 import TeamixIcon from '@teamix/icon';
 import { Button, Dropdown, Menu } from '@alicloudfe/components';

package/es/table/components/Layout/index.js

@@ -24,7 +24,7 @@ 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; }
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, isValidElement } from 'react';
 import { Header, baseClass } from '@teamix/utils';
 import { Button, Badge } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
@@ -48,7 +48,7 @@ var Layout = function Layout(props) {
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded);
 
-  var mode = (dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode) || 'inline';
+  var mode = dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.mode;
 
   var _useState = useState((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.expand) || false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -107,17 +107,27 @@ var Layout = function Layout(props) {
 
 
   var renderPanelFilter = function renderPanelFilter() {
-    var _dataFilter$schema2;
+    if (dataFilter) {
+      var _dataFilter$schema2;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: cls('panel-filter'),
-        style: {
-          display: expand ? 'block' : 'none'
-        }
-      }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread({
-        form: dataFilterForm
-      }, dataFilter)));
+      if ( /*#__PURE__*/isValidElement(dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content)) {
+        // 自定义渲染内容，当 `schema=[]` 时生效
+        return /*#__PURE__*/React.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.content);
+      } else if ((dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: cls('panel-filter'),
+          style: {
+            display: expand ? 'block' : 'none'
+          }
+        }, /*#__PURE__*/React.createElement(AdvancedFilter, _objectSpread({
+          form: dataFilterForm
+        }, dataFilter)));
+      }
     }
   }; // 渲染过滤器按钮
 

package/es/table/components/Pagination/index.d.ts

@@ -1,3 +1,7 @@
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
-declare const _default: (props: PaginationProps) => JSX.Element;
+import { responsivePaginationType } from '../../typing';
+import './index.scss';
+declare const _default: (props: PaginationProps & {
+    responsivePaginationType?: responsivePaginationType;
+}) => JSX.Element;
 export default _default;