@ibiz-template/vue3-components 0.7.41-alpha.121 → 0.7.41-alpha.123

package/src/view/404-view/404-view.tsx

@@ -25,10 +25,7 @@ export const View404 = defineComponent({
   render() {
     return (
       <div class={[this.ns.b(), this.ns.is('top', this.isTop)]}>
-        <img
-          class={this.ns.b('img')}
-          src={`${ibiz.env.assetsUrl}/images/404.png`}
-        />
+        <img class={this.ns.b('img')} src={ibiz.config.imageAssets.noFind} />
         <div class={this.ns.b('text')}>
           <div class={this.ns.be('text', 'text1')}>
             {ibiz.i18n.t('view.noResourcesView.noResourcePrompt')}

package/src/view/login-view/login-view.tsx

@@ -170,7 +170,7 @@ export const LoginView = defineComponent({
             await ibiz.hub.config.view.get('AppLoginView');
           if (loginViewConfig) {
             loginView.value = loginViewConfig;
-            hasLoginView.value = true;
+            // hasLoginView.value = true;
           }
         } catch (err) {
           ibiz.log.warn(err);
@@ -197,13 +197,13 @@ export const LoginView = defineComponent({
           <div class={ns.b()}>
             <div class={ns.b('box')}>
               <header class={ns.b('box-header')}>
-                <img src='./assets/images/login-header.png' />
+                <img src={ibiz.config.imageAssets.loginHeader} />
                 <span class={ns.b('box-header-title')}>{appTitle}</span>
               </header>
               <main class={ns.b('box-main')}>
                 <img
                   class={ns.be('box-main', 'avatar')}
-                  src='./assets/images/login-avatar.png'
+                  src={ibiz.config.imageAssets.loginAvatar}
                 />
                 <div class={ns.b('box-main-content')}>
                   <el-form model={loginData} rules={rules} ref={formRef}>

package/src/view/share-view/share-view.tsx

@@ -66,7 +66,7 @@ export const ShareView = defineComponent({
       <div class={this.ns.b()}>
         <div class={this.ns.b('box')}>
           <header class={this.ns.b('box-header')}>
-            <img src='./assets/images/login-header.png' />
+            <img src={ibiz.config.imageAssets.loginHeader} />
             <div class={this.ns.b('box-header-title')}>
               <div>{this.shareUser.userName}</div>
               {ibiz.i18n.t('view.shareView.inviting')}

package/src/view/unauthorized-view/unauthorized-view.tsx

@@ -61,10 +61,7 @@ export const UnauthorizedView = defineComponent({
           })
         ) : (
           <div class={ns.b()}>
-            <img
-              class={ns.e('img')}
-              src={`${ibiz.env.assetsUrl}/images/404.png`}
-            />
+            <img class={ns.e('img')} src={ibiz.config.imageAssets.noFind} />
             <div class={ns.e('tips')}>
               {ibiz.i18n.t('view.noResourcesView.noResourcePrompt')}
               <br />

package/src/web-app/guard/auth-guard/auth-guard.ts

@@ -319,11 +319,10 @@ export class AuthGuard {
     const app = ibiz.hub.getApp();
     const uiThemes = app.model.appUIThemes || [];
     if (uiThemes.length > 0) {
-      // 加载颜色主题
+      // 加载颜色主题（远程插件 or 主题变量），图标主题优先判断避免带样式变量的图标主题被重复加载
       const colorThemes = uiThemes.filter(uiTheme => {
-        return (
-          uiTheme.themeParams && uiTheme.themeParams['icon-theme'] !== 'true'
-        );
+        const isIconTheme = uiTheme.themeParams?.['icon-theme'] === 'true';
+        return !isIconTheme && Boolean(uiTheme.cssStyle || uiTheme.themeParams);
       });
       if (colorThemes.length > 0) {
         for (let index = 0; index < colorThemes.length; index++) {

package/src/web-app/guard/auth-guard/dyna-auth-guard.ts

@@ -2,6 +2,9 @@ import { ModelHelper } from '@ibiz-template/model-helper';
 import { AppHooks } from '@ibiz-template/vue3-util';
 import { AuthGuard } from './auth-guard';
 
+// 预定义主题标记（light | dark | blue），样式内置于主题包，无需等待应用主题模型加载即可直接设置
+const PREDEFINED_THEMES = ['light', 'dark', 'blue'];
+
 export class DynaAuthGuard extends AuthGuard {
   hasModelInit: boolean = false;
 
@@ -39,9 +42,23 @@ export class DynaAuthGuard extends AuthGuard {
       const module = await import('@ibiz-template/web-theme');
       const theme = module.default || module;
       AppHooks.useComponent.callSync(null, theme);
-      if (ibiz.config.theme) ibiz.util.theme.setTheme(ibiz.config.theme);
+      // 预定义主题才可直接设置，主要是为了修复用户未授权访问界面时，应用模型appUIThemes暂时未到位，直接设置非预定义主题标记可能会导致界面异常
+      if (ibiz.config.theme && PREDEFINED_THEMES.includes(ibiz.config.theme)) {
+        ibiz.util.theme.setTheme(ibiz.config.theme);
+      }
       if (appModel.appUIThemes) {
         await this.loadTheme();
+        // 加载完主题后，仅当配置主题已具备样式来源（预定义或应用主题模型内）时才设置标记，避免设置无样式主题导致界面异常
+        const themeTags = appModel.appUIThemes
+          .map(uiTheme => uiTheme.themeTag)
+          .filter(tag => !!tag) as string[];
+        if (
+          ibiz.config.theme &&
+          (PREDEFINED_THEMES.includes(ibiz.config.theme) ||
+            themeTags.includes(ibiz.config.theme))
+        ) {
+          ibiz.util.theme.setTheme(ibiz.config.theme);
+        }
       }
 
       // 设置浏览器标题