@ibiz-template/vue3-components 0.7.38-alpha.31 → 0.7.38-alpha.43

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -114,7 +114,7 @@ class AuthGuard {
       if (ibiz.env.isSaaSMode === true) {
         await this.loadOrgData();
       }
-      await this.loadAppData();
+      await this.loadAppData(context);
     } catch (error) {
       const responseStatus = error.status;
       const remember = getCookie(CoreConst.TOKEN_REMEMBER);
@@ -125,7 +125,7 @@ class AuthGuard {
           if (ibiz.env.isSaaSMode === true) {
             await this.loadOrgData();
           }
-          await this.loadAppData();
+          await this.loadAppData(context);
         } catch (refreshTokenError) {
           throw error;
         }
@@ -152,12 +152,18 @@ class AuthGuard {
   /**
    * 加载应用数据
    *
-   * @author chitanda
-   * @date 2022-07-20 20:07:50
+   * @author tony001
+   * @date 2024-12-19 20:12:01
+   * @param {IParams} [context]
    * @return {*}  {Promise<void>}
    */
-  async loadAppData() {
-    const res = await ibiz.net.get("/appdata");
+  async loadAppData(context) {
+    let res;
+    if (context && Object.keys(context).length > 0) {
+      res = await ibiz.net.get("/appdata", context);
+    } else {
+      res = await ibiz.net.get("/appdata");
+    }
     if (res.ok) {
       ibiz.appData = res.data;
     }
@@ -199,8 +205,20 @@ class AuthGuard {
     const app = ibiz.hub.getApp();
     const uiThemes = app.model.appUIThemes || [];
     if (uiThemes.length > 0) {
-      const theme = uiThemes[0];
-      await ibiz.util.theme.loadTheme(theme);
+      const colorThemes = uiThemes.filter((uiTheme) => {
+        return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] !== "true";
+      });
+      if (colorThemes.length > 0) {
+        const colorTheme = colorThemes[0];
+        await ibiz.util.theme.loadTheme(colorTheme);
+      }
+      const iconThemes = uiThemes.filter((uiTheme) => {
+        return uiTheme.themeParams && uiTheme.themeParams["icon-theme"] === "true";
+      });
+      if (iconThemes.length > 0) {
+        const iconTheme = iconThemes[0];
+        await ibiz.util.theme.loadTheme(iconTheme, "ICON");
+      }
     }
   }
   /**

package/es/web-app/util/unauthorized-handler/unauthorized-handler.d.ts

@@ -9,6 +9,15 @@ import { IErrorHandler } from '@ibiz-template/runtime';
  */
 export declare class UnauthorizedHandler implements IErrorHandler {
     match(error: unknown): boolean;
+    /**
+     * oauth登录处理
+     *
+     * @author tony001
+     * @date 2024-12-22 10:12:48
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected oauthLogin(): Promise<void>;
     /**
      * cas登录处理
      *

package/es/web-app/util/unauthorized-handler/unauthorized-handler.mjs

@@ -6,6 +6,25 @@ class UnauthorizedHandler {
   match(error) {
     return error instanceof HttpError && (error.status === 401 || error.status === 403);
   }
+  /**
+   * oauth登录处理
+   *
+   * @author tony001
+   * @date 2024-12-22 10:12:48
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  async oauthLogin() {
+    if (window.location.href.indexOf("srfthird_auth_success=false") >= 0) {
+      ibiz.log.debug("\u83B7\u53D6OAUTH\u7684token\u5931\u8D25\uFF0C\u8DF3\u8F6C\u6B63\u5E38\u767B\u5F55\u9875");
+      this.normalLogin();
+    }
+    const res = await ibiz.thirdAuth.auth("OAUTH", "THIRD");
+    if (!res.ok) {
+      ibiz.log.debug("\u83B7\u53D6OAUTH\u91CD\u5B9A\u5411\u5730\u5740\u5931\u8D25\uFF0C\u8DF3\u8F6C\u6B63\u5E38\u767B\u5F55\u9875");
+      this.normalLogin();
+    }
+  }
   /**
    * cas登录处理
    *
@@ -84,6 +103,8 @@ class UnauthorizedHandler {
           });
         } else if (ibiz.env.loginMode === LoginMode.CAS) {
           this.casLogin();
+        } else if (ibiz.env.loginMode === LoginMode.OAUTH) {
+          this.oauthLogin();
         } else {
           this.normalLogin();
         }

package/lib/common/action-toolbar/action-toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}
+@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}

package/lib/common/button-list/button-list.css

@@ -1 +1 @@
-.ibiz-button-list{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular)}.ibiz-button-list__button-content{display:flex;align-items:center}.ibiz-button-list__button-content--icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-button-list-icon-size);height:var(--ibiz-button-list-icon-size);font-size:var(--ibiz-button-list-icon-size);margin-right:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__dropdown{width:100%;height:100%}.ibiz-button-list__dropdown .ibiz-icon{margin-right:0}.ibiz-button-list__dropdown .ibiz-icon+.ibiz-button-list__button-content--caption{margin-left:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__dropdown .el-button-group{width:100%;display:flex;height:100%;border-radius:var(--ibiz-border-radius-small)}.ibiz-button-list__dropdown .el-button-group .el-button:first-child{flex-grow:1}.ibiz-button-list__dropdown .el-button-group .el-button:last-child{flex-shrink:0}.ibiz-button-list__dropdown--style2 .el-button{--el-button-active-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;--el-button-hover-bg-color:transparent}.ibiz-button-list__dropdown--style2 .el-button-group .ibiz-button-list__item{padding-right:0}.ibiz-button-list__dropdown--style2 .el-button-group .el-button{color:var(--ibiz-color-text-2)}.ibiz-button-list__dropdown--style2 .el-button-group:hover .el-button{color:var(--ibiz-color-primary)}.ibiz-button-list--itemx .ibiz-button-list__more-button{padding-left:0;padding-right:0;width:32px}.ibiz-button-list__dropdown-popper{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular)}.ibiz-button-list__dropdown-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item{padding:var(--ibiz-spacing-none)}.ibiz-button-list__dropdown-popper .el-button{--el-button-active-bg-color:transparent;--el-button-hover-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;width:100%;display:block;text-align:left;border-radius:0;padding:var(--ibiz-button-list-popover-button-padding);margin:var(--ibiz-button-list-popover-button-margin);font-size:var(--ibiz-button-list-popover-button-font-size)}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{background-color:var(--ibiz-color-bg-0)}.ibiz-button-list__dropdown-popper--style2 .el-button{color:var(--ibiz-color-text-2)}
+.ibiz-button-list{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular)}.ibiz-button-list__button-content{display:flex;align-items:center}.ibiz-button-list__button-content--icon{display:flex;align-items:center;justify-content:center;width:var(--ibiz-button-list-icon-size);height:var(--ibiz-button-list-icon-size);font-size:var(--ibiz-button-list-icon-size);margin-right:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__item>span{pointer-events:none}.ibiz-button-list__dropdown{width:100%;height:100%}.ibiz-button-list__dropdown .ibiz-icon{margin-right:0}.ibiz-button-list__dropdown .ibiz-icon+.ibiz-button-list__button-content--caption{margin-left:var(--ibiz-button-list-icon-margin)}.ibiz-button-list__dropdown .el-button-group{width:100%;display:flex;height:100%;border-radius:var(--ibiz-border-radius-small)}.ibiz-button-list__dropdown .el-button-group .el-button:first-child{flex-grow:1}.ibiz-button-list__dropdown .el-button-group .el-button:last-child{flex-shrink:0}.ibiz-button-list__dropdown--style2 .el-button{--el-button-active-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;--el-button-hover-bg-color:transparent}.ibiz-button-list__dropdown--style2 .el-button-group .ibiz-button-list__item{padding-right:0}.ibiz-button-list__dropdown--style2 .el-button-group .el-button{color:var(--ibiz-color-text-2)}.ibiz-button-list__dropdown--style2 .el-button-group:hover .el-button{color:var(--ibiz-color-primary)}.ibiz-button-list--itemx .ibiz-button-list__more-button{padding-left:0;padding-right:0;width:32px}.ibiz-button-list__dropdown-popper{--ibiz-button-list-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-button-list-icon-size:var(--ibiz-width-icon-medium);--ibiz-button-list-popover-bg:var(--ibiz-color-bg-3);--ibiz-button-list-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-button-list-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-button-list-popover-button-margin:var(--ibiz-spacing-none);--ibiz-button-list-popover-button-size:var(--ibiz-height-control-large);--ibiz-button-list-popover-button-font-size:var(--ibiz-font-size-regular)}.ibiz-button-list__dropdown-popper.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item{padding:var(--ibiz-spacing-none)}.ibiz-button-list__dropdown-popper .el-button{--el-button-active-bg-color:transparent;--el-button-hover-bg-color:transparent;--el-button-bg-color:transparent;--el-mask-color-extra-light:transparent;width:100%;display:block;text-align:left;border-radius:0;padding:var(--ibiz-button-list-popover-button-padding);margin:var(--ibiz-button-list-popover-button-margin);font-size:var(--ibiz-button-list-popover-button-font-size)}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{background-color:transparent}.ibiz-button-list__dropdown-popper--style2.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{background-color:var(--ibiz-color-bg-0)}.ibiz-button-list__dropdown-popper--style2 .el-button{color:var(--ibiz-color-text-2)}

package/lib/common/custom-theme/custom-theme-model.cjs

@@ -128,35 +128,35 @@ const predefineThemeVars = [
             ]
           },
           {
-            caption: "\u6587\u672C/\u56FE\u6807\u989C\u8272",
-            labelLang: "textIcon",
+            caption: "\u6587\u672C\u989C\u8272",
+            labelLang: "text",
             vars: [
               {
-                label: "\u6587\u672C\u56FE\u6807\u4E3B\u8272",
-                description: "\u6587\u672C/\u56FE\u6807\u989C\u8272 - \u6700\u4E3B\u8981",
-                labelLang: "mainTextIconColor",
-                descLang: "mianTextIconColorDesc",
+                label: "\u6587\u672C\u4E3B\u8272",
+                description: "\u6587\u672C\u989C\u8272 - \u6700\u4E3B\u8981",
+                labelLang: "mainTextColor",
+                descLang: "mianTextColorDesc",
                 value: "--ibiz-color-text-0"
               },
               {
-                label: "\u6587\u672C\u56FE\u6807\u7A0D\u6B21\u8272",
-                description: "\u6587\u672C/\u56FE\u6807\u989C\u8272 - \u7A0D\u6B21\u8981",
-                labelLang: "minorTextIconColor",
-                descLang: "minorTextIconColorDesc",
+                label: "\u6587\u672C\u7A0D\u6B21\u8272",
+                description: "\u6587\u672C\u989C\u8272 - \u7A0D\u6B21\u8981",
+                labelLang: "minorTextColor",
+                descLang: "minorTextColorDesc",
                 value: "--ibiz-color-text-1"
               },
               {
-                label: "\u6587\u672C\u56FE\u6807\u6B21\u8272",
-                description: "\u6587\u672C/\u56FE\u6807\u989C\u8272 - \u6B21\u8981",
-                labelLang: "secondaryTextIconColor",
-                descLang: "secondaryTextIconColorDesc",
+                label: "\u6587\u672C\u6B21\u8272",
+                description: "\u6587\u672C\u989C\u8272 - \u6B21\u8981",
+                labelLang: "secondaryTextColor",
+                descLang: "secondaryTextColorDesc",
                 value: "--ibiz-color-text-2"
               },
               {
-                label: "\u6587\u672C\u56FE\u6807\u6700\u6B21\u8272",
-                description: "\u6587\u672C/\u56FE\u6807\u989C\u8272 - \u6700\u6B21\u8981",
-                labelLang: "lastTextIconColor",
-                descLang: "lastTextIconColorDesc",
+                label: "\u6587\u672C\u6700\u6B21\u8272",
+                description: "\u6587\u672C\u989C\u8272 - \u6700\u6B21\u8981",
+                labelLang: "lastTextColor",
+                descLang: "lastTextColorDesc",
                 value: "--ibiz-color-text-3"
               }
             ]
@@ -292,21 +292,21 @@ const predefineThemeVars = [
                 description: "\u7981\u7528\u6001 - \u63CF\u8FB9",
                 labelLang: "disabledTextBorder",
                 descLang: "disabledTextBorderDesc",
-                value: "--ibiz-color-text-border"
+                value: "--ibiz-color-disabled-border"
               },
               {
                 label: "\u7981\u7528\u80CC\u666F\u8272",
                 description: "\u7981\u7528\u6001 - \u80CC\u666F",
                 labelLang: "disabledBg",
                 descLang: "disabledBgDesc",
-                value: "--ibiz-color-text-bg"
+                value: "--ibiz-color-disabled-bg"
               },
               {
                 label: "\u7981\u7528\u586B\u5145\u8272",
                 description: "\u7981\u7528\u6001 - \u586B\u5145",
                 labelLang: "disabledFill",
                 descLang: "disabledFillDesc",
-                value: "--ibiz-color-text-fill"
+                value: "--ibiz-color-disabled-fill"
               }
             ]
           }
@@ -365,32 +365,97 @@ const predefineThemeVars = [
       }
     ]
   },
+  // 导航栏中菜单激活色和悬浮色相反
   {
     caption: "\u9876\u90E8\u5BFC\u822A\u680F",
     labelLang: "top",
     vars: [
       {
-        label: "\u80CC\u666F",
+        label: "\u5B57\u4F53\u4E3B\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-color",
+        defaultValue: "--ibiz-color-primary-text",
+        labelLang: "mainColor",
+        descLang: "mainColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5B57\u4F53\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-color-1",
+        defaultValue: "--ibiz-color-text-5",
+        labelLang: "secondaryColor",
+        descLang: "secondaryColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u80CC\u666F\u4E3B\u8981\u989C\u8272",
         value: "--ibiz-panel-app-header-horizontal-bg-color",
         defaultValue: "--ibiz-color-primary",
-        labelLang: "topBgColor",
-        descLang: "topBgColorDesc",
+        labelLang: "mainBgColor",
+        descLang: "mainBgColorDesc",
         className: "ibiz-panel-app-header"
       },
       {
-        label: "\u5B57\u4F53\u989C\u8272",
-        value: "--ibiz-panel-app-header-horizontal-color",
-        defaultValue: "--ibiz-color-primary-text",
-        labelLang: "topColor",
-        descLang: "topColorDesc",
+        label: "\u80CC\u666F\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-bg-color-1",
+        defaultValue: "--ibiz-color-bg-5",
+        labelLang: "secondaryBgColor",
+        descLang: "secondaryBgColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u56FE\u6807\u4E3B\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-color-icon-0",
+        defaultValue: "--ibiz-color-icon-0",
+        labelLang: "iconMainColor",
+        descLang: "iconMainColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u56FE\u6807\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-color-icon-1",
+        defaultValue: "--ibiz-color-icon-1",
+        labelLang: "iconSecondaryColor",
+        descLang: "iconSecondaryColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u5B57\u4F53\u989C\u8272",
+        value: "--ibiz-panel-app-header-horizontal-menu-color",
+        defaultValue: "--ibiz-color-text-menu",
+        labelLang: "appMenuColor",
+        descLang: "appMenuColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u60AC\u6D6E\u5B57\u4F53\u8272",
+        value: "--ibiz-panel-app-header-horizontal-active-color",
+        defaultValue: "--ibiz-color-primary-active-text",
+        labelLang: "appMenuHoverColor",
+        descLang: "appMenuHoverColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u60AC\u6D6E\u80CC\u666F\u8272",
+        value: "--ibiz-panel-app-header-horizontal-active-bg-color",
+        defaultValue: "--ibiz-color-primary-active",
+        labelLang: "appMenuHoverBgColor",
+        descLang: "appMenuHoverBgColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u9009\u4E2D\u5B57\u4F53\u8272",
+        value: "--ibiz-panel-app-header-horizontal-hover-color",
+        defaultValue: "--ibiz-color-primary-hover-text",
+        labelLang: "appMenuActiveColor",
+        descLang: "appMenuActiveColorDesc",
         className: "ibiz-panel-app-header"
       },
       {
-        label: "\u9009\u4E2D\u8272",
+        label: "\u5E94\u7528\u83DC\u5355\u9009\u4E2D\u80CC\u666F\u8272",
         value: "--ibiz-panel-app-header-horizontal-hover-bg-color",
         defaultValue: "--ibiz-color-primary-hover",
-        labelLang: "topSelectBgColor",
-        descLang: "topSelectBgColorDesc",
+        labelLang: "appMenuActiveBgColor",
+        descLang: "appMenuActiveBgColorDesc",
         className: "ibiz-panel-app-header"
       }
     ]
@@ -400,35 +465,91 @@ const predefineThemeVars = [
     labelLang: "sidebar",
     vars: [
       {
-        label: "\u80CC\u666F",
+        label: "\u5B57\u4F53\u4E3B\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-color",
+        defaultValue: "--ibiz-color-primary-text",
+        labelLang: "mainColor",
+        descLang: "mainColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5B57\u4F53\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-color-1",
+        defaultValue: "--ibiz-color-text-5",
+        labelLang: "secondaryColor",
+        descLang: "secondaryColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u80CC\u666F\u4E3B\u8981\u989C\u8272",
         value: "--ibiz-panel-app-header-bg-color",
         defaultValue: "--ibiz-color-primary",
-        labelLang: "sidebarBg",
-        descLang: "sidebarBgDesc",
+        labelLang: "mainBgColor",
+        descLang: "mainBgColorDesc",
         className: "ibiz-panel-app-header"
       },
       {
-        label: "\u5B57\u4F53\u989C\u8272",
-        value: "--ibiz-panel-app-header-color",
-        defaultValue: "--ibiz-color-primary-text",
-        labelLang: "sidebarColor",
-        descLang: "sidebarColorDesc",
+        label: "\u80CC\u666F\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-bg-color-1",
+        defaultValue: "--ibiz-color-bg-5",
+        labelLang: "secondaryBgColor",
+        descLang: "secondaryBgColorDesc",
         className: "ibiz-panel-app-header"
       },
       {
-        label: "\u60AC\u6D6E\u8272",
-        value: "--ibiz-panel-app-header-select-bg-color",
+        label: "\u56FE\u6807\u4E3B\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-color-icon-0",
+        defaultValue: "--ibiz-color-icon-0",
+        labelLang: "iconMainColor",
+        descLang: "iconMainColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u56FE\u6807\u6B21\u8981\u989C\u8272",
+        value: "--ibiz-panel-app-header-color-icon-1",
+        defaultValue: "--ibiz-color-icon-1",
+        labelLang: "iconSecondaryColor",
+        descLang: "iconSecondaryColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u5B57\u4F53\u989C\u8272",
+        value: "--ibiz-panel-app-header-menu-color",
+        defaultValue: "--ibiz-color-text-menu",
+        labelLang: "appMenuColor",
+        descLang: "appMenuColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u60AC\u6D6E\u5B57\u4F53\u8272",
+        value: "--ibiz-panel-app-header-active-color",
+        defaultValue: "--ibiz-color-primary-active-text",
+        labelLang: "appMenuHoverColor",
+        descLang: "appMenuHoverColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u60AC\u6D6E\u80CC\u666F\u8272",
+        value: "--ibiz-panel-app-header-active-bg-color",
         defaultValue: "--ibiz-color-primary-active",
-        labelLang: "sidebarHoverBgColor",
-        descLang: "sidebarHoverBgColorDesc",
+        labelLang: "appMenuHoverBgColor",
+        descLang: "appMenuHoverBgColorDesc",
+        className: "ibiz-panel-app-header"
+      },
+      {
+        label: "\u5E94\u7528\u83DC\u5355\u9009\u4E2D\u5B57\u4F53\u8272",
+        value: "--ibiz-panel-app-header-hover-color",
+        defaultValue: "--ibiz-color-primary-hover-text",
+        labelLang: "appMenuActiveColor",
+        descLang: "appMenuActiveColorDesc",
         className: "ibiz-panel-app-header"
       },
       {
-        label: "\u9009\u4E2D\u8272",
+        label: "\u5E94\u7528\u83DC\u5355\u9009\u4E2D\u80CC\u666F\u8272",
         value: "--ibiz-panel-app-header-hover-bg-color",
         defaultValue: "--ibiz-color-primary-hover",
-        labelLang: "sidebarSelectBgColor",
-        descLang: "sidebarSelectBgColorDesc",
+        labelLang: "appMenuActiveBgColor",
+        descLang: "appMenuActiveBgColorDesc",
         className: "ibiz-panel-app-header"
       }
     ]