@teamix/pro 1.4.2 → 1.4.3

package/dist/pro.js

@@ -76237,7 +76237,7 @@ var DialogForm = function DialogForm(props) {
     }
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP, _extends({
     form: form,
-    schema: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(formSchema, context)
+    schema: formSchema
   }, getDefaultFormPropsByDialogSize(size), (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .addContext */ .F)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(others, context), context))));
 };
 
@@ -76463,7 +76463,8 @@ var FooterForm = function FooterForm(props) {
     layout: "inline",
     feedbackLayout: "none",
     form: form,
-    schema: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(schema, context)
+    context: context,
+    schema: schema
   });
 };
 
@@ -77540,7 +77541,7 @@ ProCardDivider.isProCardDivider = true;
 /* harmony import */ var _teamix_pro_field__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(35511);
 /* harmony import */ var _card_container__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(18110);
 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -77617,6 +77618,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,
@@ -77763,7 +77765,7 @@ var ProCard = function ProCard(props) {
     component: "img",
     src: image
   }), (title || extra) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Card.Header, {
-    title: loading ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_8__/* .ProSkeletonRaw.Card.Title */ .vR.Card.Title, null) : renderTitle(),
+    title: loading && !contentLoading ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_8__/* .ProSkeletonRaw.Card.Title */ .vR.Card.Title, null) : renderTitle(),
     subTitle: !loading && subTitle,
     extra: !loading && renderActionGroup(extra, context)
   }), hasDivider && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Card.Divider, null), showContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Card.Content, {
@@ -77771,7 +77773,7 @@ var ProCard = function ProCard(props) {
       padding: 0,
       margin: 0
     } : {}
-  }, loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_8__/* .ProSkeletonRaw.Card.Content */ .vR.Card.Content, null), !loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+  }, (loading || contentLoading) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_8__/* .ProSkeletonRaw.Card.Content */ .vR.Card.Content, null), !loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
   }, empty && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -80025,12 +80027,11 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
       validateFirst: validateFirst
     });
   }, []);
-  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.usePrefixCls)('teamix-pro-form');
+  var prefixCls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.usePrefixCls)('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
-  var mergedScope = _extends({}, globalScope, scope, {
+  var mergedScope = _extends({}, context, globalScope, scope, {
     context: context
-  }); // context需要实名不能解构
-
+  });
 
   var mergedComponents = _extends({}, globalComponents, components, formilyComponents, _Components_ProField__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z);
 
@@ -82453,7 +82454,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
 
 
 
-var version = '1.4.2';
+var version = '1.4.3';
 
 
 /***/ }),
@@ -87357,7 +87358,7 @@ var Filter = function Filter(props) {
 /* harmony import */ var _form__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(89417);
 /* harmony import */ var _ToolBar__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(75348);
 /* harmony import */ var _QuickAction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(96379);
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -87380,6 +87381,7 @@ var Layout = function Layout(props) {
       actionRef = props.actionRef,
       dataFilter = props.dataFilter,
       dataFilterFormRef = props.dataFilterFormRef,
+      afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded); // 渲染主操作区
 
@@ -87451,7 +87453,7 @@ var Layout = function Layout(props) {
           addonAfter: renderAddonAfter()
         }, dataFilter));
       } else if ((dataFilter == null ? void 0 : (_dataFilter$schema2 = dataFilter.schema) == null ? void 0 : _dataFilter$schema2.length) >= 0) {
-        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilter */ .ti, _extends({
+        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_4__/* .QueryFilter */ .ti, _extends({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
             // 全屏模式下展开收起过滤器需要重新计算tableMaxHeight
@@ -87468,7 +87470,9 @@ var Layout = function Layout(props) {
           },
           addonBefore: renderMainAction(),
           addonAfter: renderAddonAfter()
-        }, dataFilter));
+        }, dataFilter)), afterDataFilter && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+          className: "mb8 " + cls('after-data-filter-wrapper')
+        }, afterDataFilter));
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
@@ -88753,7 +88757,7 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28266);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
 /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2781);
-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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -88857,6 +88861,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,
@@ -89531,6 +89536,7 @@ var ProTable = function ProTable(props) {
         actionRef: actionRef,
         columns: propsColumns,
         dataFilter: dataFilter,
+        afterDataFilter: afterDataFilter,
         dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
         rowSelection: rowSelection,
         filterColumnType: filterColumnType
@@ -92026,8 +92032,8 @@ var setTheme = function setTheme(basicTheme, customTheme) {
 
   // 适配 ssr
   if (window && (_window = window) != null && _window.document) {
-    // 为拓扑图切换发出事件：
-    document.dispatchEvent(new CustomEvent('setTopoTheme', {
+    // 发出事件用于监听：
+    document.dispatchEvent(new CustomEvent('setTheme', {
       detail: {
         theme: basicTheme,
         brand: customTheme
@@ -93923,6 +93929,9 @@ var getValueByValue = function getValueByValue(array, inputValue, keyMap) {
       outputValue = inputValue.map(function (v) {
         return getValueByValue(array, v, keyMap);
       });
+    } else if ((0,_checkers__WEBPACK_IMPORTED_MODULE_0__/* .isPlainObj */ .Uk)(inputValue)) {
+      var objectValue = inputValue;
+      outputValue = getValueByValue(array, objectValue[inputKey], keyMap);
     } else {
       array.forEach(function (obj) {
         if (outputValue === undefined) {