@teamix/pro 1.4.7 → 1.4.8

package/dist/pro.js

@@ -76036,6 +76036,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 
 
+var toJS = _form__WEBPACK_IMPORTED_MODULE_3__/* .formilyReactive.toJS */ .SP.toJS;
 
 function getDefaultFormPropsByDialogSize(size) {
   if (size === 'small') {
@@ -76182,51 +76183,55 @@ function useDialogFormAction(action, context) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var _innerFormRef$current;
 
-          var beforeRequestContext, requestContext;
+          var beforeRequestContext, fields, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
+                  fields = toJS((_innerFormRef$current = innerFormRef.current) == null ? void 0 : _innerFormRef$current.values);
+
                   if (!propsBeforeRequest) {
-                    _context.next = 13;
+                    _context.next = 14;
                     break;
                   }
 
-                  _context.prev = 1;
-                  _context.next = 4;
-                  return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.resolveMaybePromiseMethod)(propsBeforeRequest, context);
+                  _context.prev = 2;
+                  _context.next = 5;
+                  return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.resolveMaybePromiseMethod)(propsBeforeRequest, _extends({}, context, {
+                    fields: fields
+                  }));
 
-                case 4:
+                case 5:
                   beforeRequestContext = _context.sent;
-                  _context.next = 10;
+                  _context.next = 11;
                   break;
 
-                case 7:
-                  _context.prev = 7;
-                  _context.t0 = _context["catch"](1);
+                case 8:
+                  _context.prev = 8;
+                  _context.t0 = _context["catch"](2);
                   beforeRequestContext = false;
 
-                case 10:
+                case 11:
                   if (!(beforeRequestContext === false)) {
-                    _context.next = 13;
+                    _context.next = 14;
                     break;
                   }
 
                   reject(false);
                   return _context.abrupt("return");
 
-                case 13:
+                case 14:
                   requestContext = Object.assign({
-                    fields: (_innerFormRef$current = innerFormRef.current) == null ? void 0 : _innerFormRef$current.values
+                    fields: fields
                   }, typeof beforeRequestContext === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
-                case 15:
+                case 16:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[1, 7]]);
+          }, _callee, null, [[2, 8]]);
         })))["catch"](function () {
           resolve(false);
         });
@@ -76321,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", "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"],
     _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); }
@@ -76388,6 +76393,7 @@ function useDialogAction(action, actionContext, hasForm) {
 
     var trigger = action.trigger,
         url = action.url,
+        customRequest = action.customRequest,
         method = action.method,
         params = action.params,
         data = action.data,
@@ -82335,6 +82341,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _nocode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(59047);
 /* harmony import */ var _templates__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(3397);
 /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(89227);
+var _window;
+
 
 
 
@@ -82354,7 +82362,10 @@ __webpack_require__.r(__webpack_exports__);
 
  // 设置图标源
 
-_teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConfig(_utils__WEBPACK_IMPORTED_MODULE_10__/* ["default"].getTeamixIconConfig */ .ZP.getTeamixIconConfig());
+if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
+  _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConfig(_utils__WEBPACK_IMPORTED_MODULE_10__/* ["default"].getTeamixIconConfig */ .ZP.getTeamixIconConfig());
+}
+
 
 
 
@@ -82368,7 +82379,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
 
 
 
-var version = '1.4.7';
+var version = '1.4.8';
 
 
 /***/ }),
@@ -92814,37 +92825,39 @@ function doCommonRequest(config, context, history, extraParams) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              beforeRequestContext = false;
+
               if (!beforeRequest) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
 
-              _context2.prev = 1;
-              _context2.next = 4;
+              _context2.prev = 2;
+              _context2.next = 5;
               return resolveMaybePromiseMethod(beforeRequest, context);
 
-            case 4:
+            case 5:
               beforeRequestContext = _context2.sent;
-              _context2.next = 10;
+              _context2.next = 11;
               break;
 
-            case 7:
-              _context2.prev = 7;
-              _context2.t0 = _context2["catch"](1);
-              beforeRequestContext = false;
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](2);
+              console.warn(_context2.t0);
 
-            case 10:
+            case 11:
               if (!(beforeRequestContext === false)) {
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
               }
 
               reject(false);
               return _context2.abrupt("return");
 
-            case 13:
+            case 14:
               if (!(!url && !customRequest)) {
-                _context2.next = 17;
+                _context2.next = 18;
                 break;
               }
 
@@ -92855,7 +92868,7 @@ function doCommonRequest(config, context, history, extraParams) {
               resolve(true);
               return _context2.abrupt("return");
 
-            case 17:
+            case 18:
               requestContext = Object.assign({}, context, typeof beforeRequestContext === 'object' ? beforeRequestContext : {});
               paramsWithContext = Object.assign({}, extraParams, handleExtendParmas(extendParams, requestContext), params, data);
               reuqestParams = (0,_getTargetValue__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP)(paramsWithContext, requestContext);
@@ -92894,7 +92907,7 @@ function doCommonRequest(config, context, history, extraParams) {
                 }, requestContext));
               };
 
-              requestResult = customRequest ? customRequest(context) : (0,_request__WEBPACK_IMPORTED_MODULE_2__/* .request */ .WY)(_extends({}, config, requestConfig));
+              requestResult = customRequest ? customRequest(requestContext) : (0,_request__WEBPACK_IMPORTED_MODULE_2__/* .request */ .WY)(_extends({}, config, requestConfig));
               requestResult.then( /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(response) {
                   var res;
@@ -92925,12 +92938,12 @@ function doCommonRequest(config, context, history, extraParams) {
                 reject(error);
               });
 
-            case 25:
+            case 26:
             case "end":
               return _context2.stop();
           }
         }
-      }, _callee2, null, [[1, 7]]);
+      }, _callee2, null, [[2, 8]]);
     }));
 
     return function (_x, _x2) {