@teamix/pro 1.4.8 → 1.4.9

package/dist/pro.js

@@ -76326,7 +76326,7 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
-var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 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); }
@@ -76361,7 +76361,9 @@ var FooterForm = function FooterForm(props) {
   var schema = props.schema,
       context = props.context,
       formRef = props.formRef;
-  var form = (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
+  var form = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
+    return (0,_form__WEBPACK_IMPORTED_MODULE_6__/* .createForm */ .Np)();
+  }, []);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     formRef.current = form;
   }, []);
@@ -76404,6 +76406,8 @@ function useDialogAction(action, actionContext, hasForm) {
         formatResult = action.formatResult,
         onSuccess = action.onSuccess,
         onError = action.onError,
+        propsOnOk = action.onOk,
+        propsOnCancel = action.onCancel,
         others = _objectWithoutPropertiesLoose(action, _excluded);
 
     var _getTargetValue = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(others, context),
@@ -76484,33 +76488,34 @@ function useDialogAction(action, actionContext, hasForm) {
 
                 case 6:
                   onFinish && onFinish();
+                  propsOnOk && propsOnOk(context);
                   resolve(true);
-                  _context.next = 18;
+                  _context.next = 19;
                   break;
 
-                case 10:
-                  _context.prev = 10;
+                case 11:
+                  _context.prev = 11;
                   _context.t0 = _context["catch"](2);
                   setLoading(false); // 如果 beforeRequest 中返回了 false 并且不是 dialog-form，则直接关闭弹窗
 
                   if (!(beforeRequest && !hasForm)) {
-                    _context.next = 16;
+                    _context.next = 17;
                     break;
                   }
 
                   resolve(true);
                   return _context.abrupt("return");
 
-                case 16:
+                case 17:
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 18:
+                case 19:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[2, 10]]);
+          }, _callee, null, [[2, 11]]);
         }));
 
         return function (_x) {
@@ -76533,7 +76538,9 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
+      propsOnCancel && propsOnCancel(context);
+    }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-before-content"
     }, addContextForReactNode(beforeContent, dialogContext)), message && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-message"
@@ -79999,7 +80006,7 @@ var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function
         });
       });
     }
-  }, [onChange]);
+  }, [onChange, form]);
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
     // 配置国际化
     (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.setValidateLanguage)((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getLanguage)() || 'zh-cn');
@@ -82379,7 +82386,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.8';
+var version = '1.4.9';
 
 
 /***/ }),
@@ -87189,7 +87196,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2;
+      var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _extends2, _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
 
       (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterDataSource == null ? void 0 : _actionRef$current2.filterDataSource(column.dataIndex); // 先获取此列的param
 
@@ -87208,24 +87215,18 @@ var Filter = function Filter(props) {
         rules: selected,
         params: param
       }, _extends2)));
+      var targetPageKey = 'currentPage';
+      var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
 
-      if (selected.length > 0) {
-        var _actionRef$current5, _actionRef$current6, _actionRef$current6$r, _actionRef$current7, _actionRef$current8;
+      if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
+        targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
+      } // 发送请求
 
-        var targetPageKey = 'currentPage';
-        var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
 
-        if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
-          targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
-        } // 发送请求
-
-
-        (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
-        (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
-
-        (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
-      }
+      (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request((_actionRef$current6$r = {}, _actionRef$current6$r[targetPageKey] = 1, _actionRef$current6$r));
+      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
 
+      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setVisible(false);
     }
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('ok')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Button, {