!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

@@ -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 @@ declare global {
     /** 是否禁用上传 */
     isUploading: boolean;
 
+    updateSupport: number;
+
     /** 其他参数 */
     [key: string]: any;
   }
@@ -87,76 +90,77 @@ declare global {
     pageNum: number;
     pageSize: number;
   }
+  declare interface LayoutSetting {
+    /**
+     * 是否显示顶部导航
+     */
+    topNav: boolean;
 
-  declare type DefaultSettings = {
+    /**
+     * 是否显示多标签导航
+     */
+    tagsView: boolean;
+    /**
+     * 是否固定头部
+     */
+    fixedHeader: boolean;
+    /**
+     * 是否显示侧边栏Logo
+     */
+    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;
-    /**
-     * 是否显示侧边栏Logo
-     */
-    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 {};

src/types/module.d.ts

@@ -1,13 +1,13 @@
-import type modal from '@/plugins/modal';
-import type tab from '@/plugins/tab';
-import type download from '@/plugins/download';
-import type auth from '@/plugins/auth';
-import type cache from '@/plugins/cache';
-import type animate from '@/animate';
-import type { useDict } from '@/utils/dict';
-import type { addDateRange, handleTree, selectDictLabel, selectDictLabels, parseTime } from '@/utils/ruoyi';
-import type { getConfigKey, updateConfigByKey } from '@/api/system/config';
-import type { download as rd } from '@/utils/request';
+import modal from '@/plugins/modal';
+import tab from '@/plugins/tab';
+import download from '@/plugins/download';
+import auth from '@/plugins/auth';
+import cache from '@/plugins/cache';
+import animate from '@/animate';
+import { useDict } from '@/utils/dict';
+import handleTree, { addDateRange, selectDictLabel, selectDictLabels, parseTime } from '@/utils/ruoyi';
+import { getConfigKey, updateConfigByKey } from '@/api/system/config';
+import { download as rd } from '@/utils/request';
 
 declare module '@vue/runtime-core' {
   interface ComponentCustomProperties {