@teamix/pro 1.2.24 → 1.2.29

package/lib/form/Filter/index2.js

@@ -6,14 +6,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.QueryFilter = void 0;
+Object.defineProperty(exports, "QueryFilterLayout", {
+  enumerable: true,
+  get: function get() {
+    return _Layout.QueryFilterLayout;
+  }
+});
 
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _components = require("@alicloudfe/components");
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
-var _icon = _interopRequireDefault(require("@teamix/icon"));
+var _components = require("@alicloudfe/components");
 
 var _core = require("@formily/core");
 
@@ -33,11 +39,13 @@ var _LightFilter = _interopRequireDefault(require("./LightFilter"));
 
 var _AdvancedFilter = _interopRequireDefault(require("./AdvancedFilter"));
 
-var _lodash = _interopRequireDefault(require("lodash.debounce"));
+var _Layout = require("./Layout");
+
+var _useSpecialProps2 = _interopRequireDefault(require("./useSpecialProps"));
 
 require("./index2.scss");
 
-var _excluded = ["addonAfter", "addonBefore", "onFilter", "onInit", "onReset", "mode", "expand", "formRef", "defaultFilterValue"];
+var _excluded = ["addonAfter", "addonBefore", "mode", "expand", "formRef", "defaultFilterValue", "filterDebounce", "onFilter", "onInit", "onReset", "onExpand"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -51,6 +59,14 @@ 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; }
 
+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."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -71,55 +87,21 @@ 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; }
 
-// 获取Schema是否包含默认值、异步默认值、必选校验等
-var getSpecialProps = function getSpecialProps(props) {
-  var initialValues = props.initialValues,
-      initialRequest = props.initialRequest;
-  var hasDefault = !!initialValues;
-  var hasAsyncDefault = !!initialRequest;
-  var hasRequired = false;
-
-  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
-    schema.forEach(function (item) {
-      var value = item.default,
-          required = item.required,
-          rules = item.rules,
-          request = item.request,
-          dataSource = item.dataSource,
-          children = item.children;
-      hasDefault = hasDefault || (0, _utils.isSignificative)(value);
-      hasRequired = hasRequired || required || !!rules;
-      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
-      !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
-
-      if (children === null || children === void 0 ? void 0 : children.length) {
-        hasDefaultOrRule(children);
-      }
-    });
-  };
-
-  hasDefaultOrRule(props.schema);
-  return {
-    hasDefault: hasDefault,
-    hasAsyncDefault: hasAsyncDefault,
-    hasRequired: hasRequired
-  };
-};
 /**
  * 查询筛选
  */
-
-
 var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var addonAfter = props.addonAfter,
       addonBefore = props.addonBefore,
-      onFilter = props.onFilter,
-      onInit = props.onInit,
-      onReset = props.onReset,
       mode = props.mode,
       expand = props.expand,
       formRef = props.formRef,
       defaultFilterValue = props.defaultFilterValue,
+      filterDebounce = props.filterDebounce,
+      onFilter = props.onFilter,
+      onInit = props.onInit,
+      onReset = props.onReset,
+      onExpand = props.onExpand,
       otherProps = _objectWithoutProperties(props, _excluded); // 表单默认值初始化回调
 
 
@@ -206,10 +188,10 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     advanced: advancedForm
   };
 
-  var _getSpecialProps = getSpecialProps(props),
-      hasDefault = _getSpecialProps.hasDefault,
-      hasAsyncDefault = _getSpecialProps.hasAsyncDefault,
-      hasRequired = _getSpecialProps.hasRequired;
+  var _useSpecialProps = (0, _useSpecialProps2.default)(props),
+      hasDefault = _useSpecialProps.hasDefault,
+      hasAsyncDefault = _useSpecialProps.hasAsyncDefault,
+      hasRequired = _useSpecialProps.hasRequired;
 
   var hasDefaultOrRequired = hasDefault || hasAsyncDefault || hasRequired;
 
@@ -235,22 +217,40 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
 
   var getFilterDisplayValues = (0, _react.useCallback)(function (form) {
     var displayValues = (0, _useFormDisplayValues.getFormDisplayValues)(form);
-    return Object.entries(displayValues).map(function (_ref2) {
+    var originalData = Object.entries(displayValues);
+    var filterData = [];
+    originalData.forEach(function (_ref2) {
       var _data$displayValue;
 
       var _ref3 = _slicedToArray(_ref2, 2),
           key = _ref3[0],
           data = _ref3[1];
 
-      return {
-        key: key,
-        type: _fieldTypeMap.default[data.component] || 'text',
-        label: data.title,
-        value: (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value
-      };
-    }).filter(function (item) {
-      return (0, _utils.isSignificative)(item.value);
+      var value = (_data$displayValue = data.displayValue) !== null && _data$displayValue !== void 0 ? _data$displayValue : data.value;
+      var component = data.component;
+
+      if (component === 'SelectGroup') {
+        var _data$value;
+
+        (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.forEach(function (item, index) {
+          filterData.push({
+            key: key,
+            type: _fieldTypeMap.default['MultipleSelect'],
+            label: item.key,
+            value: item.value,
+            index: index
+          });
+        });
+      } else if ((0, _utils.isSignificative)(value)) {
+        filterData.push({
+          key: key,
+          type: _fieldTypeMap.default[component] || 'text',
+          label: data.title,
+          value: value
+        });
+      }
     });
+    return filterData;
   }, []); // 设置标签数据
 
   var configTag = (0, _react.useCallback)(function () {
@@ -271,6 +271,7 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     }
 
     setAdvancedFilterVisible(result);
+    onExpand === null || onExpand === void 0 ? void 0 : onExpand(result);
   }, [advancedFilterVisible, configTag, currentForm.current]); // 简单搜索Filter
 
   var onSimpleFilter = (0, _react.useCallback)( /*#__PURE__*/function () {
@@ -355,8 +356,15 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
     lightForm.reset();
   }, [onReset]); // 关闭标签清空表单字段值
 
-  var onTagClose = (0, _react.useCallback)(function (key) {
-    advancedForm.setValuesIn(key, undefined);
+  var onTagClose = (0, _react.useCallback)(function (key, index) {
+    var newValue = undefined;
+
+    if ((0, _utils.isNum)(index)) {
+      newValue = _toConsumableArray(advancedForm.getValuesIn(key));
+      newValue.splice(index, 1);
+    }
+
+    advancedForm.setValuesIn(key, newValue);
     configFilterItem(advancedForm);
     configTag();
     onFilter && onFilter((0, _reactive.toJS)(advancedForm.values));
@@ -371,57 +379,44 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   (0, _react.useEffect)(function () {
     setCurrentForm(currentForm.current);
   }, []);
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(prefixCls, props.className)
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-inline")
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-left")
-  }, addonBefore ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-addonBefore")
-  }, addonBefore) : null, mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-inline-form"), hasDefaultOrRequired ? "".concat(prefixCls, "-inline-form-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    defaultFilterValue: defaultFilterValue,
-    form: lightForm,
-    onChange: (0, _lodash.default)(onLightFilter, 300)
-  }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-toggle")
-  }, /*#__PURE__*/_react.default.createElement(_components.Badge, {
+  return /*#__PURE__*/_react.default.createElement(_Layout.QueryFilterLayout, {
+    className: (0, _classnames.default)(prefixCls, props.className),
+    addonBefore: addonBefore,
+    addonAfter: addonAfter,
+    expand: advancedFilterVisible,
+    onExpand: toggleAdvancedFilter,
     count: tagDataSource.length,
-    style: _objectSpread({
-      backgroundColor: 'var(--color-brand1-6, #0064c8)',
-      color: 'var(--color-white, #fff)'
-    }, advancedFilterVisible ? {
-      display: 'none'
-    } : {})
-  }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-    onClick: toggleAdvancedFilter
-  }, advancedFilterVisible ? /*#__PURE__*/_react.default.createElement(_icon.default, {
-    type: "up-line"
-  }) : /*#__PURE__*/_react.default.createElement(_icon.default, {
-    type: "filter-line"
-  }), (0, _utils.getMessage)('advancedFilter'))))) : /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-inline-form")
-  }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    form: simpleForm,
-    onChange: (0, _lodash.default)(onSimpleFilter, 300),
-    onSubmit: onSimpleFilter
-  })))), addonAfter ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-addonAfter")
-  }, addonAfter) : null), mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
-    className: "".concat(prefixCls, "-panel")
-  }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-tag"), advancedFilterVisible ? "".concat(prefixCls, "-tag-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref7) {
+    inlineContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)("".concat(prefixCls, "-inline"), hasDefaultOrRequired ? "".concat(prefixCls, "-inline-hidden") : '')
+    }, /*#__PURE__*/_react.default.createElement(_LightFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+      defaultFilterValue: defaultFilterValue,
+      form: lightForm,
+      onChange: (0, _lodash.default)(onLightFilter, filterDebounce)
+    }))) : /*#__PURE__*/_react.default.createElement("div", {
+      className: "".concat(prefixCls, "-inline")
+    }, /*#__PURE__*/_react.default.createElement(_SimpleFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+      form: simpleForm,
+      onChange: (0, _lodash.default)(onSimpleFilter, filterDebounce),
+      onSubmit: onSimpleFilter
+    }))),
+    panelContent: mode === 'panel' ? /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
+      initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
+        onComplete: onInitialRequestComplete
+      }) : undefined,
+      form: advancedForm,
+      onSubmit: onAdvancedFilter,
+      onReset: onAdvancedReset
+    })) : null
+  }, mode === 'panel' && !advancedFilterVisible ? /*#__PURE__*/_react.default.createElement(_components.Tag.Group, null, tagDataSource.map(function (_ref7) {
     var key = _ref7.key,
         label = _ref7.label,
         value = _ref7.value,
-        type = _ref7.type;
+        type = _ref7.type,
+        index = _ref7.index;
     return /*#__PURE__*/_react.default.createElement(_components.Tag.Closeable, {
-      key: key,
+      key: (0, _utils.isNum)(index) ? key + label : key,
       afterClose: function afterClose() {
-        return onTagClose(key);
+        return onTagClose(key, index);
       }
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-tag-title")
@@ -431,19 +426,11 @@ var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
       type: type,
       value: value
     })));
-  }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(prefixCls, "-advanced-wrap"), !advancedFilterVisible ? "".concat(prefixCls, "-advanced-wrap-hidden") : '')
-  }, /*#__PURE__*/_react.default.createElement(_AdvancedFilter.default, _objectSpread(_objectSpread({}, otherProps), {}, {
-    initialRequest: otherProps.initialRequest ? _objectSpread(_objectSpread({}, otherProps.initialRequest), {}, {
-      onComplete: onInitialRequestComplete
-    }) : undefined,
-    form: advancedForm,
-    onSubmit: onAdvancedFilter,
-    onReset: onAdvancedReset
-  })))) : null);
+  })) : null);
 });
 exports.QueryFilter = QueryFilter;
 QueryFilter.defaultProps = {
   mode: 'inline',
-  expand: false
+  expand: false,
+  filterDebounce: 300
 };

package/lib/form/Filter/index2.scss

@@ -4,31 +4,12 @@ $query-filter: #{$teamix-pro-form}-query-filter;
 
 .#{$query-filter} {
   .#{$query-filter}-inline {
-    display: flex;
-    justify-content: space-between;
-  }
-  .#{$query-filter}-left {
-    display: flex;
-  }
-  .#{$query-filter}-addonBefore {
-    flex: 0 1 auto;
-    margin-right: 8px;
-  }
-  .#{$query-filter}-inline-form {
-    flex: 0 0 auto;
     margin-right: 8px;
     margin-bottom: 8px;
   }
-  .#{$query-filter}-inline-form-hidden {
+  .#{$query-filter}-inline-hidden {
     display: none;
   }
-  .#{$query-filter}-toggle {
-    margin-bottom: 8px;
-  }
-  .#{$query-filter}-addonAfter {
-    flex: 0 1 auto;
-    margin-left: 8px;
-  }
   .#{$query-filter}-tag-title {
     margin-right: 12px;
     color: var(--color-text1-8, #848484);
@@ -42,34 +23,24 @@ $query-filter: #{$teamix-pro-form}-query-filter;
       }
     }
   }
-  .#{$query-filter}-tag-hidden {
-    display: none;
-  }
-  .#{$query-filter}-advanced-wrap {
-    padding: 16px;
-    background-color: var(--color-fill1-2, #f7f7f7);
-  }
-  .#{$query-filter}-advanced-wrap-hidden {
-    display: none;
-  }
+}
 
-  .#{$query-filter}-advanced {
-    .#{$css-prefix}formily-button-group {
-      margin-top: 0;
-    }
+.#{$query-filter}-advanced {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
   }
-  .#{$query-filter}-advanced,
-  .#{$query-filter}-simple,
-  .#{$query-filter}-light {
-    .#{$form-item-cls}-feedback-layout-popover {
-      margin-bottom: 0;
-    }
-    .#{$css-prefix}date-picker2-input {
-      .#{$css-prefix}input {
+}
+.#{$query-filter}-advanced,
+.#{$query-filter}-simple,
+.#{$query-filter}-light {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
+  .#{$css-prefix}date-picker2-input {
+    .#{$css-prefix}input {
+      width: inherit;
+      input {
         width: inherit;
-        input {
-          width: inherit;
-        }
       }
     }
   }

package/lib/form/Filter/layout.scss

@@ -0,0 +1,36 @@
+@import '../global.scss';
+
+$query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
+
+.theme-hybridcloud-dark {
+  --panel-filter-bg: #1f1f1f;
+}
+
+.#{$query-filter-layout} {
+  .#{$query-filter-layout}-inline {
+    display: flex;
+    justify-content: space-between;
+  }
+  .#{$query-filter-layout}-left {
+    display: flex;
+  }
+  .#{$query-filter-layout}-addonBefore {
+    flex: 0 1 auto;
+    margin-right: 8px;
+  }
+  .#{$query-filter-layout}-toggle {
+    margin-bottom: 8px;
+  }
+  .#{$query-filter-layout}-addonAfter {
+    flex: 0 1 auto;
+    margin-left: 8px;
+  }
+  .#{$query-filter-layout}-panel {
+    margin-bottom: 8px;
+    padding: 16px;
+    background-color: var(--panel-filter-bg, var(--color-fill1-2));
+  }
+  .#{$query-filter-layout}-panel-hidden {
+    display: none;
+  }
+}

package/lib/form/Filter/useSpecialProps.d.ts

@@ -0,0 +1,6 @@
+declare const useSpecialProps: (props: any) => {
+    hasDefault: boolean;
+    hasAsyncDefault: boolean;
+    hasRequired: boolean;
+};
+export default useSpecialProps;

package/lib/form/Filter/useSpecialProps.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _utils = require("@teamix/utils");
+
+// 获取Schema是否包含默认值、异步默认值、必选校验等
+var useSpecialProps = function useSpecialProps(props) {
+  var initialValues = props.initialValues,
+      initialRequest = props.initialRequest;
+  var hasDefault = !!initialValues;
+  var hasAsyncDefault = !!initialRequest;
+  var hasRequired = false;
+
+  var hasDefaultOrRule = function hasDefaultOrRule(schema) {
+    schema.forEach(function (item) {
+      var value = item.default,
+          required = item.required,
+          rules = item.rules,
+          request = item.request,
+          dataSource = item.dataSource,
+          children = item.children;
+      hasDefault = hasDefault || (0, _utils.isSignificative)(value);
+      hasRequired = hasRequired || required || !!rules;
+      hasAsyncDefault = hasAsyncDefault || !!request || // 如果dataSource是异步且default取自dataSource
+      !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+
+      if (children === null || children === void 0 ? void 0 : children.length) {
+        hasDefaultOrRule(children);
+      }
+    });
+  };
+
+  hasDefaultOrRule(props.schema);
+  return {
+    hasDefault: hasDefault,
+    hasAsyncDefault: hasAsyncDefault,
+    hasRequired: hasRequired
+  };
+};
+
+var _default = useSpecialProps;
+exports.default = _default;

package/lib/form/ProForm/customComponent.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const customComponent: (component: React.FC<any>) => React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
+export { customComponent };

package/lib/form/ProForm/customComponent.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.customComponent = void 0;
+
+var _react = require("@formily/react");
+
+var _reactive = require("@formily/reactive");
+
+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; }
+
+var customComponent = function customComponent(component) {
+  return (0, _react.connect)(component, (0, _react.mapProps)(function (props, field) {
+    return _objectSpread(_objectSpread({}, props), {}, {
+      field: field,
+      form: field.form,
+      values: (0, _reactive.toJS)(field.form.values)
+    });
+  }));
+};
+
+exports.customComponent = customComponent;

package/lib/form/ProForm/index.scss

@@ -186,18 +186,17 @@
 }
 
 // 数组类组件添加按钮
-.#{$form-array}-base-addition {
+.#{$css-prefix}btn.#{$form-array}-base-addition {
+  border-style: dashed;
   .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
 // 数组类ArrayItem Icon 居中
 .#{$form-array}-items-item-inner {
-  > .#{$css-prefix}box {
-    > .#{$css-prefix}space-item {
-      > .#{$css-prefix}formily-icon {
-        margin-top: 9px;
-      }
+  .#{$css-prefix}space-item {
+    > .#{$css-prefix}formily-icon {
+      margin-top: 9px;
     }
   }
 }

package/lib/form/ProForm/useFormDisplayValues.js

@@ -11,6 +11,10 @@ var _reactive = require("@formily/reactive");
 
 var _utils = require("@teamix/utils");
 
+var _fieldTypeMap = _interopRequireDefault(require("../fieldTypeMap"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 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."); }
@@ -45,30 +49,17 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
   var getAddress = function getAddress(path) {
     return form.indexes[path];
-  }; // 判断布局、自增的值还是字段的值（字段值是对象、数组，内部的值特点为非数组、对象的叶子值，并且在form没有路径）
+  }; // 当前field
 
 
-  var isFieldValue = function isFieldValue(value, path) {
-    return !(0, _utils.isPlainObj)(value) && !(0, _utils.isArr)(value) && !getAddress(connectPath(path));
-  };
-
-  var isLayoutValue = function isLayoutValue(object) {
-    var _Object$entries$ = _slicedToArray(Object.entries(object)[0], 2),
-        key = _Object$entries$[0],
-        value = _Object$entries$[1];
-
-    return !isFieldValue(value, key);
-  };
-
-  var isArrayValue = function isArrayValue(array) {
-    return !isFieldValue(array[0], 0);
-  }; // 判断值的类型，递归获取每个值在该结构中的完整路径
+  var field = form.query(getAddress(prefix)).take(); // 是否真实字段值（自定义组件、布局组件、自增数组组件为非真实字段）
 
+  var isFieldValue = Object.keys(_fieldTypeMap.default).includes(field === null || field === void 0 ? void 0 : field.component[0]); // 判断值的类型，递归获取每个值在该结构中的完整路径
 
   if (!(0, _utils.isSignificative)(values)) {
     displayValues = {};
-  } else if ((0, _utils.isPlainObj)(values) && isLayoutValue(values)) {
-    // 如果值是对象且是布局对象的值
+  } else if ((0, _utils.isPlainObj)(values) && !isFieldValue) {
+    // 如果值是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {
       var _ref2 = _slicedToArray(_ref, 2),
@@ -77,8 +68,10 @@ var getDisplayValues = function getDisplayValues(form, values) {
 
       displayValues[key] = getDisplayValues(form, value, connectPath(key));
     });
-  } else if ((0, _utils.isArr)(values) && isArrayValue(values)) {
-    // 如果值是数组且是自增数组的值
+  } else if ((0, _utils.isArr)(values) && !isFieldValue) {
+    // 如果值是自增数组的值
+    // ArrayItems为字符串数组时，由于form.indexes中对应address为最后一个组件，无法正常获取displayName
+    // 例如：arrayItemsString.0: "arrayItemsString.0.ArrayItemsRemove"
     displayValues = [];
     values.map(function (value, index) {
       displayValues[index] = getDisplayValues(form, value, connectPath(index));
@@ -87,14 +80,14 @@ var getDisplayValues = function getDisplayValues(form, values) {
     var _values$value;
 
     // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
-    var field = form.query(getAddress(prefix)).take();
-    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象
+    var realValue = (_values$value = values === null || values === void 0 ? void 0 : values.value) !== null && _values$value !== void 0 ? _values$value : values; // 针对单个字段的值是对象，例如Select的useDetailValue
 
+    var displayValue = (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue);
     displayValues = {
       title: field === null || field === void 0 ? void 0 : field.title,
       component: field === null || field === void 0 ? void 0 : field.component[0],
-      value: realValue,
-      displayValue: (0, _utils.getValueByValue)(field === null || field === void 0 ? void 0 : field.dataSource, realValue)
+      value: values,
+      displayValue: displayValue
     };
   }
 

package/lib/form/SchemaForm/adapterType.js

@@ -53,6 +53,7 @@ var typeMap = (_typeMap = {
   MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
+  SelectGroup: 'array',
   ArrayCollapse: 'array',
   ArrayCards: 'array',
   ArrayTable: 'array',