From f32a7105c38ee455c4b165d48651ef19fc6948db Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 18:35:55 +0800
Subject: [PATCH] !68 修复升级依赖带来的问题 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance

---
 src/types/global.d.ts |   82 +++++++++++++++++++++-------------------
 1 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index bb1c1e2..c6cb210 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,4 +1,5 @@
 import type { ComponentInternalInstance as ComponentInstance, PropType as VuePropType } from 'vue/runtime-core';
+import { LanguageEnum } from '@/enums/LanguageEnum';
 
 declare global {
   /** vue Instance */
@@ -49,6 +50,8 @@
     /** 鏄惁绂佺敤涓婁紶 */
     isUploading: boolean;
 
+    updateSupport: number;
+
     /** 鍏朵粬鍙傛暟 */
     [key: string]: any;
   }
@@ -87,76 +90,77 @@
     pageNum: number;
     pageSize: number;
   }
+  declare interface LayoutSetting {
+    /**
+     * 鏄惁鏄剧ず椤堕儴瀵艰埅
+     */
+    topNav: boolean;
 
-  declare type DefaultSettings = {
+    /**
+     * 鏄惁鏄剧ず澶氭爣绛惧鑸�
+     */
+    tagsView: boolean;
+    /**
+     * 鏄惁鍥哄畾澶撮儴
+     */
+    fixedHeader: boolean;
+    /**
+     * 鏄惁鏄剧ず渚ц竟鏍廘ogo
+     */
+    sidebarLogo: boolean;
+    /**
+     * 鏄惁鏄剧ず鍔ㄦ�佹爣棰�
+     */
+    dynamicTitle: boolean;
+    /**
+     * 渚ц竟鏍忎富棰� theme-dark | theme-light
+     */
+    sideTheme: string;
+    /**
+     * 涓婚妯″紡
+     */
+    theme: string;
+  }
+
+  declare interface DefaultSettings extends LayoutSetting {
     /**
      * 缃戦〉鏍囬
      */
     title: string;
 
     /**
-     * 渚ц竟鏍忎富棰� theme-dark | theme-light
-     */
-    sideTheme?: string;
-
-    /**
      * 鏄惁鏄剧ず绯荤粺甯冨眬璁剧疆
      */
-    showSettings?: boolean;
+    showSettings: boolean;
 
-    /**
-     * 鏄惁鏄剧ず椤堕儴瀵艰埅
-     */
-    topNav?: boolean;
-
-    /**
-     * 鏄惁鏄剧ず澶氭爣绛惧鑸�
-     */
-    tagsView?: boolean;
-    /**
-     * 鏄惁鍥哄畾澶撮儴
-     */
-    fixedHeader?: boolean;
-    /**
-     * 鏄惁鏄剧ず渚ц竟鏍廘ogo
-     */
-    sidebarLogo?: boolean;
     /**
      * 瀵艰埅鏍忓竷灞�
      */
-    layout?: string;
-    /**
-     * 涓婚妯″紡
-     */
-    theme?: string;
+    layout: string;
 
     /**
      * 甯冨眬澶у皬
      */
-    size?: string;
+    size: 'large' | 'default' | 'small';
 
     /**
      * 璇█
      */
-    language?: string;
+    language: LanguageEnum;
 
-    /**
-     * 鏄惁鏄剧ず鍔ㄦ�佹爣棰�
-     */
-    dynamicTitle?: boolean;
     /**
      * 鏄惁鍚敤鍔ㄧ敾鏁堟灉
      */
-    animationEnable?: boolean;
+    animationEnable: boolean;
     /**
      *  鏄惁鍚敤鏆楅粦妯″紡
      *
      * true:鏆楅粦妯″紡
      * false: 鏄庝寒妯″紡
      */
-    dark?: boolean;
+    dark: boolean;
 
-    errorLog?: string;
-  };
+    errorLog: string;
+  }
 }
 export {};

--
Gitblit v1.9.3