@ibiz-template/runtime 0.7.41-alpha.126 → 0.7.41-alpha.128

package/out/utils/theme-util/theme-util.d.ts

@@ -37,11 +37,19 @@ export declare class ThemeUtil implements IApiThemeUtil {
     /**
      * @description 加载主题插件
      * @param {IAppUITheme} theme
-     * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题
+     * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题,颜色主题包含远程插件和主题变量共存的情况，主题变量的优先级大于远程插件的优先级
      * @returns {*}  {Promise<void>}
      * @memberof ThemeUtil
      */
     loadTheme(theme: IAppUITheme, type?: 'COLOR' | 'ICON'): Promise<void>;
+    /**
+     * @description 设置主题变量
+     * @protected
+     * @param {IAppUITheme} theme
+     * @returns {*}  {void}
+     * @memberof ThemeUtil
+     */
+    protected setThemeCssStyle(theme: IAppUITheme): void;
     /**
      * @description 设置额外修改的主题参数
      * @protected

package/out/utils/theme-util/theme-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"theme-util.d.ts","sourceRoot":"","sources":["../../../src/utils/theme-util/theme-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;GAKG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,WAAW,CAA4C;IAEvE;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAE,eAAe,CAAyB;IAE9D;;;OAGG;IACH,QAAQ,CAAC,GAAG,yBAAgC;IAE5C;;;;OAIG;IACI,WAAW,EAAE,WAAW,EAAE,CAAM;IAEvC;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,WAAW,EAClB,IAAI,GAAE,OAAO,GAAG,MAAgB,GAC/B,OAAO,CAAC,IAAI,CAAC;IAoBhB;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CACtB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,IAAI;IAoBP;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQ3B;;;;OAIG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;OAGG;IACH,WAAW,IAAI,IAAI;IAOnB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;OAKG;IACG,eAAe,CAAC,QAAQ,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9D;;;;OAIG;IACH,cAAc,IAAI,KAAK;IAOvB;;;;;;;OAOG;IACG,kBAAkB,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACtC,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,KAAK,CAAC;IAKjB;;;;;OAKG;IACG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D;;;;;;OAMG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAI1E;;;;;;;OAOG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,KAAK,CAAC;IAKjB;;;;;;OAMG;IACG,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAGrE"}
+{"version":3,"file":"theme-util.d.ts","sourceRoot":"","sources":["../../../src/utils/theme-util/theme-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAgB,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;GAKG;AACH,qBAAa,SAAU,YAAW,aAAa;IAC7C;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,WAAW,CAA4C;IAEvE;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAE,eAAe,CAAyB;IAE9D;;;OAGG;IACH,QAAQ,CAAC,GAAG,yBAAgC;IAE5C;;;;OAIG;IACI,WAAW,EAAE,WAAW,EAAE,CAAM;IAEvC;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,WAAW,EAClB,IAAI,GAAE,OAAO,GAAG,MAAgB,GAC/B,OAAO,CAAC,IAAI,CAAC;IA0BhB;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAcpD;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CACtB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,IAAI;IAoBP;;;;OAIG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQ3B;;;;OAIG;IACH,QAAQ,IAAI,MAAM;IAIlB;;;OAGG;IACH,WAAW,IAAI,IAAI;IAOnB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAK1B;;;;;OAKG;IACG,eAAe,CAAC,QAAQ,GAAE,OAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9D;;;;OAIG;IACH,cAAc,IAAI,KAAK;IAOvB;;;;;;;OAOG;IACG,kBAAkB,CACtB,QAAQ,EAAE,MAAM,EAChB,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACtC,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,KAAK,CAAC;IAKjB;;;;;OAKG;IACG,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D;;;;;;OAMG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAI1E;;;;;;;OAOG;IACG,eAAe,CACnB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,KAAK,CAAC;IAKjB;;;;;;OAMG;IACG,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAChC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI9B;;;;;;OAMG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAGrE"}

package/out/utils/theme-util/theme-util.js

@@ -38,7 +38,7 @@ export class ThemeUtil {
     /**
      * @description 加载主题插件
      * @param {IAppUITheme} theme
-     * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题
+     * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题,颜色主题包含远程插件和主题变量共存的情况，主题变量的优先级大于远程插件的优先级
      * @returns {*}  {Promise<void>}
      * @memberof ThemeUtil
      */
@@ -47,21 +47,47 @@ export class ThemeUtil {
         const path = data['theme-package-path'] || theme.themeUrl;
         delete data.appId;
         delete data['theme-package-path'];
-        await ibiz.plugin.loadPlugin({
-            runtimeObject: true,
-            rtobjectName: theme.themeTag,
-            rtobjectRepo: path,
-        });
+        // 远程主题插件
+        if (path) {
+            await ibiz.plugin.loadPlugin({
+                runtimeObject: true,
+                rtobjectName: theme.themeTag,
+                rtobjectRepo: path,
+            });
+        }
         if (type === 'COLOR') {
             this.setThemeParams(theme, data);
+            // 内置样式变量主题
+            if (theme.cssStyle) {
+                this.setThemeCssStyle(theme);
+            }
             this.setTheme(theme.themeTag);
-            // 只计算颜色主题插件
             this.pluginTheme.push(theme);
         }
         else {
             this.html.classList.add(theme.themeTag);
         }
     }
+    /**
+     * @description 设置主题变量
+     * @protected
+     * @param {IAppUITheme} theme
+     * @returns {*}  {void}
+     * @memberof ThemeUtil
+     */
+    setThemeCssStyle(theme) {
+        // 加上 var-css 后缀，避免与 setThemeParams 生成的主题参数 style 标签 id 冲突
+        const styleId = `${theme.themeTag}-var-css`;
+        const themeStyle = document.getElementById(styleId);
+        if (themeStyle) {
+            return;
+        }
+        const style = document.createElement('style');
+        style.id = styleId;
+        style.type = 'text/css';
+        style.innerHTML = theme.cssStyle;
+        document.head.appendChild(style);
+    }
     /**
      * @description 设置额外修改的主题参数
      * @protected
@@ -83,11 +109,11 @@ export class ThemeUtil {
             }
         }
         content += '}';
-        const script = document.createElement('style');
-        script.id = theme.themeTag;
-        script.type = 'text/css';
-        script.innerHTML = content;
-        document.head.appendChild(script);
+        const style = document.createElement('style');
+        style.id = theme.themeTag;
+        style.type = 'text/css';
+        style.innerHTML = content;
+        document.head.appendChild(style);
     }
     /**
      * @description 设置主题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.126",
+  "version": "0.7.41-alpha.128",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "1dc811502125ae2ca520bc1ad303a1a8d5b63b66"
+  "gitHead": "88c0bcdd210b21bf5c15ff46cada35d2d211e47c"
 }

package/src/app-hub.ts

@@ -5,6 +5,7 @@ import {
   IAppCodeList,
   IAppDataEntity,
   IAppLan,
+  IAppPFPluginRef,
   IAppView,
   IApplication,
   ISubAppRef,
@@ -848,6 +849,29 @@ export class AppHub implements IAppHubService {
     return targetCodeListMap?.get(id);
   }
 
+  /**
+   * @description 加载扩展插件
+   * @public
+   * @param {string} appId
+   * @returns {*}  {Promise<void>}
+   * @memberof AppHub
+   */
+  public async loadExtensionPlugin(appId: string): Promise<void> {
+    try {
+      await ibiz.plugin.loadPlugin({
+        runtimeObject: true,
+        rtobjectName: 'ExtensionPlugin',
+        rtobjectRepo: `${ibiz.env.baseUrl}/${appId}${ibiz.env.remoteModelUrl}/ext`,
+      } as IAppPFPluginRef);
+    } catch (error) {
+      ibiz.log.warn(
+        ibiz.i18n.t('runtime.application.noExtensionPlugin', {
+          appId: ibiz.env.appId,
+        }),
+      );
+    }
+  }
+
   /**
    * 新建 hub 应用
    *
@@ -863,6 +887,10 @@ export class AppHub implements IAppHubService {
     if (!this.modelLoaderProvider) {
       throw new RuntimeError(ibiz.i18n.t('runtime.utils.firstregister'));
     }
+    // 加载子应用扩展插件
+    if (id !== ibiz.env.appId) {
+      await this.loadExtensionPlugin(id);
+    }
     const appModel: IApplication = await this.modelLoaderProvider.getApp(id);
     const subAppRef: ISubAppRef | undefined =
       await this.modelLoaderProvider.getSubAppRef(id);

package/src/application.ts

@@ -169,7 +169,6 @@ export class Application implements IAppService {
     await this.loadAppModelStyle();
     await this.loadAppLang();
     await this.loadGlobalAppUtil();
-    await this.loadExtensionPlugin();
     await this.loadReplaceDefaultPlugin();
   }
 
@@ -237,28 +236,6 @@ export class Application implements IAppService {
     await ibiz.plugin.loadPlugin(globalAppUtilPlugin as ISysPFPlugin);
   }
 
-  /**
-   * @description 加载扩展插件
-   * @protected
-   * @returns {*}  {Promise<void>}
-   * @memberof Application
-   */
-  protected async loadExtensionPlugin(): Promise<void> {
-    try {
-      await ibiz.plugin.loadPlugin({
-        runtimeObject: true,
-        rtobjectName: 'ExtensionPlugin',
-        rtobjectRepo: `${ibiz.env.baseUrl}/${this.appId}${ibiz.env.remoteModelUrl}/ext`,
-      } as IAppPFPluginRef);
-    } catch (error) {
-      ibiz.log.warn(
-        ibiz.i18n.t('runtime.application.noExtensionPlugin', {
-          appId: this.appId,
-        }),
-      );
-    }
-  }
-
   /**
    * @description 加载替换默认插件（仅主应用执行）
    * @protected

package/src/config/global-config.ts

@@ -15,6 +15,7 @@ import {
   IApiGlobalWaterMarkConfig,
   IGlobalMobConfig,
   IGlobalImgCompressConfig,
+  IGlobalImgAssets,
 } from '../interface';
 
 /**
@@ -115,6 +116,7 @@ export class GlobalConfig implements IGlobalConfig {
     mergeAppMenu: 'default',
     enableAIMinimize: true,
     aiChatTopicCaptionMode: 'default',
+    aiChatTopicCaptionComputedMode: 'question',
     aiResourceMode: undefined,
     enableAIAgentChange: true,
     globalDownloadPrifix: false,
@@ -208,4 +210,24 @@ export class GlobalConfig implements IGlobalConfig {
     quality: 0,
     maxWidth: 1280,
   };
+
+  /**
+   * @description 静态图片资源
+   * @type {IGlobalImgAssets}
+   * @memberof GlobalConfig
+   */
+  imageAssets: IGlobalImgAssets = {
+    noPermission: `${ibiz.env.assetsUrl}/images/403.png`,
+    noFind: `${ibiz.env.assetsUrl}/images/404.png`,
+    loginAvatar: `${ibiz.env.assetsUrl}/images/login-avatar.png`,
+    loginHeader: `${ibiz.env.assetsUrl}/images/login-header.png`,
+    poiMarker: `${ibiz.env.assetsUrl}/images/poi-marker-default.png`,
+    userAvatar: `${ibiz.env.assetsUrl}/images/user-avatar.png`,
+    chat: `${ibiz.env.assetsUrl}/images/svg/chat.svg`,
+    customWorkbench: `${ibiz.env.assetsUrl}/images/svg/custom-workbench.svg`,
+    helper: `${ibiz.env.assetsUrl}/images/svg/helper.svg`,
+    iconImport: `${ibiz.env.assetsUrl}/images/svg/icon-import.svg`,
+    message: `${ibiz.env.assetsUrl}/images/svg/message.svg`,
+    setting: `${ibiz.env.assetsUrl}/images/svg/setting.svg`,
+  };
 }

package/src/interface/api/app/i-api-app-hub-service.ts

@@ -101,6 +101,14 @@ export interface IApiAppHubService {
     context: IApiContext,
   ): Promise<IApiAppDEService>;
 
+  /**
+   * @description 加载指定应用扩展插件
+   * @param {string} appId 应用标识
+   * @returns {*}  {Promise<void>}
+   * @memberof IApiAppHubService
+   */
+  loadExtensionPlugin(appId: string): Promise<void>;
+
   /**
    * @description 重置清空应用中心
    * @memberof IApiAppHubService

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -114,6 +114,15 @@ export interface IApiGlobalCommonConfig {
    */
   aiChatTopicCaptionMode: 'default' | 'snippet' | 'summary';
 
+  /**
+   * @description AI聊天话题标题计算模式
+   * @type {('history' | 'question' | 'none')} history:如果获取到的history内容中包含user信息，则取最后一条user信息截取用作标题;question：默认值，等待用户输入第一个user消息后截取作为标题;none：不进行计算，由外部传入标题决定
+   * @default question
+   * @platform web
+   * @memberof IApiGlobalCommonConfig
+   */
+  aiChatTopicCaptionComputedMode: 'history' | 'question' | 'none';
+
   /**
    * @description AI资源模式，LOCAL:默认值，会话基于config存储、消息内容均存储客户端; REMOTE：远程，会话基于config和远程session存储、消息内容基于远程消息存储
    * @type {'LOCAL' | 'REMOTE'}

package/src/interface/api/common/global-config/i-api-global-config.ts

@@ -13,6 +13,7 @@ import { IApiGlobalFlowDrtabConfig } from './i-api-global-flow-drtab-config';
 import { IApiGlobalWaterMarkConfig } from './i-api-global-water-mark-config';
 import { IApiGlobalMobConfig } from './i-api-global-mob-config';
 import { IApiGlobalImgCompressConfig } from './i-api-global-img-compress-config';
+import { IApiGlobalImgAssets } from './i-api-global-img-assets';
 
 /**
  * 全局配置
@@ -178,4 +179,11 @@ export interface IApiGlobalConfig {
    * @memberof IApiGlobalConfig
    */
   imgCompressConfig: IApiGlobalImgCompressConfig;
+
+  /**
+   * @description 图片静态资源
+   * @type {IApiGlobalImgAssets}
+   * @memberof IApiGlobalConfig
+   */
+  imageAssets: IApiGlobalImgAssets;
 }

package/src/interface/api/common/global-config/i-api-global-img-assets.ts

@@ -0,0 +1,102 @@
+/**
+ * @description 静态图片资源
+ * @export
+ * @interface IApiGlobalImgAssets
+ */
+export interface IApiGlobalImgAssets {
+  /**
+   * @description 无权限403图片
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  noPermission: string;
+
+  /**
+   * @description 未找到404图片
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  noFind: string;
+
+  /**
+   * @description 登录页头像图片
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  loginAvatar: string;
+
+  /**
+   * @description 登录页头部背景图
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  loginHeader: string;
+
+  /**
+   * @description 地图位置标记图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  poiMarker: string;
+
+  /**
+   * @description 用户头像图片
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  userAvatar: string;
+
+  /**
+   * @description ai对话框按钮图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  chat: string;
+
+  /**
+   * @description 自定义用户行为图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  customWorkbench: string;
+
+  /**
+   * @description 帮助用户行为图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  helper: string;
+
+  /**
+   * @description 数据导入图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  iconImport: string;
+
+  /**
+   * @description 用户消息图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  message: string;
+
+  /**
+   * @description 用户设置图标
+   * @type {string}
+   * @platform web
+   * @memberof IApiGlobalImgAssets
+   */
+  setting: string;
+}

package/src/interface/api/common/global-config/index.ts

@@ -14,3 +14,4 @@ export type { IApiGlobalFlowDrtabConfig } from './i-api-global-flow-drtab-config
 export type { IApiGlobalWaterMarkConfig } from './i-api-global-water-mark-config';
 export type { IApiGlobalMobConfig } from './i-api-global-mob-config';
 export type { IApiGlobalImgCompressConfig } from './i-api-global-img-compress-config';
+export type { IApiGlobalImgAssets } from './i-api-global-img-assets';

package/src/interface/common/i-global-config/i-global-img-assets.ts

@@ -0,0 +1,9 @@
+import { IApiGlobalImgAssets } from '../../api';
+
+/**
+ * @description 静态图片资源
+ * @export
+ * @interface IGlobalImgAssets
+ * @extends {IApiGlobalImgAssets}
+ */
+export interface IGlobalImgAssets extends IApiGlobalImgAssets {}

package/src/interface/common/i-global-config/index.ts

@@ -12,3 +12,4 @@ export * from './i-global-common-config';
 export * from './i-global-flow-drtab-config';
 export * from './i-global-mob-config';
 export * from './i-global-img-cpmpress-config';
+export * from './i-global-img-assets';

package/src/interface/common/index.ts

@@ -29,6 +29,7 @@ export type {
   IGlobalFlowDrtabConfig,
   IGlobalMobConfig,
   IGlobalImgCompressConfig,
+  IGlobalImgAssets,
 } from './i-global-config';
 export type { IDataAbilityParams } from './i-data-ability-params/i-data-ability-params';
 export type { IAppConfigService } from './i-app-config-service/i-app-config-service';

package/src/locale/en/index.ts

@@ -444,13 +444,11 @@ export const en = {
       noImplementedRouting:
         'Getting view routing parameter variables is not implemented',
     },
-    application: {
-      noExtensionPlugin:
-        'Attempted to load application [{appId}] extension plugin, but no extension plugin was found',
-    },
     hub: {
       failedParse: 'View parameter {paramsName} failed to parse: {error}',
       noExist: 'View [{id}] does not exist',
+      noExtensionPlugin:
+        'Attempted to load application [{appId}] extension plugin, but no extension plugin was found',
     },
     logicScheduler: {
       executor: {

package/src/locale/zh-CN/index.ts

@@ -371,12 +371,10 @@ export const zhCn = {
     global: {
       noImplemented: '获取应用全局变量没有实现',
     },
-    application: {
-      noExtensionPlugin: '尝试加载应用[{appId}]扩展插件，暂未找到扩展插件',
-    },
     hub: {
       failedParse: '视图参数 {paramsName} 解析失败：{error}',
       noExist: '视图[{id}]不存在',
+      noExtensionPlugin: '尝试加载应用[{appId}]扩展插件，暂未找到扩展插件',
     },
     logicScheduler: {
       executor: {

package/src/register/custom-register.ts

@@ -32,6 +32,11 @@ export class CustomRegister {
    * @memberof CustomRegister
    */
   static getRegisterKey(registerType: string, opts: IRegisterParams): string {
+    // 如果自定义扩展标记，则直接返回
+    const { mainModel } = opts;
+    if (mainModel && (mainModel as IData).customExtTag) {
+      return (mainModel as IData).customExtTag;
+    }
     switch (registerType) {
       case VIEW_PROVIDER_PREFIX:
         return this.calcExtensionViewKey(opts);

package/src/register/helper/app-menu-item-register.ts

@@ -1,7 +1,7 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { IAppMenu, IAppMenuItem } from '@ibiz/model-core';
 import { getPluginRegisterKey } from './common-register';
 import { IAppMenuItemProvider } from '../../interface';
-import { CustomRegister } from '../custom-register';
 
 /** 应用菜单项适配器前缀 */
 export const APPMENUITEM_PROVIDER_PREFIX = 'APPMENUITEM';
@@ -45,20 +45,20 @@ export async function getAppMenuItemProvider(
   const { sysPFPluginId, appId, itemType } = model as Required<IAppMenuItem>;
 
   // 找自定义注册的适配器
-  const registerKey = CustomRegister.getRegisterKey(
-    APPMENUITEM_PROVIDER_PREFIX,
-    {
-      mainModel: model,
-      control,
-    },
-  );
-  provider = getProvider(registerKey);
-  if (provider) return provider;
-  ibiz.log.debug(
-    ibiz.i18n.t('runtime.register.helper.menuItemCustomRegistration', {
-      registerKey,
-    }),
-  );
+  // const registerKey = CustomRegister.getRegisterKey(
+  //   APPMENUITEM_PROVIDER_PREFIX,
+  //   {
+  //     mainModel: model,
+  //     control,
+  //   },
+  // );
+  // provider = getProvider(registerKey);
+  // if (provider) return provider;
+  // ibiz.log.debug(
+  //   ibiz.i18n.t('runtime.register.helper.menuItemCustomRegistration', {
+  //     registerKey,
+  //   }),
+  // );
 
   // 找插件适配器
   if (sysPFPluginId) {

package/src/utils/theme-util/theme-util.ts

@@ -44,7 +44,7 @@ export class ThemeUtil implements IApiThemeUtil {
   /**
    * @description 加载主题插件
    * @param {IAppUITheme} theme
-   * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题
+   * @param {('COLOR' | 'ICON')} [type='COLOR'] 颜色主题|图标主题，默认值为颜色主题,颜色主题包含远程插件和主题变量共存的情况，主题变量的优先级大于远程插件的优先级
    * @returns {*}  {Promise<void>}
    * @memberof ThemeUtil
    */
@@ -56,21 +56,48 @@ export class ThemeUtil implements IApiThemeUtil {
     const path = data['theme-package-path'] || theme.themeUrl;
     delete data.appId;
     delete data['theme-package-path'];
-    await ibiz.plugin.loadPlugin({
-      runtimeObject: true,
-      rtobjectName: theme.themeTag!,
-      rtobjectRepo: path,
-    } as unknown as ISysPFPlugin);
+    // 远程主题插件
+    if (path) {
+      await ibiz.plugin.loadPlugin({
+        runtimeObject: true,
+        rtobjectName: theme.themeTag!,
+        rtobjectRepo: path,
+      } as unknown as ISysPFPlugin);
+    }
     if (type === 'COLOR') {
       this.setThemeParams(theme, data);
+      // 内置样式变量主题
+      if (theme.cssStyle) {
+        this.setThemeCssStyle(theme);
+      }
       this.setTheme(theme.themeTag!);
-      // 只计算颜色主题插件
       this.pluginTheme.push(theme);
     } else {
       this.html.classList.add(theme.themeTag!);
     }
   }
 
+  /**
+   * @description 设置主题变量
+   * @protected
+   * @param {IAppUITheme} theme
+   * @returns {*}  {void}
+   * @memberof ThemeUtil
+   */
+  protected setThemeCssStyle(theme: IAppUITheme): void {
+    // 加上 var-css 后缀，避免与 setThemeParams 生成的主题参数 style 标签 id 冲突
+    const styleId = `${theme.themeTag}-var-css`;
+    const themeStyle = document.getElementById(styleId);
+    if (themeStyle) {
+      return;
+    }
+    const style = document.createElement('style');
+    style.id = styleId;
+    style.type = 'text/css';
+    style.innerHTML = theme.cssStyle!;
+    document.head.appendChild(style);
+  }
+
   /**
    * @description 设置额外修改的主题参数
    * @protected
@@ -95,11 +122,11 @@ export class ThemeUtil implements IApiThemeUtil {
       }
     }
     content += '}';
-    const script = document.createElement('style');
-    script.id = theme.themeTag!;
-    script.type = 'text/css';
-    script.innerHTML = content;
-    document.head.appendChild(script);
+    const style = document.createElement('style');
+    style.id = theme.themeTag!;
+    style.type = 'text/css';
+    style.innerHTML = content;
+    document.head.appendChild(style);
   }
 
   /**