@next-core/brick-kit 2.133.2 → 2.134.2

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.134.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.134.1...@next-core/brick-kit@2.134.2) (2022-09-01)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+## [2.134.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.134.0...@next-core/brick-kit@2.134.1) (2022-08-31)
+
+
+### Bug Fixes
+
+* remove dead code ([61db875](https://github.com/easyops-cn/next-core/commit/61db8759d48e0de3a31c55bf2ced50cf8617a5a2))
+
+
+
+
+
+# [2.134.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.133.3...@next-core/brick-kit@2.134.0) (2022-08-30)
+
+
+### Features
+
+* support visual builder favicon ([af61b02](https://github.com/easyops-cn/next-core/commit/af61b02f8d8d507a68525264bc1348a6416d4cf8))
+* update code ([5497f33](https://github.com/easyops-cn/next-core/commit/5497f33d6b3a23831ebe24e8decb3f207d431c96))
+* update code ([2578ef5](https://github.com/easyops-cn/next-core/commit/2578ef5e313e928ba13bbc237822274910e1513b))
+* update get image type ([d151d3c](https://github.com/easyops-cn/next-core/commit/d151d3ce0ddd1211e6156f2646b96533969b3e35))
+
+
+
+
+
+## [2.133.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.133.2...@next-core/brick-kit@2.133.3) (2022-08-30)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 ## [2.133.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.133.1...@next-core/brick-kit@2.133.2) (2022-08-29)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -1352,24 +1352,6 @@
       return _ref.apply(this, arguments);
     };
   }();
-  /**
-   * @description 查询模型关联小产品列表
-   * @endpoint LIST /api/micro_app/v1/object_micro_app
-   */
-
-
-  var ObjectMicroAppApi_getObjectMicroAppList = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator__default["default"](function* (options) {
-      return (
-        /**! @contract easyops.api.micro_app.object_micro_app.GetObjectMicroAppList@1.0.0 */
-        (yield brickHttp.http.get("api/gateway/micro_app.object_micro_app.GetObjectMicroAppList/api/micro_app/v1/object_micro_app", options)).data
-      );
-    });
-
-    return function ObjectMicroAppApi_getObjectMicroAppList(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
   /**
    * @description 校验系统权限
    * @endpoint POST /api/micro_app/v1/permission/validate
@@ -3666,8 +3648,7 @@
     /* istanbul ignore next */
 
 
-    reloadSharedData() {
-      return kernel.loadSharedData();
+    reloadSharedData() {// Drop supports for related apps;
     }
     /* istanbul ignore next */
 
@@ -3769,27 +3750,25 @@
 
     /* istanbul ignore next */
     getRelatedApps(appId) {
-      // eslint-disable-next-line no-console
-      console.warn("`getRuntime().getRelatedApps()` is deprecated and will always return an empty array, please use `await getRuntime().getRelatedAppsAsync()` instead");
       return [];
     }
     /* istanbul ignore next */
 
 
     getRelatedAppsAsync(appId) {
-      return kernel.getRelatedAppsAsync(appId);
+      // eslint-disable-next-line no-console
+      console.warn("`getRuntime().getRelatedAppsAsync()` is deprecated and will always resolve with an empty array");
+      return Promise.resolve([]);
     }
     /* istanbul ignore next */
 
 
-    popWorkspaceStack() {
-      return kernel.popWorkspaceStack();
+    popWorkspaceStack() {// deprecated
     }
     /* istanbul ignore next */
 
 
-    resetWorkspaceStack() {
-      kernel.workspaceStack = [];
+    resetWorkspaceStack() {// deprecated
     }
 
     applyPageTitle(pageTitle) {
@@ -8853,19 +8832,15 @@
 
       _defineProperty__default["default"](this, "nextApp", void 0);
 
-      _defineProperty__default["default"](this, "currentUrl", void 0);
-
       _defineProperty__default["default"](this, "currentRoute", void 0);
 
-      _defineProperty__default["default"](this, "workspaceStack", []);
-
       _defineProperty__default["default"](this, "currentLayout", void 0);
 
       _defineProperty__default["default"](this, "allUserMapPromise", Promise.resolve(new Map()));
 
       _defineProperty__default["default"](this, "allMagicBrickConfigMapPromise", Promise.resolve(new Map()));
 
-      _defineProperty__default["default"](this, "allRelatedAppsPromise", Promise.resolve([]));
+      _defineProperty__default["default"](this, "originFaviconHref", void 0);
 
       _defineProperty__default["default"](this, "allMicroAppApiOrchestrationPromise", Promise.resolve(new Map()));
 
@@ -8955,7 +8930,7 @@
       var _this2 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var _this2$bootstrapData$, _this2$bootstrapData$2;
+        var _this2$bootstrapData$, _this2$bootstrapData$2, _document$querySelect;
 
         listenDevtoolsEagerly();
         _this2.mountPoints = mountPoints;
@@ -8971,16 +8946,12 @@
         }
 
         generateColorTheme((_this2$bootstrapData$ = _this2.bootstrapData.settings) === null || _this2$bootstrapData$ === void 0 ? void 0 : (_this2$bootstrapData$2 = _this2$bootstrapData$.misc) === null || _this2$bootstrapData$2 === void 0 ? void 0 : _this2$bootstrapData$2.theme);
-
-        if (isLoggedIn()) {
-          _this2.loadSharedData();
-        }
-
         _this2.menuBar = new MenuBar(_this2, "menuBar");
         _this2.appBar = new AppBar(_this2, "appBar");
         _this2.loadingBar = new BaseBar(_this2, "loadingBar");
         _this2.router = new Router(_this2);
         initAnalytics();
+        _this2.originFaviconHref = (_document$querySelect = document.querySelector("link[rel='shortcut icon']")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.href;
         yield _this2.router.bootstrap();
 
         if (!window.STANDALONE_MICRO_APPS) {
@@ -9499,12 +9470,6 @@
       document.body.classList.toggle("show-legacy-iframe", visible);
     }
 
-    loadSharedData() {
-      if (!window.STANDALONE_MICRO_APPS) {
-        this.loadRelatedAppsAsync();
-      }
-    }
-
     loadUsersAsync() {
       if (!this.loadUsersStarted) {
         this.loadUsersStarted = true;
@@ -9625,95 +9590,10 @@
       })();
     }
 
-    loadRelatedAppsAsync() {
-      this.allRelatedAppsPromise = this.loadRelatedApps();
-    }
-
-    loadRelatedApps() {
-      return _asyncToGenerator__default["default"](function* () {
-        var relatedApps = [];
-
-        try {
-          relatedApps = (yield ObjectMicroAppApi_getObjectMicroAppList()).list;
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.warn("Load related apps error:", error);
-        }
-
-        return relatedApps;
-      })();
-    }
-
-    getRelatedAppsAsync(appId) {
-      var _this11 = this;
-
-      return _asyncToGenerator__default["default"](function* () {
-        if (!appId) {
-          return [];
-        }
-
-        var allRelatedApps = yield _this11.allRelatedAppsPromise;
-        var thisApp = allRelatedApps.find(item => item.microAppId === appId);
-
-        if (!thisApp) {
-          return [];
-        }
-
-        return _.sortBy(allRelatedApps.filter(item => item.objectId === thisApp.objectId), ["order"]);
-      })();
-    }
-
-    updateWorkspaceStack() {
-      var _this12 = this;
-
-      return _asyncToGenerator__default["default"](function* () {
-        if (_this12.currentApp && _this12.currentApp.id) {
-          var workspace = {
-            appId: _this12.currentApp.id,
-            appName: _this12.currentApp.name,
-            appLocaleName: _this12.currentApp.localeName,
-            url: _this12.currentUrl
-          };
-
-          if (_this12.workspaceStack.length > 0) {
-            var previousWorkspace = _this12.workspaceStack[_this12.workspaceStack.length - 1];
-
-            var _relatedApps = yield _this12.getRelatedAppsAsync(previousWorkspace.appId);
-
-            if (_relatedApps.some(item => item.microAppId === _this12.currentApp.id)) {
-              Object.assign(previousWorkspace, workspace);
-              return;
-            }
-          }
-
-          var relatedApps = yield _this12.getRelatedAppsAsync(_this12.currentApp.id);
-
-          if (relatedApps.length > 0) {
-            _this12.workspaceStack.push(workspace);
-
-            return;
-          }
-        }
-
-        _this12.workspaceStack = [];
-      })();
-    }
-
-    getPreviousWorkspace() {
-      if (this.workspaceStack.length > 1) {
-        return this.workspaceStack[this.workspaceStack.length - 2];
-      }
-    }
-
-    popWorkspaceStack() {
-      this.workspaceStack.pop();
-    }
-
     getRecentApps() {
       return {
         previousApp: this.previousApp,
-        currentApp: this.currentApp,
-        previousWorkspace: this.getPreviousWorkspace()
+        currentApp: this.currentApp
       };
     }
 
@@ -9741,23 +9621,27 @@
       });
     }
 
+    getOriginFaviconHref() {
+      return this.originFaviconHref;
+    }
+
     getProviderBrick(provider) {
-      var _this13 = this;
+      var _this11 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (isCustomApiProvider(provider)) {
           provider = CUSTOM_API_PROVIDER;
         }
 
-        if (_this13.providerRepository.has(provider)) {
-          return _this13.providerRepository.get(provider);
+        if (_this11.providerRepository.has(provider)) {
+          return _this11.providerRepository.get(provider);
         }
 
         if (provider === CUSTOM_API_PROVIDER && !customElements.get(provider)) {
           registerCustomApi();
         }
 
-        yield _this13.loadDynamicBricks([provider]);
+        yield _this11.loadDynamicBricks([provider]);
 
         if (!customElements.get(provider)) {
           throw new Error("Provider not defined: \"".concat(provider, "\"."));
@@ -9765,7 +9649,7 @@
 
         var brick = document.createElement(provider);
 
-        _this13.providerRepository.set(provider, brick);
+        _this11.providerRepository.set(provider, brick);
 
         return brick;
       })();
@@ -11936,7 +11820,7 @@
       var _this3 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var _apiAnalyzer$getInsta, _getLocalAppsTheme;
+        var _apiAnalyzer$getInsta, _currentApp$config, _currentApp$config$_e, _getLocalAppsTheme;
 
         _this3.state = "initial";
         _this3.renderId = _.uniqueId("render-id-");
@@ -11996,6 +11880,17 @@
         var legacy = currentApp ? currentApp.legacy : undefined;
         _this3.kernel.nextApp = currentApp;
         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;
+
+        if (faviconElement) {
+          if (customFaviconHref) {
+            faviconElement.href = /^(?:https?|data):|^\//.test(customFaviconHref) ? customFaviconHref : imagesFactory(currentApp.id, currentApp.isBuildPush).get(customFaviconHref);
+          } else {
+            faviconElement.href = _this3.kernel.getOriginFaviconHref();
+          }
+        }
+
         setTheme(((_getLocalAppsTheme = getLocalAppsTheme()) === null || _getLocalAppsTheme === void 0 ? void 0 : _getLocalAppsTheme[currentApp === null || currentApp === void 0 ? void 0 : currentApp.id]) || (currentApp === null || currentApp === void 0 ? void 0 : currentApp.theme) || "light");
         setMode("default");
         devtoolsHookEmit("rendering");
@@ -12100,9 +11995,8 @@
             _this3.kernel.previousApp = previousApp;
           }
 
-          _this3.kernel.currentUrl = history$1.createPath(location);
           _this3.kernel.currentRoute = route;
-          yield Promise.all([...(window.STANDALONE_MICRO_APPS ? [] : [_this3.kernel.updateWorkspaceStack()]), _this3.kernel.layoutBootstrap(layoutType)]);
+          yield _this3.kernel.layoutBootstrap(layoutType);
           _this3.state = "ready-to-mount"; // Unmount main tree to avoid app change fired before new routes mounted.
 
           unmountTree(mountPoints.main);