@teamix/pro 1.4.1 → 1.4.4

package/es/actions/dialog-form.js

@@ -133,7 +133,7 @@ var DialogForm = function DialogForm(props) {
     }
   }, /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({
     form: form,
-    schema: getTargetValue(formSchema, context)
+    schema: formSchema
   }, getDefaultFormPropsByDialogSize(size)), addContext(getTargetValue(others, context), context))));
 };
 

package/es/actions/dialog.js

@@ -59,7 +59,8 @@ var FooterForm = function FooterForm(props) {
     layout: "inline",
     feedbackLayout: "none",
     form: form,
-    schema: getTargetValue(schema, context)
+    context: context,
+    schema: schema
   });
 };
 

package/es/card/index.d.ts

@@ -41,6 +41,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     centered?: boolean;
     /** 加载中状态 */
     loading?: boolean;
+    /** 是否只是内容区加载，标题正常显示 */
+    contentLoading?: boolean;
     /** 空状态 */
     empty?: boolean;
     /** 边框颜色 */

package/es/card/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "contentLoading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -93,6 +93,7 @@ export var ProCard = function ProCard(props) {
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      contentLoading = props.contentLoading,
       empty = props.empty,
       borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
@@ -240,7 +241,7 @@ export var ProCard = function ProCard(props) {
     component: "img",
     src: image
   }), (title || extra) && /*#__PURE__*/React.createElement(BasicCard.Header, {
-    title: loading ? /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Title, null) : renderTitle(),
+    title: loading && !contentLoading ? /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Title, null) : renderTitle(),
     subTitle: !loading && subTitle,
     extra: !loading && renderActionGroup(extra, context)
   }), hasDivider && /*#__PURE__*/React.createElement(BasicCard.Divider, null), showContent && /*#__PURE__*/React.createElement(BasicCard.Content, {
@@ -248,7 +249,7 @@ export var ProCard = function ProCard(props) {
       padding: 0,
       margin: 0
     } : {}
-  }, loading && /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/React.createElement("div", {
+  }, (loading || contentLoading) && /*#__PURE__*/React.createElement(ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/React.createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
   }, empty && /*#__PURE__*/React.createElement("div", {

package/es/form/ProForm/index.js

@@ -10,7 +10,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, { memo, useMemo } from 'react';
+import React, { memo, useEffect, useMemo } from 'react';
 import { usePrefixCls, cls, getLanguage, getGlobalConfig } from '@teamix/utils';
 import { createForm, onFieldValueChange, onFormValuesChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
@@ -90,12 +90,11 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       validateFirst: validateFirst
     });
   }, []);
-  var prefixCls = usePrefixCls('teamix-pro-form');
+  var prefixCls = usePrefixCls('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
     context: context
-  }); // context需要实名不能解构
-
+  });
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
@@ -128,10 +127,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
-    } // 配置国际化
-
-
-    setValidateLanguage(getLanguage() || 'zh-cn');
+    }
   }, []); // 添加 onChange 事件
 
   useMemo(function () {
@@ -155,6 +151,10 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       });
     }
   }, [onChange]);
+  useEffect(function () {
+    // 配置国际化
+    setValidateLanguage(getLanguage() || 'zh-cn');
+  }, []);
   return /*#__PURE__*/React.createElement(Form, _objectSpread(_objectSpread(_objectSpread({
     className: cls(prefixCls(), className)
   }, otherProps), getTeamixLayout), {}, {

package/es/form/ProForm/index.scss

@@ -36,8 +36,7 @@
         .#{$teamix-pro-field}-radio,
         .#{$teamix-pro-field}-switch,
         .#{$teamix-pro-field}-colorradio,
-        .#{$teamix-pro-field}-range,
-        .#{$css-prefix}btn-text {
+        .#{$teamix-pro-field}-range {
           line-height: var(--form-element-medium-height, 32px);
         }
         > .#{$css-prefix}btn-text {
@@ -109,6 +108,21 @@
   }
 }
 
+// 尺寸 - small
+.#{$form-item-cls}-size-small {
+  // 预览态行高
+  .#{$css-prefix}form-preview {
+    line-height: var(--form-element-small-height, 24px);
+  }
+}
+// 尺寸 - large
+.#{$form-item-cls}-size-large {
+  // 预览态行高
+  .#{$css-prefix}form-preview {
+    line-height: var(--form-element-large-height, 36px);
+  }
+}
+
 // Icon
 .#{$css-prefix}formily-icon {
   transform: translate(0, -1px);
@@ -190,23 +204,6 @@
   }
 }
 
-// 数组类组件添加按钮
-.#{$css-prefix}btn.#{$form-array}-base-addition {
-  border-style: dashed;
-  .#{$css-prefix}formily-icon {
-    margin-right: 4px;
-  }
-}
-// 数组类ArrayItem Icon text 居中
-.#{$form-array}-items-item-inner {
-  .#{$css-prefix}space-item {
-    > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
-      line-height: inherit !important;
-      margin-right: 0;
-    }
-  }
-}
-
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
   line-height: var(--form-element-medium-height, 32px);
@@ -296,6 +293,20 @@
 .form-array-base-icon {
   cursor: pointer;
 }
+// 数组类组件添加按钮
+.#{$css-prefix}btn.#{$form-array}-base-addition {
+  border-style: dashed;
+  .#{$css-prefix}formily-icon {
+    margin-right: 4px;
+  }
+}
+.#{$form-array}-items {
+  .#{$form-item-cls}-control-content-component {
+    > .#{$css-prefix}btn-text.#{$form-array}-base-addition {
+      line-height: var(--form-element-medium-height, 32px);
+    }
+  }
+}
 
 // ArrayCard
 .#{$form-array}-cards-item {
@@ -324,6 +335,18 @@
   align-items: center;
 }
 
+// todo 此处做覆盖，formily改为变量后可移除
+.#{$form-array}-items-card {
+  border-color: var(--card-border-color, #eaeaea);
+  background: var(--card-background, #ffffff);
+  .#{$css-prefix}formily-item:not(.#{$css-prefix}formily-item-feedback-layout-popover) {
+    .#{$css-prefix}formily-item-help {
+      background: var(--card-background, #ffffff);
+      box-shadow: 0 0 10px var(--card-border-color, #eaeaea);
+    }
+  }
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

package/es/index.d.ts

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

package/es/index.js

@@ -31,6 +31,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.4.1';
+var version = '1.4.4';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

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

@@ -1,4 +1,4 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
 
 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; }
 
@@ -29,6 +29,7 @@ var Layout = function Layout(props) {
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
       dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
@@ -100,7 +101,7 @@ var Layout = function Layout(props) {
           addonAfter: renderAddonAfter()
         }, dataFilter));
       } 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(QueryFilter, _objectSpread({
+        return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
@@ -117,7 +118,9 @@ var Layout = function Layout(props) {
           },
           addonBefore: renderMainAction(),
           addonAfter: renderAddonAfter()
-        }, dataFilter));
+        }, dataFilter)), afterDataFilter && /*#__PURE__*/React.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -118,6 +118,7 @@ var ProTable = function ProTable(props) {
       mainAction = props.mainAction,
       extra = props.extra,
       propsDataFilter = props.dataFilter,
+      afterDataFilter = props.afterDataFilter,
       toolBar = props.toolBar,
       propsColumns = props.columns,
       useRowSelection = props.useRowSelection,
@@ -806,6 +807,7 @@ var ProTable = function ProTable(props) {
         actionRef: actionRef,
         columns: propsColumns,
         dataFilter: dataFilter,
+        afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
         filterColumnType: filterColumnType

package/es/table/index.scss

@@ -1,16 +1,9 @@
 $prefix: 'teamix-pro-table';
 $fullscreenPadding: 24px;
 
-.next-overlay-wrapper {
-  --checkbox-select-icon-content: '\ead7';
-  --checkbox-semi-select-icon-content: '\ead5';
-}
-
 .#{$prefix} {
   background: var(--table-row-bg, #ffffff);
   position: relative;
-  --checkbox-select-icon-content: '\ead7';
-  --checkbox-semi-select-icon-content: '\ead5';
   &-footer {
     padding: 8px 0;
     width: 100%;
@@ -121,7 +114,7 @@ $fullscreenPadding: 24px;
 }
 
 .next-table {
-  .next-form-preview.next-form-preview {
+  .next-form-preview {
     line-height: unset;
   }
   &-row {
@@ -141,4 +134,4 @@ $fullscreenPadding: 24px;
   a:hover {
     color: var(--color-brand1-5);
   }
-}
+}

package/es/table/typing.d.ts

@@ -256,6 +256,8 @@ export declare type ProTableTopAreaProps = {
     extra?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     /** 数据过滤区 */
     dataFilter?: ProTableDataFilterProps;
+    /** 数据过滤区下方自定义区域 */
+    afterDataFilter?: React.ReactNode;
     /** 传给 QueryFilter 的 formRef */
     dataFilterFormRef?: any;
     /** 排序、筛选列展示状态 */

package/lib/actions/dialog-form.js

@@ -154,7 +154,7 @@ var DialogForm = function DialogForm(props) {
     }
   }, /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread(_objectSpread({
     form: form,
-    schema: (0, _utils.getTargetValue)(formSchema, context)
+    schema: formSchema
   }, getDefaultFormPropsByDialogSize(size)), (0, _utils2.addContext)((0, _utils.getTargetValue)(others, context), context))));
 };
 

package/lib/actions/dialog.js

@@ -85,7 +85,8 @@ var FooterForm = function FooterForm(props) {
     layout: "inline",
     feedbackLayout: "none",
     form: form,
-    schema: (0, _utils.getTargetValue)(schema, context)
+    context: context,
+    schema: schema
   });
 };
 

package/lib/card/index.d.ts

@@ -41,6 +41,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     centered?: boolean;
     /** 加载中状态 */
     loading?: boolean;
+    /** 是否只是内容区加载，标题正常显示 */
+    contentLoading?: boolean;
     /** 空状态 */
     empty?: boolean;
     /** 边框颜色 */

package/lib/card/index.js

@@ -54,7 +54,7 @@ Object.keys(_cardContainer).forEach(function (key) {
   });
 });
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "message", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "contentLoading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -133,6 +133,7 @@ var ProCard = function ProCard(props) {
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      contentLoading = props.contentLoading,
       empty = props.empty,
       borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
@@ -281,7 +282,7 @@ var ProCard = function ProCard(props) {
     component: "img",
     src: image
   }), (title || extra) && /*#__PURE__*/_react.default.createElement(_components.Card.Header, {
-    title: loading ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Title, null) : renderTitle(),
+    title: loading && !contentLoading ? /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Title, null) : renderTitle(),
     subTitle: !loading && subTitle,
     extra: !loading && renderActionGroup(extra, context)
   }), hasDivider && /*#__PURE__*/_react.default.createElement(_components.Card.Divider, null), showContent && /*#__PURE__*/_react.default.createElement(_components.Card.Content, {
@@ -289,7 +290,7 @@ var ProCard = function ProCard(props) {
       padding: 0,
       margin: 0
     } : {}
-  }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/_react.default.createElement("div", {
+  }, (loading || contentLoading) && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/_react.default.createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
   }, empty && /*#__PURE__*/_react.default.createElement("div", {

package/lib/form/ProForm/index.js

@@ -122,12 +122,11 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       validateFirst: validateFirst
     });
   }, []);
-  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form');
+  var prefixCls = (0, _utils.usePrefixCls)('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
     context: context
-  }); // context需要实名不能解构
-
+  });
 
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), _ProField.default);
 
@@ -160,10 +159,7 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       }).finally(function () {
         onInitialComplete === null || onInitialComplete === void 0 ? void 0 : onInitialComplete(form);
       });
-    } // 配置国际化
-
-
-    (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
+    }
   }, []); // 添加 onChange 事件
 
   (0, _react.useMemo)(function () {
@@ -187,6 +183,10 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       });
     }
   }, [onChange]);
+  (0, _react.useEffect)(function () {
+    // 配置国际化
+    (0, _core.setValidateLanguage)((0, _utils.getLanguage)() || 'zh-cn');
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_formily.Form, _objectSpread(_objectSpread(_objectSpread({
     className: (0, _utils.cls)(prefixCls(), className)
   }, otherProps), getTeamixLayout), {}, {

package/lib/form/ProForm/index.scss

@@ -36,8 +36,7 @@
         .#{$teamix-pro-field}-radio,
         .#{$teamix-pro-field}-switch,
         .#{$teamix-pro-field}-colorradio,
-        .#{$teamix-pro-field}-range,
-        .#{$css-prefix}btn-text {
+        .#{$teamix-pro-field}-range {
           line-height: var(--form-element-medium-height, 32px);
         }
         > .#{$css-prefix}btn-text {
@@ -109,6 +108,21 @@
   }
 }
 
+// 尺寸 - small
+.#{$form-item-cls}-size-small {
+  // 预览态行高
+  .#{$css-prefix}form-preview {
+    line-height: var(--form-element-small-height, 24px);
+  }
+}
+// 尺寸 - large
+.#{$form-item-cls}-size-large {
+  // 预览态行高
+  .#{$css-prefix}form-preview {
+    line-height: var(--form-element-large-height, 36px);
+  }
+}
+
 // Icon
 .#{$css-prefix}formily-icon {
   transform: translate(0, -1px);
@@ -190,23 +204,6 @@
   }
 }
 
-// 数组类组件添加按钮
-.#{$css-prefix}btn.#{$form-array}-base-addition {
-  border-style: dashed;
-  .#{$css-prefix}formily-icon {
-    margin-right: 4px;
-  }
-}
-// 数组类ArrayItem Icon text 居中
-.#{$form-array}-items-item-inner {
-  .#{$css-prefix}space-item {
-    > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
-      line-height: inherit !important;
-      margin-right: 0;
-    }
-  }
-}
-
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
   line-height: var(--form-element-medium-height, 32px);
@@ -296,6 +293,20 @@
 .form-array-base-icon {
   cursor: pointer;
 }
+// 数组类组件添加按钮
+.#{$css-prefix}btn.#{$form-array}-base-addition {
+  border-style: dashed;
+  .#{$css-prefix}formily-icon {
+    margin-right: 4px;
+  }
+}
+.#{$form-array}-items {
+  .#{$form-item-cls}-control-content-component {
+    > .#{$css-prefix}btn-text.#{$form-array}-base-addition {
+      line-height: var(--form-element-medium-height, 32px);
+    }
+  }
+}
 
 // ArrayCard
 .#{$form-array}-cards-item {
@@ -324,6 +335,18 @@
   align-items: center;
 }
 
+// todo 此处做覆盖，formily改为变量后可移除
+.#{$form-array}-items-card {
+  border-color: var(--card-border-color, #eaeaea);
+  background: var(--card-background, #ffffff);
+  .#{$css-prefix}formily-item:not(.#{$css-prefix}formily-item-feedback-layout-popover) {
+    .#{$css-prefix}formily-item-help {
+      background: var(--card-background, #ffffff);
+      box-shadow: 0 0 10px var(--card-border-color, #eaeaea);
+    }
+  }
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

package/lib/index.d.ts

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

package/lib/index.js

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

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

@@ -21,7 +21,7 @@ var _QuickAction = _interopRequireDefault(require("../QuickAction"));
 
 require("./index.scss");
 
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,6 +50,7 @@ var Layout = function Layout(props) {
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
       dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
@@ -121,7 +122,7 @@ var Layout = function Layout(props) {
           addonAfter: renderAddonAfter()
         }, dataFilter));
       } 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.default.createElement(_form.QueryFilter, _objectSpread({
+        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilter, _objectSpread({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
@@ -138,7 +139,9 @@ var Layout = function Layout(props) {
           },
           addonBefore: renderMainAction(),
           addonAfter: renderAddonAfter()
-        }, dataFilter));
+        }, dataFilter)), afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+          className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+        }, afterDataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction

package/lib/table/index.js

@@ -53,7 +53,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -161,6 +161,7 @@ var ProTable = function ProTable(props) {
       mainAction = props.mainAction,
       extra = props.extra,
       propsDataFilter = props.dataFilter,
+      afterDataFilter = props.afterDataFilter,
       toolBar = props.toolBar,
       propsColumns = props.columns,
       useRowSelection = props.useRowSelection,
@@ -849,6 +850,7 @@ var ProTable = function ProTable(props) {
         actionRef: actionRef,
         columns: propsColumns,
         dataFilter: dataFilter,
+        afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
         filterColumnType: filterColumnType

package/lib/table/index.scss

@@ -1,16 +1,9 @@
 $prefix: 'teamix-pro-table';
 $fullscreenPadding: 24px;
 
-.next-overlay-wrapper {
-  --checkbox-select-icon-content: '\ead7';
-  --checkbox-semi-select-icon-content: '\ead5';
-}
-
 .#{$prefix} {
   background: var(--table-row-bg, #ffffff);
   position: relative;
-  --checkbox-select-icon-content: '\ead7';
-  --checkbox-semi-select-icon-content: '\ead5';
   &-footer {
     padding: 8px 0;
     width: 100%;
@@ -121,7 +114,7 @@ $fullscreenPadding: 24px;
 }
 
 .next-table {
-  .next-form-preview.next-form-preview {
+  .next-form-preview {
     line-height: unset;
   }
   &-row {
@@ -141,4 +134,4 @@ $fullscreenPadding: 24px;
   a:hover {
     color: var(--color-brand1-5);
   }
-}
+}

package/lib/table/typing.d.ts

@@ -256,6 +256,8 @@ export declare type ProTableTopAreaProps = {
     extra?: ProActionButtonProps | React.ReactNode | React.ReactNode[];
     /** 数据过滤区 */
     dataFilter?: ProTableDataFilterProps;
+    /** 数据过滤区下方自定义区域 */
+    afterDataFilter?: React.ReactNode;
     /** 传给 QueryFilter 的 formRef */
     dataFilterFormRef?: any;
     /** 排序、筛选列展示状态 */