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

package/es/common/custom-filter-condition/custom-filter-condition.d.ts

@@ -584,6 +584,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                                     modelId?: string | undefined;
                                     modelType?: string | undefined;
                                 }[] | undefined;
+                                sysPFPluginId?: string | undefined;
                                 viewLogicType?: string | undefined;
                                 builtinLogic?: boolean | undefined;
                                 codeName?: string | undefined;
@@ -622,6 +623,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                             appUILogicId?: string | undefined;
                             appViewEngineId?: string | undefined;
                             appViewLogicId?: string | undefined;
+                            sysPFPluginId?: string | undefined;
                             ctrlName?: string | undefined;
                             scriptCode?: string | undefined;
                             timer?: number | undefined;
@@ -881,6 +883,7 @@ export declare const IBizCustomFilterCondition: import("vue").DefineComponent<{
                             modelType?: string | undefined;
                         } | undefined;
                     } | undefined;
+                    sysPFPluginId?: string | undefined;
                     renderName?: string | undefined;
                     renderType?: string | undefined;
                     appId: string;

package/es/common/custom-theme/custom-theme-model.mjs

@@ -126,35 +126,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"
               }
             ]
@@ -290,21 +290,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"
               }
             ]
           }
@@ -363,32 +363,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"
       }
     ]
@@ -398,35 +463,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"
       }
     ]

package/es/common/custom-theme/custom-theme.controller.d.ts

@@ -20,6 +20,15 @@ export declare class CustomThemeController {
      * @memberof CustomThemeController
      */
     model: IData[];
+    /**
+     * 模型映射对象，key为value，value值为var对象
+     *
+     * @author tony001
+     * @date 2024-12-27 10:12:57
+     * @private
+     * @type {IData}
+     */
+    private modelMapping;
     /**
      * 预定义类型
      *
@@ -27,6 +36,40 @@ export declare class CustomThemeController {
      * @memberof CustomThemeController
      */
     predefineType: IData[];
+    /**
+     * Creates an instance of CustomThemeController.
+     * @author tony001
+     * @date 2024-12-26 18:12:28
+     */
+    constructor();
+    /**
+     * 初始化模型映射
+     *
+     * @author tony001
+     * @date 2024-12-27 13:12:53
+     * @private
+     * @param {IData} item
+     */
+    private initModelMapping;
+    /**
+     * 获取模型编辑数据
+     *
+     * @author tony001
+     * @date 2024-12-27 13:12:48
+     * @public
+     * @return {*}  {IData}
+     */
+    getModelEditData(): IData;
+    /**
+     * 获取单个分组的模型数据
+     *
+     * @author tony001
+     * @date 2024-12-27 13:12:05
+     * @private
+     * @param {IData} item
+     * @param {IData} result
+     */
+    private getSingleGroupModelData;
     /**
      * 获取css变量
      *
@@ -35,6 +78,50 @@ export declare class CustomThemeController {
      * @memberof CustomThemeController
      */
     getCssVar(name: string, defaultVar?: string): string | number;
+    /**
+     * 处理主题变更
+     *
+     * @author tony001
+     * @date 2024-12-26 15:12:57
+     * @param {string} tag
+     * @return {*}  {Promise<void>}
+     */
+    handleThemeChange(tag: string): Promise<void>;
+    /**
+     * 计算变更主题变量
+     *
+     * @author tony001
+     * @date 2024-12-27 17:12:21
+     * @param {IData} newData
+     * @return {*}  {Promise<void>}
+     */
+    computeChangeThemeVars(newData: IData): Promise<void>;
+    /**
+     * 处理主题预览
+     *
+     * @author tony001
+     * @date 2024-12-26 17:12:59
+     * @return {*}  {Promise<void>}
+     */
+    handleThemePreview(isLoad: boolean): Promise<void>;
+    /**
+     * 处理主题保存
+     *
+     * @author tony001
+     * @date 2024-12-26 18:12:44
+     * @param {boolean} isShare
+     * @return {*}  {Promise<void>}
+     */
+    handleThemeSave(isShare: boolean): Promise<void>;
+    /**
+     * 处理主题重置
+     *
+     * @author tony001
+     * @date 2024-12-27 20:12:03
+     * @param {boolean} isShare
+     * @return {*}  {Promise<void>}
+     */
+    handleThemeReset(isShare: boolean): Promise<void>;
     /**
      * 计算尺寸改变，同类size批量更改
      *
@@ -43,5 +130,4 @@ export declare class CustomThemeController {
      * @memberof CustomThemeController
      */
     calcSizeChange(varName: string, size: number, item: IData): void;
-    constructor();
 }