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

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/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/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);
   }
 
   /**