@alicloud/alfa-react 1.4.15 → 1.4.18

package/es/createApplication.js

@@ -43,8 +43,8 @@ export default function createApplication(loader) {
 
     var _useState = useState(null),
         _useState2 = _slicedToArray(_useState, 2),
-        app = _useState2[0],
-        setApp = _useState2[1];
+        appInstance = _useState2[0],
+        setAppInstance = _useState2[1];
 
     var _useState3 = useState(null),
         _useState4 = _slicedToArray(_useState3, 2),
@@ -53,13 +53,26 @@ export default function createApplication(loader) {
     var appRef = useRef(undefined);
     var tagName = normalizeName(props.name);
     var sandbox = useMemo(function () {
+      var _UA_Opt, _RISK_INFO, _um;
+
+      var aliyunExternalsVars = [];
+
+      if ((_UA_Opt = window.UA_Opt) !== null && _UA_Opt !== void 0 && _UA_Opt.LogVal) {
+        var _UA_Opt2;
+
+        aliyunExternalsVars.push('UA_Opt');
+        aliyunExternalsVars.push((_UA_Opt2 = window.UA_Opt) === null || _UA_Opt2 === void 0 ? void 0 : _UA_Opt2.LogVal);
+      }
+
+      if ((_RISK_INFO = window.RISK_INFO) !== null && _RISK_INFO !== void 0 && _RISK_INFO.UMID) aliyunExternalsVars.push('RISK_INFO');
+      if ((_um = window.um) !== null && _um !== void 0 && _um.getToken) aliyunExternalsVars.push('um');
       return _objectSpread(_objectSpread({}, customSandbox), {}, {
         // allowResources: [
         //   ...(customSandbox?.allowResources || []),
         //   /^https?:\/\/at\.alicdn\.com\//,
         // ],
         externalsVars: [].concat(_toConsumableArray((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
-        '_console_base_ready_'])
+        '_console_base_ready_'], aliyunExternalsVars)
       });
     }, [customSandbox]);
     var memoOptions = useMemo(function () {
@@ -86,6 +99,7 @@ export default function createApplication(loader) {
       };
     }, []);
     useEffect(function () {
+      var isUnmounted = false;
       var App;
 
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
@@ -106,21 +120,29 @@ export default function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 app = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                App = app;
+                App = app; // container has been unmounted
 
-                if (app) {
+                if (!isUnmounted) {
                   _context.next = 8;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 8:
+                if (app) {
+                  _context.next = 10;
+                  break;
+                }
+
                 return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                   E_CODE: 'RuntimeError',
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 10:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 12;
                   break;
                 }
 
@@ -129,18 +151,18 @@ export default function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
+              case 12:
                 // update body in sandbox context
                 (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
-                _context.next = 13;
+                _context.next = 15;
                 return app.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
-                setApp(app);
+              case 15:
+                setAppInstance(app);
 
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -153,12 +175,13 @@ export default function createApplication(loader) {
       });
 
       return function () {
+        isUnmounted = true;
         App && App.unmount();
       };
     }, [memoOptions]);
 
-    if (app) {
-      app.update(customProps);
+    if (appInstance) {
+      appInstance.update(customProps);
     }
 
     var dataAttrs = {
@@ -166,7 +189,7 @@ export default function createApplication(loader) {
       'data-version': version,
       'data-loader': loaderVersion
     };
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !app ? /*#__PURE__*/React.createElement(Loading, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, !appInstance ? /*#__PURE__*/React.createElement(Loading, {
       loading: loading
     }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/React.createElement(tagName, _objectSpread({
       style: style,

package/es/utils/getConsoleConfig.js

@@ -34,8 +34,12 @@ var processFeatures = function processFeatures(features) {
       newFeatures[key] = true;
     } else if (enableSampling) {
       var gray = uid.substring(uid.length - 2);
-      if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) newFeatures[key] = false;
-      newFeatures[key] = true;
+
+      if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) {
+        newFeatures[key] = false;
+      } else {
+        newFeatures[key] = true;
+      }
     } else {
       newFeatures[key] = false;
     }

package/es/version.js

@@ -1 +1 @@
-export var version = '1.4.15';
+export var version = '1.4.18';

package/lib/createApplication.js

@@ -65,8 +65,8 @@ function createApplication(loader) {
 
     var _useState = (0, _react.useState)(null),
         _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-        app = _useState2[0],
-        setApp = _useState2[1];
+        appInstance = _useState2[0],
+        setAppInstance = _useState2[1];
 
     var _useState3 = (0, _react.useState)(null),
         _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
@@ -75,13 +75,26 @@ function createApplication(loader) {
     var appRef = (0, _react.useRef)(undefined);
     var tagName = (0, _utils.normalizeName)(props.name);
     var sandbox = (0, _react.useMemo)(function () {
+      var _UA_Opt, _RISK_INFO, _um;
+
+      var aliyunExternalsVars = [];
+
+      if ((_UA_Opt = window.UA_Opt) !== null && _UA_Opt !== void 0 && _UA_Opt.LogVal) {
+        var _UA_Opt2;
+
+        aliyunExternalsVars.push('UA_Opt');
+        aliyunExternalsVars.push((_UA_Opt2 = window.UA_Opt) === null || _UA_Opt2 === void 0 ? void 0 : _UA_Opt2.LogVal);
+      }
+
+      if ((_RISK_INFO = window.RISK_INFO) !== null && _RISK_INFO !== void 0 && _RISK_INFO.UMID) aliyunExternalsVars.push('RISK_INFO');
+      if ((_um = window.um) !== null && _um !== void 0 && _um.getToken) aliyunExternalsVars.push('um');
       return _objectSpread(_objectSpread({}, customSandbox), {}, {
         // allowResources: [
         //   ...(customSandbox?.allowResources || []),
         //   /^https?:\/\/at\.alicdn\.com\//,
         // ],
         externalsVars: [].concat((0, _toConsumableArray2.default)((customSandbox === null || customSandbox === void 0 ? void 0 : customSandbox.externalsVars) || []), [// global vars used in ConsoleBase.forApp
-        '_console_base_ready_'])
+        '_console_base_ready_'], aliyunExternalsVars)
       });
     }, [customSandbox]);
     var memoOptions = (0, _react.useMemo)(function () {
@@ -108,6 +121,7 @@ function createApplication(loader) {
       };
     }, []);
     (0, _react.useEffect)(function () {
+      var isUnmounted = false;
       var App;
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _app$context$updateBo, _app$context;
@@ -127,21 +141,29 @@ function createApplication(loader) {
                 _yield$loader$registe = _context.sent;
                 app = _yield$loader$registe.app;
                 logger = _yield$loader$registe.logger;
-                App = app;
+                App = app; // container has been unmounted
 
-                if (app) {
+                if (!isUnmounted) {
                   _context.next = 8;
                   break;
                 }
 
+                return _context.abrupt("return");
+
+              case 8:
+                if (app) {
+                  _context.next = 10;
+                  break;
+                }
+
                 return _context.abrupt("return", (logger === null || logger === void 0 ? void 0 : logger.error) && logger.error({
                   E_CODE: 'RuntimeError',
                   E_MSG: 'load app failed.'
                 }));
 
-              case 8:
+              case 10:
                 if (appRef.current) {
-                  _context.next = 10;
+                  _context.next = 12;
                   break;
                 }
 
@@ -150,18 +172,18 @@ function createApplication(loader) {
                   E_MSG: 'cannot find container.'
                 }));
 
-              case 10:
+              case 12:
                 // update body in sandbox context
                 (_app$context$updateBo = (_app$context = app.context).updateBody) === null || _app$context$updateBo === void 0 ? void 0 : _app$context$updateBo.call(_app$context, memoOptions.sandbox.disableFakeBody ? document.body : appRef.current);
-                _context.next = 13;
+                _context.next = 15;
                 return app.mount(appRef.current, {
                   customProps: customProps
                 });
 
-              case 13:
-                setApp(app);
+              case 15:
+                setAppInstance(app);
 
-              case 14:
+              case 16:
               case "end":
                 return _context.stop();
             }
@@ -173,12 +195,13 @@ function createApplication(loader) {
         });
       });
       return function () {
+        isUnmounted = true;
         App && App.unmount();
       };
     }, [memoOptions]);
 
-    if (app) {
-      app.update(customProps);
+    if (appInstance) {
+      appInstance.update(customProps);
     }
 
     var dataAttrs = {
@@ -186,7 +209,7 @@ function createApplication(loader) {
       'data-version': version,
       'data-loader': _version.version
     };
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !app ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !appInstance ? /*#__PURE__*/_react.default.createElement(_Loading.default, {
       loading: loading
     }) : null, sandbox && sandbox.disableFakeBody ? /*#__PURE__*/_react.default.createElement(tagName, _objectSpread({
       style: style,

package/lib/utils/getConsoleConfig.js

@@ -45,8 +45,12 @@ var processFeatures = function processFeatures(features) {
       newFeatures[key] = true;
     } else if (enableSampling) {
       var gray = uid.substring(uid.length - 2);
-      if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) newFeatures[key] = false;
-      newFeatures[key] = true;
+
+      if (Number(gray) >= (sampling !== null && sampling !== void 0 ? sampling : 0) * 100 || sampling === 0) {
+        newFeatures[key] = false;
+      } else {
+        newFeatures[key] = true;
+      }
     } else {
       newFeatures[key] = false;
     }

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.4.15';
+var version = '1.4.18';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.4.15",
+  "version": "1.4.18",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -51,5 +51,5 @@
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "cd8da1c7f940c86ceeb6e7c2bb66c46d2a5db008"
+  "gitHead": "db8e327b03e92de9a4d1670080866d488095e3b1"
 }

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.15";
+export declare const version = "1.4.18";