@wavemaker/react-runtime 11.14.1-rc.241 → 11.14.2-1.6423

package/higherOrder/BasePage.js

@@ -1,13 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withPageContext = exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
@@ -31,14 +32,14 @@ var _appstore = _interopRequireDefault(require("@wavemaker/react-runtime/core/ap
 var _scriptRegistry = require("@wavemaker/react-runtime/core/script-registry");
 var _formatters = _interopRequireDefault(require("../core/formatters"));
 var _AppContext2 = require("../context/AppContext");
-var _utils = require("../core/util/utils");
 var _widgetCleanupUtil = require("../utils/widget-cleanup-util");
 var _pageParamsUtil = require("../utils/page-params-util");
 var _constants = require("../core/constants");
 var _AppSpinnerProvider = require("../context/AppSpinnerProvider");
 var _lodash = require("lodash");
 var _events = require("../core/constants/events");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
+var _libErrorSkipper = require("../utils/lib-error-skipper");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -94,9 +95,6 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     var _useState = (0, _react.useState)(false),
       isInitialized = _useState[0],
       setIsInitialized = _useState[1];
-    var _useState2 = (0, _react.useState)(false),
-      startupComplete = _useState2[0],
-      setStartupComplete = _useState2[1];
     var redirectHandledRef = (0, _react.useRef)(false);
 
     // Refs for managing component lifecycle
@@ -106,14 +104,14 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     var pageProxyRef = (0, _react.useRef)(null);
     var isInitializingRef = (0, _react.useRef)(false);
     var isMountedRef = (0, _react.useRef)(true);
-    var startupInvokedRef = (0, _react.useRef)(false);
     var usedFallbackAppVarsRef = (0, _react.useRef)(false);
     var appVarSubscriptionsDoneRef = (0, _react.useRef)(false);
     var subscribedVariableNamesRef = (0, _react.useRef)(new Set());
     var cleanupUtilRef = (0, _react.useRef)(null);
+    var isContentReadyRef = (0, _react.useRef)(false);
 
     // Initial page context state
-    var _useState3 = (0, _react.useState)(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
+    var _useState2 = (0, _react.useState)(_objectSpread(_objectSpread(_objectSpread(_objectSpread({
         Widgets: {},
         Variables: {},
         Actions: {},
@@ -134,9 +132,8 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         executeStartup: executeStartup,
         formatters: _formatters["default"]
       })),
-      pageContext = _useState3[0],
-      setPageContext = _useState3[1];
-
+      pageContext = _useState2[0],
+      setPageContext = _useState2[1];
     // Enhanced initial app config that inherits from app context if available
     var initialAppConfig = (0, _react.useMemo)(function () {
       return appContext;
@@ -297,31 +294,30 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
                   newParams = (0, _pageParamsUtil.computeMergedPageParams)(urlParams, {
                     componentType: componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType,
                     props: props
-                  }); // Update proxy with merged variables and actions
+                  });
+                  appProxy.appLocale = i18n.appLocale || {};
+
+                  // Update proxy with merged variables and actions
                   pageProxy.Variables = Variables;
                   pageProxy.Actions = Actions;
                   pageProxy.pageParams = _objectSpread({}, newParams);
-                  pageProxy.App = _objectSpread(_objectSpread(_objectSpread({}, initialAppConfig), appVariables), {}, {
-                    pageParams: _objectSpread({}, newParams),
-                    selectedLocale: i18n.selectedLocale || "en"
-                  });
+                  pageProxy.App = _objectSpread(_objectSpread({}, appProxy), initialAppConfig);
+                  pageProxy.pageParams = _objectSpread({}, newParams);
+                  pageProxy.selectedLocale = i18n.selectedLocale || "en";
 
                   // Setup variable event handlers
                   setupVariableSubscriptions(pageVariables.Variables);
                   if ((componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType) === "PAGE" && appProxy) {
                     pageName = componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentName;
                     appProxy.updateActivePage(pageName);
+                    appProxy.activePage = pageProxy;
                   }
 
                   // Initialize page script
-                  try {
-                    addPageScript(appProxy, pageProxy);
-                  } catch (e) {
-                    if ((0, _utils.isJQueryError)(e)) {
-                      appContext === null || appContext === void 0 || appContext.notifyApp("React App is not supporting this functionality check console for more details", "Error");
-                    }
-                    console.error(e);
-                  }
+                  addPageScript(appProxy, pageProxy);
+
+                  // Gaurd for unsupported third party functionality
+                  (0, _libErrorSkipper.wrapWithThirdPartyErrorGuard)(pageProxy, appContext, (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentName) || "Prefab");
 
                   // Setup global wm object for pages
                   if ((componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType) === "PAGE") {
@@ -432,18 +428,25 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
     (0, _react.useEffect)(function () {
       if (prefabInfo && (componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType) === "PREFAB") {
         var handlePrefabStateRefresh = function handlePrefabStateRefresh(data) {
+          var proxy = pageProxyRef.current;
           Object.keys(data).forEach(function (key) {
-            var onPropertyChange = pageProxyRef.current.onPropertyChange;
-            if (onPropertyChange) {
-              onPropertyChange(data[key].key, data[key].newValue, data[key].oldValue);
-              // pageProxyRef.current[data[key].key] = data[key].newValue;
-              pageContext.Widgets[data[key].key] = data[key].newValue;
+            var _data$key$newValue;
+            var propKey = data[key].key;
+            var newValue = (_data$key$newValue = data[key].newValue) !== null && _data$key$newValue !== void 0 ? _data$key$newValue : data[key].oldValue;
+            if (newValue && (0, _typeof2["default"])(newValue) === "object") {
+              newValue = (0, _cloneDeep["default"])(newValue);
+            }
+
+            // Call onPropertyChange if available
+            if (proxy && proxy.onPropertyChange) {
+              proxy[propKey] = newValue;
+              proxy.onPropertyChange(propKey, newValue, data[key].oldValue);
             }
           });
         };
-        _events.EVENTEMITTER_METHODS.PREFAB_STATE_SYNC_ON(handlePrefabStateRefresh);
+        _events.EVENTEMITTER_METHODS.PREFAB_STATE_SYNC_ON(prefabInfo === null || prefabInfo === void 0 ? void 0 : prefabInfo.name, handlePrefabStateRefresh);
         return function () {
-          _events.EVENTEMITTER_METHODS.PREFAB_STATE_SYNC_OFF(handlePrefabStateRefresh);
+          _events.EVENTEMITTER_METHODS.PREFAB_STATE_SYNC_OFF(prefabInfo === null || prefabInfo === void 0 ? void 0 : prefabInfo.name, handlePrefabStateRefresh);
         };
       }
     }, [prefabInfo, componentInfo === null || componentInfo === void 0 ? void 0 : componentInfo.componentType]);
@@ -532,17 +535,12 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
 
               // If no startup operations, mark as complete immediately
               if (!(startUpActions.length === 0 && startUpVariables.length === 0)) {
-                _context2.next = 6;
+                _context2.next = 5;
                 break;
               }
-              setTimeout(function () {
-                if (isMountedRef.current) {
-                  setStartupComplete(true);
-                }
-              }, 100);
               return _context2.abrupt("return");
-            case 6:
-              _context2.prev = 6;
+            case 5:
+              _context2.prev = 5;
               // Execute startup actions
               startUpActions.forEach(function (actionName) {
                 var _Actions$actionName;
@@ -563,28 +561,22 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
                 }
                 return Promise.resolve();
               });
-              _context2.next = 11;
+              _context2.next = 10;
               return Promise.allSettled(variablePromises);
-            case 11:
+            case 10:
               startUpVariableLoadedRef.current = true;
               pendingStartupOpsRef.current.clear();
-              if (isMountedRef.current) {
-                setStartupComplete(true);
-              }
-              _context2.next = 20;
+              _context2.next = 17;
               break;
-            case 16:
-              _context2.prev = 16;
-              _context2.t0 = _context2["catch"](6);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](5);
               console.error("Error during startup operations:", _context2.t0);
-              if (isMountedRef.current) {
-                setStartupComplete(true); // Set complete even on error to prevent hanging
-              }
-            case 20:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[6, 16]]);
+        }, _callee2, null, [[5, 14]]);
       }));
       return function executeStartupOperations(_x, _x2) {
         return _ref9.apply(this, arguments);
@@ -616,36 +608,30 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
 
     // Content ready callback
     function onContentReady() {
-      if (appContext !== null && appContext !== void 0 && appContext.onPageReady && pageContext.type === "PAGE") {
-        appContext.onPageReady(pageContext.componentName, pageProxyRef.current, undefined);
-      }
       if (pageContext.onReady) {
-        try {
-          pageContext.onReady();
-        } catch (e) {
-          if ((0, _utils.isJQueryError)(e)) {
-            appContext === null || appContext === void 0 || appContext.notifyApp("React App is not supporting this functionality check console for more details", "Error");
-          }
-          console.error(e);
-        }
+        pageContext.onReady();
       }
+      if (appContext !== null && appContext !== void 0 && appContext.onPageReady && pageContext.componentType === "PAGE") {
+        appContext.onPageReady(pageContext.componentName, pageProxyRef.current, undefined);
+      }
+      return Promise.resolve();
     }
     function executeStartup() {
       return _executeStartup.apply(this, arguments);
     } // Update pageContext.appLocale when i18n.appLocale changes
     function _executeStartup() {
-      _executeStartup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      _executeStartup = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               appContext === null || appContext === void 0 || appContext.executeStartAppOperations();
-              _context3.next = 3;
+              _context4.next = 3;
               return executeStartupOperations(pageContext.Variables, pageContext.Actions);
             case 3:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3);
+        }, _callee4);
       }));
       return _executeStartup.apply(this, arguments);
     }
@@ -657,17 +643,46 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
             appLocale: newAppLocale
           });
         });
+        pageContextRef.current.App.appLocale = newAppLocale;
       }
     }, [i18n.appLocale]);
-
+    var onContentReadyCalledRef = (0, _react.useRef)(false);
+    var onStartupCompletedRef = (0, _react.useRef)(false);
     // Call onContentReady when startup operations are complete
     (0, _react.useEffect)(function () {
-      if (isMountedRef.current) {
-        onContentReady();
+      if (isInitialized && isMountedRef.current && !onContentReadyCalledRef.current && pageProxyRef.current) {
+        // Mark as called before invoking to prevent duplicate calls
+        onContentReadyCalledRef.current = true;
+
+        // 1. First RAF: waits for browser to schedule the next paint
+        // 2. Second RAF: waits for the paint to complete and any nested renders
+        // This is a reliable pattern to ensure component is fully rendered
+        requestAnimationFrame(function () {
+          if (!isMountedRef.current) return;
+          requestAnimationFrame(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+            return _regenerator["default"].wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  if (!(isMountedRef.current && pageProxyRef.current)) {
+                    _context3.next = 6;
+                    break;
+                  }
+                  _context3.next = 3;
+                  return onContentReady();
+                case 3:
+                  _context3.next = 5;
+                  return executeStartup();
+                case 5:
+                  onStartupCompletedRef.current = true;
+                case 6:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _callee3);
+          })));
+        });
       }
-    }, []);
-
-    // Cleanup on unmount
+    }, [isInitialized]);
     (0, _react.useEffect)(function () {
       return function () {
         isMountedRef.current = false;
@@ -693,7 +708,14 @@ var withPageContext = exports.withPageContext = function withPageContext(Wrapped
         listener: {}
       });
     }
-    if (pageContext.autoUpdateVariables) {
+    if (appContext !== null && appContext !== void 0 && appContext.autoUpdateVariables && onStartupCompletedRef.current) {
+      var appVariables = appContext.Variables;
+      appContext.autoUpdateVariables.forEach(function (value) {
+        var _appVariables$value, _appVariables$value2;
+        ((_appVariables$value = appVariables[value]) === null || _appVariables$value === void 0 ? void 0 : _appVariables$value.invokeOnParamChange) && ((_appVariables$value2 = appVariables[value]) === null || _appVariables$value2 === void 0 ? void 0 : _appVariables$value2.invokeOnParamChange());
+      });
+    }
+    if (pageContext.autoUpdateVariables && onStartupCompletedRef.current) {
       var pageVariables = pageContext.Variables;
       componentInfo.autoUpdateVariables.forEach(function (value) {
         var _pageVariables$value, _pageVariables$value2;

package/higherOrder/BasePrefab.js

@@ -17,6 +17,7 @@ var _BasePage = _interopRequireDefault(require("@wavemaker/react-runtime/higherO
 var _appstore = _interopRequireDefault(require("@wavemaker/react-runtime/core/appstore"));
 var _appConfigSlice = require("@wavemaker/react-runtime/store/slices/appConfigSlice");
 var _PrefabContext = _interopRequireDefault(require("@wavemaker/react-runtime/context/PrefabContext"));
+var _spinner = require("../components/basic/spinner");
 var _excluded = ["pages", "partials", "componentType"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __jsx = _react["default"].createElement;
@@ -109,10 +110,13 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
     if (!prefabname) {
       return null;
     }
-    var appLocale = (0, _merge["default"])({}, (i18n === null || i18n === void 0 ? void 0 : i18n.appLocale) || {}, (i18n === null || i18n === void 0 || (_i18n$prefabMessages = i18n.prefabMessages) === null || _i18n$prefabMessages === void 0 ? void 0 : _i18n$prefabMessages[prefabname]) || {});
     if (loading) {
-      return __jsx("div", null, "Loading....");
+      return __jsx(_spinner.WmSpinner, {
+        show: true,
+        className: "baseprefab-spinner"
+      });
     }
+    var appLocale = (0, _merge["default"])({}, (i18n === null || i18n === void 0 ? void 0 : i18n.appLocale) || {}, (i18n === null || i18n === void 0 || (_i18n$prefabMessages = i18n.prefabMessages) === null || _i18n$prefabMessages === void 0 ? void 0 : _i18n$prefabMessages[prefabname]) || {});
     var FragmentConsumer = function FragmentConsumer(fragmentProps) {
       var combinedProps = _objectSpread(_objectSpread({}, props), fragmentProps);
       return __jsx(WrappedComponent, combinedProps);
@@ -126,20 +130,24 @@ var BasePrefab = exports.BasePrefab = function BasePrefab(WrappedComponent, addP
       serviceDefs: (serviceDefs === null || serviceDefs === void 0 ? void 0 : serviceDefs.serviceDefs) || {},
       appLocale: appLocale,
       prefab: true,
-      prefabName: prefabname
+      prefabName: prefabname,
+      name: props.name
     });
-    return __jsx(EnhancedComponent, props);
+    return __jsx(_react["default"].Fragment, null, __jsx(EnhancedComponent, props));
   }, function (next, prev) {
     return next.prefabname === prev.prefabname;
   });
+  BasePrefabWrapper.displayName = "BasePrefabWrapper";
   var BasePrefabWithProvider = function BasePrefabWithProvider(props) {
     return __jsx(_PrefabContext["default"], {
       value: {
         inbound: props.inbound || {},
-        outbound: props.outbound || {}
+        outbound: props.outbound || {},
+        prefabName: props.name
       }
     }, __jsx(BasePrefabWrapper, props));
   };
+  BasePrefabWithProvider.displayName = "BasePrefabWithProvider";
   return BasePrefabWithProvider;
 };
 var _default = exports["default"] = BasePrefab;

package/higherOrder/withBaseWrapper.js

@@ -33,7 +33,7 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
       rest = (0, _objectWithoutProperties2["default"])(props, _excluded);
 
     // All hooks must be called before any early returns
-    var _useDeviceVisibility = (0, _useDeviceVisibility2.useDeviceVisibility)(props.showindevices || ["all"]),
+    var _useDeviceVisibility = (0, _useDeviceVisibility2.useDeviceVisibility)(props.showindevice || ["all"]),
       isHidden = _useDeviceVisibility.isHidden;
     var _usePageContext = (0, _WidgetProvider.usePageContext)(),
       pageContext = _usePageContext.pageContext,
@@ -61,7 +61,7 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
 
     // Compute merged props in a memoized way
     var mergedProps = (0, _react.useMemo)(function () {
-      var _widget$datavalue;
+      var _props$datavalue;
       if (!name || !(pageContext !== null && pageContext !== void 0 && pageContext.Widgets) || (props === null || props === void 0 ? void 0 : props.iswidget) === "false") {
         return props;
       }
@@ -74,7 +74,7 @@ var withBaseWrapper = exports.withBaseWrapper = function withBaseWrapper(Wrapped
       // OR if no widget-id filtering is needed (backward compatibility)
       var shouldMergeFromContext = !componentWidgetId || !contextWidgetId || componentWidgetId === contextWidgetId;
       var mergedState = _objectSpread({}, props);
-      var datavalue = (_widget$datavalue = widget.datavalue) !== null && _widget$datavalue !== void 0 ? _widget$datavalue : props.datavalue;
+      var datavalue = (_props$datavalue = props.datavalue) !== null && _props$datavalue !== void 0 ? _props$datavalue : widget.datavalue;
       if (shouldMergeFromContext && (0, _scriptRegistry.isWidgetOverridden)(name, componentWidgetId)) {
         // Apply widget-id specific overridden properties from the registry
         var widgetOverrides = (0, _scriptRegistry.getWidgetOverrides)(name, componentWidgetId);

package/hooks/useDataSourceSubscription.js

@@ -74,7 +74,7 @@ var useDataSourceSubscription = exports.useDataSourceSubscription = function use
       }
       if (datasource && datasource.execute && datasource.execute(_types.DataSource.Operation.IS_API_AWARE) && isDataSourceEqual(data.variable, datasource)) {
         // Handle state params only on page load (first time)
-        if (pageLoadRef.current && statehandler.toLowerCase() !== "none") {
+        if (pageLoadRef.current && statehandler && statehandler.toLowerCase() !== "none") {
           pageLoadRef.current = false; // Mark as handled
 
           // Use appropriate state getter based on widget type

package/hooks/useHttp.js

@@ -87,18 +87,25 @@ var ModernHttpService = /*#__PURE__*/function () {
     key: "send",
     value: function () {
       var _send = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(options, variable) {
-        var serviceInfo, headers, requestBody, url, _options$url$replace, methodType, isNonDataMethod, axiosConfig, response;
+        var serviceInfo, headers, requestBody, url, _serviceInfo$proxySet, isProxyCall, _options$url$replace, methodType, isNonDataMethod, axiosConfig, response;
         return _regenerator["default"].wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               serviceInfo = variable.serviceInfo;
               headers = new _axios.AxiosHeaders(options.headers);
               requestBody = options.data;
-              url = options.url;
               variable.cancelTokenSource = _axios["default"].CancelToken.source();
+              url = options.url;
+              if (serviceInfo) {
+                serviceInfo.proxySettings = (serviceInfo === null || serviceInfo === void 0 ? void 0 : serviceInfo.proxySettings) || {
+                  web: true
+                };
+                isProxyCall = serviceInfo === null || serviceInfo === void 0 || (_serviceInfo$proxySet = serviceInfo.proxySettings) === null || _serviceInfo$proxySet === void 0 ? void 0 : _serviceInfo$proxySet.web;
+                url = isProxyCall ? options.url : serviceInfo === null || serviceInfo === void 0 ? void 0 : serviceInfo.directPath;
+              }
               if (variable.category === "wm.LiveVariable" && !(url.startsWith("http://") || url.startsWith("https://"))) {
                 url = variable.config.baseUrl + options.url.replace("./", "/");
-              } else if (options.isExtURL && options.url.startsWith("http")) {
+              } else if (url === (serviceInfo === null || serviceInfo === void 0 ? void 0 : serviceInfo.directPath) && options.url.startsWith("http")) {
                 url = options.url;
               } else {
                 url = variable.config.baseUrl + ((_options$url$replace = options.url.replace("./services", "")) === null || _options$url$replace === void 0 ? void 0 : _options$url$replace.replace("./", "/"));
@@ -133,27 +140,27 @@ var ModernHttpService = /*#__PURE__*/function () {
               if (options !== null && options !== void 0 && options.onUploadProgress) {
                 axiosConfig.onUploadProgress = options.onUploadProgress;
               }
-              _context2.prev = 12;
-              _context2.next = 15;
+              _context2.prev = 13;
+              _context2.next = 16;
               return this.axiosInstance.request(axiosConfig);
-            case 15:
+            case 16:
               response = _context2.sent;
               if (!(variable.operation === "getDownloadFile" || (serviceInfo === null || serviceInfo === void 0 ? void 0 : serviceInfo.operationId) === "FileController_getDownloadFile")) {
-                _context2.next = 18;
+                _context2.next = 19;
                 break;
               }
               return _context2.abrupt("return", this.handleFileDownload(response, options, variable));
-            case 18:
+            case 19:
               return _context2.abrupt("return", response);
-            case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](12);
+            case 22:
+              _context2.prev = 22;
+              _context2.t0 = _context2["catch"](13);
               throw _context2.t0.response || _context2.t0;
-            case 24:
+            case 25:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[12, 21]]);
+        }, _callee2, this, [[13, 22]]);
       }));
       function send(_x2, _x3) {
         return _send.apply(this, arguments);

package/mui-config/theme.js

@@ -86,6 +86,9 @@ var theme = (0, _styles.createTheme)({
               borderRadius: "0 !important"
             }
           }
+        },
+        paper: {
+          width: "var(--wm-modal-width)"
         }
       }
     },