@teamix/pro 1.3.13 → 1.3.16

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
+var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 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,26 +12,59 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { memo, useMemo } from 'react';
 import cls from 'classnames';
+import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
 import { createForm, onFieldValueChange, onFormValuesChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
-import { Form } from '@teamix/formily';
-import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
+import { Form, Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
+import { Affix } from '@alicloudfe/components';
+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 SchemaForm from '../SchemaForm';
 import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
+import useFieldSchema from './useFieldSchema';
 import validateLocale from '../locales/validate';
 import './index.scss';
 registerValidateLocale(validateLocale);
+var formilyComponents = {
+  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
+};
 var ProForm = /*#__PURE__*/memo(function (_ref) {
   var outerForm = _ref.form,
       initialValues = _ref.initialValues,
       initialRequest = _ref.initialRequest,
-      schema = _ref.schema,
       scope = _ref.scope,
       context = _ref.context,
       components = _ref.components,
-      children = _ref.children,
       layout = _ref.layout,
       labelAlign = _ref.labelAlign,
       wrapperAlign = _ref.wrapperAlign,
@@ -66,9 +99,9 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }); // context需要实名不能解构
 
 
-  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+  var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
-  var onAutoSubmit = useAutoSubmit(onSubmit); // todo 需要formily支持断点下的属性更新
+  var onAutoSubmit = useAutoSubmit(onSubmit, context); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = useMemo(function () {
     return breakpoints ? {
@@ -87,12 +120,13 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       wrapperCol: mergeArrayValue([24], wrapperCol)
     };
   }, [breakpoints, layout, labelAlign, wrapperAlign, labelCol, wrapperCol]);
+  var schema = useFieldSchema(otherProps);
   useMemo(function () {
     // 配置表单默认值
     if (initialValues) {
       form.setInitialValues(initialValues);
     } else if (initialRequest) {
-      useInitialRequest(initialRequest).then(function (values) {
+      useInitialRequest(initialRequest, context).then(function (values) {
         form.setInitialValues(values);
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
@@ -130,12 +164,19 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     form: form,
     onAutoSubmit: onAutoSubmit,
     onAutoSubmitFailed: onSubmitFailed
-  }), /*#__PURE__*/React.createElement(SchemaForm, {
+  }), schema ? /*#__PURE__*/React.createElement(SchemaForm, {
     schema: schema,
     scope: mergedScope,
     components: mergedComponents
-  }), children);
+  }) : null, otherProps === null || otherProps === void 0 ? void 0 : otherProps.children);
 });
+
+var Field = function Field() {
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+};
+
+Field.displayName = 'ProFormField';
+ProForm.Field = Field;
 ProForm.defaultProps = {
   colon: false,
   labelAlign: 'left',

package/es/form/ProForm/index.scss

@@ -317,6 +317,13 @@
   }
 }
 
+// SelectTable
+.#{$teamix-pro-form}-select-table-column-tree
+  > .#{$css-prefix}table-cell-wrapper {
+  display: flex;
+  align-items: center;
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

package/es/form/ProForm/useFieldSchema.d.ts

@@ -0,0 +1,7 @@
+declare const _default: ({ children, schema }: any) => any;
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+export default _default;

package/es/form/ProForm/useFieldSchema.js

@@ -0,0 +1,109 @@
+var _excluded = ["id", "children", "reactions"],
+    _excluded2 = ["id", "children", "reactions"];
+
+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 { getValueByValue, deepMerge, isStr } from '@teamix/utils';
+/**
+ * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
+ * @param field Field 字段
+ * @param extra 额外的 schema 配置（存在递归，可能是子级 schema ）
+ * @param wholeExtra 完整的额外 schema 配置
+ * @returns schema 配置
+ */
+
+var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
+  return [].concat(field).reduce(function (prev, curr, index) {
+    var _curr$type;
+
+    var _ref = curr.props || {},
+        id = _ref.id,
+        _ref$children = _ref.children,
+        children = _ref$children === void 0 ? [] : _ref$children,
+        _ref$reactions = _ref.reactions,
+        reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
+        rest = _objectWithoutProperties(_ref, _excluded);
+
+    var displayName = curr === null || curr === void 0 ? void 0 : (_curr$type = curr.type) === null || _curr$type === void 0 ? void 0 : _curr$type.displayName; // 自定义组件
+
+    var type = curr === null || curr === void 0 ? void 0 : curr.type; // 基本Dom元素
+
+    if (displayName === 'ProFormField') {
+      // 获取字段额外的 schema 配置（From ProForm）
+      var extraFieldProps = extra[index] || {};
+
+      if (id !== extraFieldProps.id) {
+        // 索引不匹配，通过 id 查找获取
+        extraFieldProps = getValueByValue(extra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        }) || getValueByValue(wholeExtra, id, {
+          inputKey: 'id',
+          outputKey: '__whole__'
+        });
+
+        if (extraFieldProps) {
+          console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+        }
+      }
+
+      var _ref2 = extraFieldProps || {},
+          extraId = _ref2.id,
+          _ref2$children = _ref2.children,
+          extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
+          _ref2$reactions = _ref2.reactions,
+          extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
+          extraRest = _objectWithoutProperties(_ref2, _excluded2);
+
+      var mergedReactions = [].concat(reactions, extraReactions);
+      var mergedChildren = children ? getMergedSchema(children, extraChildren, wholeExtra) : [];
+      prev.push(_objectSpread(_objectSpread(_objectSpread({}, deepMerge(rest, extraRest)), mergedReactions.length && {
+        reactions: mergedReactions
+      }), mergedChildren.length && {
+        children: mergedChildren
+      }));
+    } else if (isStr(type)) {
+      prev.push({
+        component: type,
+        props: curr.props
+      });
+    } else if (isStr(displayName)) {
+      prev.push({
+        decorator: displayName,
+        decoratorProps: _objectSpread({
+          id: id
+        }, rest),
+        children: children ? getMergedSchema(children, [], wholeExtra) : []
+      });
+    }
+
+    return prev;
+  }, []);
+};
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+
+
+export default (function (_ref3) {
+  var children = _ref3.children,
+      schema = _ref3.schema;
+  var field = [].concat(children !== null && children !== void 0 ? children : []); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
+
+  if (field.length) {
+    return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);
+  } // 正常使用 ProForm 的 schema 渲染表单
+
+
+  return schema;
+});

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 };