@teamix/pro 1.2.20 → 1.2.24

package/es/actions/dialog.js

@@ -1,4 +1,4 @@
-var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 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; }
@@ -32,7 +32,7 @@ import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
 import PopConfirm from '@teamix/pop-confirm';
-import { getTargetValue, uuid, goToLink, getMessage } from '@teamix/utils';
+import { getTargetValue, uuid, getMessage } from '@teamix/utils';
 import ProForm, { createForm } from '../form';
 import { renderProMessage } from '../utils/message';
 import { eventHandler } from './base';
@@ -81,7 +81,8 @@ export function useDialogAction(action, actionContext) {
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
-    var url = action.url,
+    var trigger = action.trigger,
+        url = action.url,
         method = action.method,
         params = action.params,
         data = action.data,
@@ -161,45 +162,34 @@ export function useDialogAction(action, actionContext) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (!link) {
-                    _context.next = 5;
-                    break;
-                  }
-
-                  goToLink(link, history);
-                  onFinish && onFinish();
-                  resolve(true);
-                  return _context.abrupt("return");
-
-                case 5:
                   setLoading(true);
                   footerDescriptionValues = Object.assign({}, footerDescriptionRef === null || footerDescriptionRef === void 0 ? void 0 : (_footerDescriptionRef = footerDescriptionRef.current) === null || _footerDescriptionRef === void 0 ? void 0 : _footerDescriptionRef.values);
-                  _context.prev = 7;
+                  _context.prev = 2;
                   requestContext = Object.assign({
                     footer: footerDescriptionValues
                   }, context);
-                  _context.next = 11;
+                  _context.next = 6;
                   return doRequest(action, requestContext, history, footerDescriptionValues);
 
-                case 11:
+                case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 20;
+                  _context.next = 15;
                   break;
 
-                case 15:
-                  _context.prev = 15;
-                  _context.t0 = _context["catch"](7);
+                case 10:
+                  _context.prev = 10;
+                  _context.t0 = _context["catch"](2);
                   setLoading(false);
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 20:
+                case 15:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[7, 15]]);
+          }, _callee, null, [[2, 10]]);
         }));
 
         return function (_x) {

package/es/actions/index.d.ts

@@ -46,11 +46,21 @@ export interface ProActionMenuButtonProps extends MenuButtonProps {
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
 export declare type ProActionGroupProps = {
+    /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
+    /** 上下文 */
     context?: any;
+    /** 操作项配置 */
     actions: ProActionProps[];
+    /** 操作按钮最长数量，超出后折叠，默认为4 */
     max?: number;
+    /**
+     * @deprecated 建议使用 more 代替
+     */
     moreText?: string;
+    /** 更多按钮的配置，只有在actions数量超过max时才有效 */
+    more?: string | ProActionButtonProps;
+    /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;
 export declare function ProActionGroup(props: ProActionGroupProps): JSX.Element;

package/es/actions/index.js

@@ -5,7 +5,7 @@ var _excluded = ["type"],
     _excluded5 = ["context", "text"],
     _excluded6 = ["key", "actions"],
     _excluded7 = ["key", "config"],
-    _excluded8 = ["type", "divider", "max", "moreText", "context", "actions", "className"];
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -287,25 +287,19 @@ function renderCommonActionButton(button, context, isTypeText) {
   return /*#__PURE__*/React.createElement(ProActionMenuButton, _objectSpread({}, buttonProps));
 }
 
-function getDefaultMoreButton(type, moreText) {
-  if (type === 'button') {
-    return {
-      label: moreText || getMessage('more')
-    };
-  }
-
-  if (moreText) {
-    return {
-      label: moreText
-    };
-  }
-
-  return {
+function getDefaultMoreButton(type, more) {
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+  var defaultConfig = type === 'button' ? {
+    children: getMessage('more')
+  } : {
     icon: 'more-line',
     // iconSize: 'small',
     autoWidth: false,
     className: 'teamix-pro-actions-text-menu-btn-no-arrow'
   };
+  return Object.assign(defaultConfig, moreConfig);
 }
 
 var MAX_ACTTIONS = 4;
@@ -350,6 +344,7 @@ export function ProActionGroup(props) {
       _props$max = props.max,
       max = _props$max === void 0 ? MAX_ACTTIONS : _props$max,
       moreText = props.moreText,
+      more = props.more,
       context = props.context,
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
@@ -362,7 +357,7 @@ export function ProActionGroup(props) {
   }).filter(function (action) {
     return action.visible !== false;
   });
-  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, moreText));
+  var formatedActions = formatGroupActions(filteredActions, max, getDefaultMoreButton(type, more || moreText));
   return /*#__PURE__*/React.createElement("div", _objectSpread({
     className: cls('teamix-pro-actions', "teamix-pro-actions-type-".concat(type), className, {
       'teamix-pro-actions-divider': type === 'button' ? false : divider

package/es/form/Components/LightFilter/componentMap.js

@@ -1,6 +1,7 @@
 var componentMap = {
   Radio: 'Select',
-  Checkbox: 'Select'
+  Checkbox: 'Select',
+  CheckboxGroup: 'MultipleSelect'
 };
 var inputCategory = ['Input', 'Password', 'TextArea', 'NumberPicker', 'Percent', 'Money'];
 export { componentMap, inputCategory };

package/es/form/Components/LightFilter/index.js

@@ -23,19 +23,31 @@ import TeamixIcon from '@teamix/icon';
 import cls from 'classnames';
 import { usePrefixCls } from '@teamix/utils';
 import { componentMap, inputCategory } from './componentMap';
-import './index.scss'; // 主激活区内容
+import './index.scss';
+
+var formatComponent = function formatComponent(schema) {
+  var _schema$enum;
+
+  var component = schema['x-component'];
+
+  if (component === 'Checkbox' && ((_schema$enum = schema['enum']) === null || _schema$enum === void 0 ? void 0 : _schema$enum.length)) {
+    component = 'CheckboxGroup';
+  }
+
+  return componentMap[component] || component;
+}; // 主激活区内容
+
 
 var useMain = function useMain(active) {
   var schema = useFieldSchema();
   var main = [];
   schema.mapProperties(function (schema, name) {
-    // console.log(schema.required); // 添加 *
     if (schema.name === active) {
       main.push({
         name: name,
         schema: _objectSpread(_objectSpread({}, schema), {}, {
           title: '',
-          'x-component': componentMap[schema['x-component']] || schema['x-component']
+          'x-component': formatComponent(schema)
         })
       });
     }

package/es/form/Components/SelectTable/index.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+import { TableProps, ColumnProps } from '@alifd/next/types/table';
+import './index.scss';
+declare type ISelectTableFilterOption = boolean | ((optipn: any, kewword: string) => boolean);
+declare type ISelectTableFilterSort = (optionA: any, optionB: any) => number;
+export interface ISelectTableColumnProps extends ColumnProps {
+    key: React.ReactText;
+}
+export interface ISelectTableProps extends TableProps {
+    mode?: 'multiple' | 'single';
+    dataSource?: any[];
+    optionAsValue?: boolean;
+    showSearch?: boolean;
+    filterOption?: ISelectTableFilterOption;
+    filterSort?: ISelectTableFilterSort;
+    onSearch?: (kekword: string) => void;
+    onChange?: (value: any) => void;
+    value?: any;
+}
+declare type ComposedSelectTable = React.FC<ISelectTableProps> & {
+    TableColumn?: React.FC<ISelectTableColumnProps>;
+};
+declare const SelectTable: ComposedSelectTable;
+export default SelectTable;

package/es/form/Components/SelectTable/index.js

@@ -0,0 +1,135 @@
+var _excluded = ["mode", "dataSource", "optionAsValue", "showSearch", "filterOption", "filterSort", "onSearch", "className", "value", "onChange", "rowSelection"];
+
+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; }
+
+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 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; }
+
+import React, { useEffect, useState } from 'react';
+import { Table, Search } from '@alicloudfe/components';
+import { observer, useFieldSchema } from '@formily/react';
+import cls from 'classnames';
+import { isArr } from '@formily/shared';
+import { usePrefixCls } from '@teamix/utils';
+import './index.scss';
+
+var useColumns = function useColumns() {
+  var schema = useFieldSchema();
+  var columns = [];
+  schema.mapProperties(function (schema, name) {
+    var _schema$xComponent;
+
+    if (((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : _schema$xComponent.indexOf('Column')) > -1) {
+      var props = schema === null || schema === void 0 ? void 0 : schema['x-component-props'];
+      columns.push({
+        name: name,
+        props: _objectSpread(_objectSpread({}, props), {}, {
+          title: (props === null || props === void 0 ? void 0 : props.title) || (schema === null || schema === void 0 ? void 0 : schema.title),
+          dataIndex: (props === null || props === void 0 ? void 0 : props.dataIndex) || name
+        }),
+        schema: schema
+      });
+    }
+  });
+  return columns;
+};
+
+var SelectTable = observer(function (props) {
+  var mode = props.mode,
+      dataSource = props.dataSource,
+      optionAsValue = props.optionAsValue,
+      showSearch = props.showSearch,
+      filterOption = props.filterOption,
+      filterSort = props.filterSort,
+      onSearch = props.onSearch,
+      className = props.className,
+      value = props.value,
+      onChange = props.onChange,
+      rowSelection = props.rowSelection,
+      otherTableProps = _objectWithoutProperties(props, _excluded);
+
+  var prefixCls = usePrefixCls('formily-selectTable', props);
+
+  var _useState = useState(),
+      _useState2 = _slicedToArray(_useState, 2),
+      selected = _useState2[0],
+      setSelected = _useState2[1];
+
+  var tabs = useColumns();
+
+  var expandedRowRender = function expandedRowRender(record, index) {
+    var children = isArr(record.children) ? record.children : [];
+    return /*#__PURE__*/React.createElement(Table, {
+      dataSource: children,
+      key: index
+    }, tabs.map(function (_ref, key) {
+      var props = _ref.props;
+      return /*#__PURE__*/React.createElement(Table.Column, _objectSpread({
+        key: key
+      }, props));
+    }));
+  };
+
+  var onInnerChange = function onInnerChange(selectedRowKeys, records) {
+    var outputValue = optionAsValue ? records : selectedRowKeys;
+    outputValue = mode === 'single' ? outputValue[0] : outputValue;
+    onChange && onChange(outputValue);
+  };
+
+  useEffect(function () {
+    var primaryKey = props.primaryKey;
+    var inputValue = mode === 'single' ? [value] : isArr(value) ? value : [];
+    inputValue = optionAsValue ? inputValue.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v[primaryKey];
+    }) : inputValue;
+    setSelected(inputValue);
+  }, [value, mode]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls(prefixCls, props.className)
+  }, showSearch ? /*#__PURE__*/React.createElement(Search, {
+    className: "".concat(prefixCls, "-search"),
+    onSearch: console.log
+  }) : null, /*#__PURE__*/React.createElement(Table, _objectSpread({
+    className: "".concat(prefixCls, "-table"),
+    dataSource: dataSource,
+    rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
+      mode: mode,
+      onChange: onInnerChange,
+      selectedRowKeys: selected
+    })
+  }, otherTableProps), tabs.map(function (_ref2, key) {
+    var props = _ref2.props;
+    return /*#__PURE__*/React.createElement(Table.Column, _objectSpread({
+      key: key
+    }, props));
+  })));
+});
+
+var TableColumn = function TableColumn(_ref3) {
+  var children = _ref3.children;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, children);
+};
+
+SelectTable.TableColumn = TableColumn;
+SelectTable.defaultProps = {
+  showSearch: false,
+  primaryKey: 'key'
+};
+export default SelectTable;

package/es/form/Components/SelectTable/index.scss

@@ -0,0 +1,28 @@
+@import '../../global.scss';
+
+$selectTable: #{$css-prefix}formily-selectTable;
+
+.#{$selectTable} {
+  .#{$selectTable}-search {
+    margin-bottom: 8px;
+  }
+  .#{$selectTable}-table {
+  }
+}
+
+.next-table-row-nochildren {
+  > .next-table-expanded {
+    > * {
+      visibility: hidden;
+    }
+  }
+}
+.next-table-expanded-row {
+  .next-table-body {
+    > tr:last-child {
+      > td {
+        border-bottom: 0;
+      }
+    }
+  }
+}

package/es/form/Components/SelectTable/table.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import React from 'React';
+import { TableProps } from '@alifd/next/types/table';
+import './index.scss';
+declare const Table: React.FC<TableProps>;
+export default Table;

package/es/form/Components/SelectTable/table.js

@@ -0,0 +1,64 @@
+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; }
+
+import React from 'React';
+import { Table as NextTable } from '@alicloudfe/components';
+import './index.scss';
+
+var Table = function Table(props) {
+  var onChange = function onChange(selectedRowKeys, records) {
+    console.log(selectedRowKeys);
+  };
+
+  var onSelect = function onSelect() {};
+
+  var onSelectAll = function onSelectAll() {};
+
+  var rowProps = function rowProps(record) {
+    var _record$children;
+
+    if (!(record === null || record === void 0 ? void 0 : (_record$children = record.children) === null || _record$children === void 0 ? void 0 : _record$children.length)) {
+      return {// className: 'next-table-row-nochildren',
+      };
+    }
+
+    return {};
+  };
+
+  var expandedRowRender = function expandedRowRender(record, index) {
+    var children = record.children;
+
+    if (children === null || children === void 0 ? void 0 : children.length) {
+      return React.createElement(Table, _objectSpread(_objectSpread({}, props), {}, {
+        key: index,
+        dataSource: children,
+        hasHeader: false,
+        hasBorder: false,
+        rowProps: rowProps,
+        rowSelection: {
+          onChange: onChange
+        },
+        expandedRowRender: expandedRowRender,
+        expandedRowIndent: [1, 0]
+      }));
+    }
+
+    return React.createElement(React.Fragment, null);
+  };
+
+  return React.createElement(NextTable, _objectSpread(_objectSpread({}, props), {}, {
+    rowProps: rowProps,
+    rowSelection: {
+      onChange: onChange,
+      onSelectAll: onSelectAll,
+      onSelect: onSelect
+    },
+    expandedRowRender: expandedRowRender,
+    expandedRowIndent: [1, 0]
+  }));
+};
+
+export default Table;

package/es/form/Filter/AdvancedFilter.js

@@ -53,6 +53,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       props: {
         breakpoints: [480, 720, 990, 1200, Infinity],
         maxColumns: [1, 2, 3, 3, 4],
+        maxWidth: [480, 360, 330, 330, 300],
         columnGap: 16,
         rowGap: 12
       },

package/es/form/Filter/index2.js

@@ -39,6 +39,7 @@ import { getFormDisplayValues } from '../ProForm/useFormDisplayValues';
 import SimpleFilter from './SimpleFilter';
 import LightFilter from './LightFilter';
 import AdvancedFilter from './AdvancedFilter';
+import debounce from 'lodash.debounce';
 import './index2.scss'; // 获取Schema是否包含默认值、异步默认值、必选校验等
 
 var getSpecialProps = function getSpecialProps(props) {
@@ -162,6 +163,10 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
         onFormReact(function (form) {
           _onFormInit(form, props, configFilterItem);
         });
+        onFormInputChange(function (form) {
+          // 主动修改高级筛选值
+          setCurrentForm('advanced');
+        });
       }
     });
   }, []);
@@ -304,11 +309,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     return function (_x2) {
       return _ref5.apply(this, arguments);
     };
-  }(), [onFilter, currentForm.current]); // 高级筛选Change
-
-  var onAdvancedChange = useCallback(function () {
-    setCurrentForm('advanced');
-  }, []); // 高级搜索Filter
+  }(), [onFilter, currentForm.current]); // 高级搜索Filter
 
   var onAdvancedFilter = useCallback(function (values) {
     setCurrentForm('advanced');
@@ -353,7 +354,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
   }, /*#__PURE__*/React.createElement(LightFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     defaultFilterValue: defaultFilterValue,
     form: lightForm,
-    onChange: onLightFilter
+    onChange: debounce(onLightFilter, 300)
   }))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-toggle")
   }, /*#__PURE__*/React.createElement(Badge, {
@@ -374,7 +375,7 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
     className: "".concat(prefixCls, "-inline-form")
   }, /*#__PURE__*/React.createElement(SimpleFilter, _objectSpread(_objectSpread({}, otherProps), {}, {
     form: simpleForm,
-    onChange: onSimpleFilter,
+    onChange: debounce(onSimpleFilter, 300),
     onSubmit: onSimpleFilter
   })))), addonAfter ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-addonAfter")
@@ -407,7 +408,6 @@ var QueryFilter = /*#__PURE__*/memo(function (props) {
       onComplete: onInitialRequestComplete
     }) : undefined,
     form: advancedForm,
-    onChange: onAdvancedChange,
     onSubmit: onAdvancedFilter,
     onReset: onAdvancedReset
   })))) : null);

package/es/form/ProForm/index.js

@@ -21,7 +21,6 @@ import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
 import validateLocale from '../locales/validate';
-import debounce from 'lodash.debounce';
 import './index.scss';
 registerValidateLocale(validateLocale);
 var ProForm = /*#__PURE__*/memo(function (_ref) {
@@ -81,9 +80,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   useEffect(function () {
     form.removeEffects('onFieldValueChange');
     form.addEffects('onFieldValueChange', function () {
-      onFieldValueChange('*', debounce(function (field, form) {
-        onChange && onChange(toJS(form.values), toJS(field.value), field.props.name);
-      }, 300));
+      onFieldValueChange('*', function (field, form) {
+        var _field$props;
+
+        onChange && onChange(toJS(form.values), toJS(field.value), (_field$props = field.props) === null || _field$props === void 0 ? void 0 : _field$props.name);
+      });
     });
   }, [form, onChange]); // 配置表单默认值
 

package/es/form/ProForm/index.scss

@@ -186,13 +186,13 @@
 }
 
 // 数组类组件添加按钮
-.#{$css-prefix}formily-array-base-addition {
+.#{$form-array}-base-addition {
   .#{$css-prefix}formily-icon {
     margin-right: 4px;
   }
 }
 // 数组类ArrayItem Icon 居中
-.#{$css-prefix}formily-array-items-item-inner {
+.#{$form-array}-items-item-inner {
   > .#{$css-prefix}box {
     > .#{$css-prefix}space-item {
       > .#{$css-prefix}formily-icon {
@@ -209,7 +209,7 @@
 
 // 折叠面板
 .#{$css-prefix}formily-collapse,
-.#{$css-prefix}formily-array-collapse-item {
+.#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {
     .#{$css-prefix}collapse-panel-content {
       padding-top: 4px;
@@ -261,7 +261,7 @@
 }
 
 // ArrayItems
-.#{$css-prefix}formily-array-items {
+.#{$form-array}-items {
   .#{$css-prefix}formily-grid-layout {
     > div:last-child {
       display: flex;
@@ -269,8 +269,39 @@
       align-items: center;
     }
   }
-  .#{$css-prefix}formily-array-base-remove {
-    cursor: pointer;
+}
+.#{$form-array}-base-remove,
+.#{$form-array}-base-addition,
+.#{$form-array}-base-move-down,
+.#{$form-array}-base-move-up,
+.#{$form-array}-base-sort-handle,
+.form-array-base-icon {
+  color: var(--color-fill1-6, #848484);
+  &:hover {
+    color: var(--color-brand1-6, #0064c8);
+  }
+}
+.form-array-base-icon {
+  cursor: pointer;
+}
+
+// ArrayCard
+.#{$form-array}-cards-item {
+  .#{$css-prefix}card-head {
+    padding: 16px 20px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+    .#{$css-prefix}card-head-main {
+      margin-top: 0;
+      border-bottom: 0;
+      height: 22px;
+      line-height: 22px;
+      .#{$css-prefix}card-title {
+        padding-left: 0;
+        &::before {
+          display: none;
+        }
+      }
+    }
   }
 }
 

package/es/form/ProForm/useFormDisplayValues.js

@@ -12,7 +12,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { useForm } from '@formily/react';
 import { toJS } from '@formily/reactive';
-import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
+import { isArr, isPlainObj, isSignificative, getValueByValue } from '@teamix/utils';
 /**
  * 获取表单值的可显示值
  * @returns 如果某字段有dataSource，则返回value对应label
@@ -56,7 +56,9 @@ var getDisplayValues = function getDisplayValues(form, values) {
   }; // 判断值的类型，递归获取每个值在该结构中的完整路径
 
 
-  if (isPlainObj(values) && isLayoutValue(values)) {
+  if (!isSignificative(values)) {
+    displayValues = {};
+  } else if (isPlainObj(values) && isLayoutValue(values)) {
     // 如果值是对象且是布局对象的值
     displayValues = {};
     Object.entries(values).forEach(function (_ref) {