@next-core/brick-kit 2.164.2 → 2.164.4

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, merge, sortBy, orderBy, isObject as isObject$1, uniq, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, collectContextUsage, deferResolveContextConcurrently, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedFormState, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, scanPermissionActionsInAny, deepFreeze, matchPath, asyncProcessBrick, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import React, { useState, useEffect, useRef, useMemo, useCallback, forwardRef, useImperativeHandle, useContext, createContext, useReducer } from 'react';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import { Modal, message, Empty, ConfigProvider } from 'antd';
@@ -1900,7 +1900,12 @@ class StoryboardContextWrapper {
     }
   }
   getResolveOptions(coreContext) {
-    return this.tplContextId ? {
+    return this.formContextId ? {
+      mergedContext: _objectSpread(_objectSpread({}, coreContext), {}, {
+        formContextId: this.formContextId
+      }),
+      keyword: "FORM_STATE"
+    } : this.tplContextId ? {
       mergedContext: _objectSpread(_objectSpread({}, coreContext), {}, {
         tplContextId: this.tplContextId
       }),
@@ -2018,8 +2023,9 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
   }
   if (contextConf.track) {
     var isTemplateState = !!storyboardContextWrapper.tplContextId;
+    var isFormState = !!storyboardContextWrapper.formContextId;
     // Track its dependencies and auto update when each of them changed.
-    var deps = (isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
+    var deps = (isFormState ? trackUsedFormState : isTemplateState ? trackUsedState : trackUsedContext)(load ? contextConf.resolve : contextConf.value);
     for (var dep of deps) {
       var _eventTarget;
       var ctx = storyboardContextWrapper.get().get(dep);
@@ -11112,7 +11118,7 @@ class Router {
   render(location) {
     var _this3 = this;
     return _asyncToGenerator$3(function* () {
-      var _apiAnalyzer$getInsta, _currentApp$config, _currentApp$config$_e, _getLocalAppsTheme;
+      var _apiAnalyzer$getInsta, _currentApp$config, _currentApp$config$_e, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme;
       _this3.state = "initial";
       _this3.renderId = uniqueId("render-id-");
       resetAllInjected();
@@ -11189,9 +11195,12 @@ class Router {
       var layoutType = (currentApp === null || currentApp === void 0 ? void 0 : currentApp.layoutType) || "console";
       var faviconElement = document.querySelector("link[rel='shortcut icon']");
       var customFaviconHref = currentApp === null || currentApp === void 0 ? void 0 : (_currentApp$config = currentApp.config) === null || _currentApp$config === void 0 ? void 0 : (_currentApp$config$_e = _currentApp$config._easyops_app_favicon) === null || _currentApp$config$_e === void 0 ? void 0 : _currentApp$config$_e.default;
+      var settingsFaviconHref = (_this3$kernel$bootstr = _this3.kernel.bootstrapData.settings) === null || _this3$kernel$bootstr === void 0 ? void 0 : (_this3$kernel$bootstr2 = _this3$kernel$bootstr.brand) === null || _this3$kernel$bootstr2 === void 0 ? void 0 : _this3$kernel$bootstr2.favicon;
       if (faviconElement) {
         if (customFaviconHref) {
           faviconElement.href = /^(?:https?|data):|^\//.test(customFaviconHref) ? customFaviconHref : imagesFactory(currentApp.id, currentApp.isBuildPush).get(customFaviconHref);
+        } else if (settingsFaviconHref) {
+          faviconElement.href = settingsFaviconHref;
         } else {
           faviconElement.href = _this3.kernel.getOriginFaviconHref();
         }
@@ -11359,7 +11368,7 @@ class Router {
         // When we have a matched route other than an abstract route,
         // we say *page found*, otherwise, *page not found*.
         if (route && route.type !== "routes" || failed) {
-          var _this3$kernel$bootstr, _this3$kernel$bootstr2, _getAuth$license;
+          var _this3$kernel$bootstr3, _this3$kernel$bootstr4, _getAuth$license;
           yield pendingTask;
           main.length > 0 && mountTree(main, mountPoints.main);
           portal.length > 0 && mountTree(portal, mountPoints.portal);
@@ -11398,7 +11407,7 @@ class Router {
           var {
             loadTime = 0,
             loadInfoPage
-          } = (_this3$kernel$bootstr = (_this3$kernel$bootstr2 = _this3.kernel.bootstrapData.settings) === null || _this3$kernel$bootstr2 === void 0 ? void 0 : _this3$kernel$bootstr2.misc) !== null && _this3$kernel$bootstr !== void 0 ? _this3$kernel$bootstr : {};
+          } = (_this3$kernel$bootstr3 = (_this3$kernel$bootstr4 = _this3.kernel.bootstrapData.settings) === null || _this3$kernel$bootstr4 === void 0 ? void 0 : _this3$kernel$bootstr4.misc) !== null && _this3$kernel$bootstr3 !== void 0 ? _this3$kernel$bootstr3 : {};
           if (currentApp.isBuildPush && loadTime > 0 && renderTime > loadTime) {
             var getSecond = time => Math.floor(time * 100) / 100;
             tipsDetail.push(_objectSpread({