!64 版本升级

* Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts
* 升级依赖
* !61 fix: 删除重复环境变量ElUploadInstance
* fix: 删除重复环境变量ElUploadInstance

src/types/element.d.ts

@@ -1,12 +1,12 @@
 import type * as ep from 'element-plus';
 declare global {
   declare type ElTagType = '' | 'success' | 'warning' | 'info' | 'danger' | 'default' | 'primary';
-  declare type ElFormInstance = InstanceType<typeof ep.ElForm>;
-  declare type ElTableInstance = InstanceType<typeof ep.ElTable>;
+  declare type ElFormInstance = ep.FormInstance;
+  declare type ElTableInstance = ep.TableInstance;
+  declare type ElUploadInstance = ep.UploadInstance;
   declare type ElTreeInstance = InstanceType<typeof ep.ElTree>;
   declare type ElTreeSelectInstance = InstanceType<typeof ep.ElTreeSelect>;
   declare type ElSelectInstance = InstanceType<typeof ep.ElSelect>;
-  declare type ElUploadInstance = InstanceType<typeof ep.ElUpload>;
   declare type ElCardInstance = InstanceType<typeof ep.ElCard>;
   declare type ElDialogInstance = InstanceType<typeof ep.ElDialog>;
   declare type ElInputInstance = InstanceType<typeof ep.ElInput>;

src/types/env.d.ts

@@ -1,8 +1,9 @@
 declare module '*.vue' {
   import { DefineComponent } from 'vue';
-  const component: DefineComponent<{}, {}, any>;
-  export default component;
+  const Component: DefineComponent<{}, {}, any>;
+  export default Component;
 }
+
 declare module '*.avif' {
   const src: string;
   export default src;

src/types/global.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentInternalInstance as ComponentInstance, PropType as VuePropType } from 'vue';
+import type { ComponentInternalInstance as ComponentInstance, PropType as VuePropType } from 'vue/runtime-core';
 
 declare global {
   /** vue Instance */
@@ -87,5 +87,76 @@ declare global {
     pageNum: number;
     pageSize: number;
   }
+
+  declare type DefaultSettings = {
+    /**
+     * 网页标题
+     */
+    title: string;
+
+    /**
+     * 侧边栏主题 theme-dark | theme-light
+     */
+    sideTheme?: string;
+
+    /**
+     * 是否显示系统布局设置
+     */
+    showSettings?: boolean;
+
+    /**
+     * 是否显示顶部导航
+     */
+    topNav?: boolean;
+
+    /**
+     * 是否显示多标签导航
+     */
+    tagsView?: boolean;
+    /**
+     * 是否固定头部
+     */
+    fixedHeader?: boolean;
+    /**
+     * 是否显示侧边栏Logo
+     */
+    sidebarLogo?: boolean;
+    /**
+     * 导航栏布局
+     */
+    layout?: string;
+    /**
+     * 主题模式
+     */
+    theme?: string;
+
+    /**
+     * 布局大小
+     */
+    size?: string;
+
+    /**
+     * 语言
+     */
+    language?: string;
+
+    /**
+     * 是否显示动态标题
+     */
+    dynamicTitle?: boolean;
+    /**
+     * 是否启用动画效果
+     */
+    animationEnable?: boolean;
+    /**
+     *  是否启用暗黑模式
+     *
+     * true:暗黑模式
+     * false: 明亮模式
+     */
+    dark?: boolean;
+
+    errorLog?: string;
+  };
 }
 export {};

src/types/router.d.ts

@@ -1,36 +1,34 @@
-import { RouteRecordRaw } from 'vue-router';
-
+import { LocationQuery, type RouteMeta as VRouteMeta } from 'vue-router';
 declare module 'vue-router' {
-  declare type RouteOption = {
-    hidden?: boolean;
+  interface RouteMeta extends VRouteMeta {
+    link?: string;
+    title?: string;
+    affix?: boolean;
+    noCache?: boolean;
+    activeMenu?: string;
+    icon?: string;
+    breadcrumb?: boolean;
+  }
+
+  interface _RouteRecordBase {
+    hidden?: boolean | string | number;
     permissions?: string[];
     roles?: string[];
-    component?: any;
-    children?: RouteOption[];
     alwaysShow?: boolean;
-    parentPath?: string;
-    meta?: {
-      title: string;
-      icon: string;
-    };
     query?: string;
-  } & RouteRecordRaw;
-
-  declare interface _RouteLocationBase {
-    children?: RouteOption[];
   }
 
-  declare interface RouteLocationOptions {
+  interface _RouteLocationBase {
+    children?: _RouteRecordBase[];
+    path?: string;
+  }
+
+  interface TagView {
     fullPath?: string;
-  }
-
-  declare interface TagView extends Partial<_RouteLocationBase> {
+    name?: string;
+    path?: string;
     title?: string;
-    meta?: {
-      link?: string;
-      title?: string;
-      affix?: boolean;
-      noCache?: boolean;
-    };
+    meta?: RouteMeta;
+    query?: LocationQuery;
   }
 }

src/types/setting.d.ts

@@ -1,70 +0,0 @@
-declare type DefaultSettings = {
-  /**
-   * 网页标题
-   */
-  title?: string;
-
-  /**
-   * 侧边栏主题 theme-dark | theme-light
-   */
-  sideTheme?: string;
-
-  /**
-   * 是否显示系统布局设置
-   */
-  showSettings?: boolean;
-
-  /**
-   * 是否显示顶部导航
-   */
-  topNav?: boolean;
-
-  /**
-   * 是否显示多标签导航
-   */
-  tagsView?: boolean;
-  /**
-   * 是否固定头部
-   */
-  fixedHeader?: boolean;
-  /**
-   * 是否显示侧边栏Logo
-   */
-  sidebarLogo?: boolean;
-  /**
-   * 导航栏布局
-   */
-  layout?: string;
-  /**
-   * 主题模式
-   */
-  theme?: string;
-
-  /**
-   * 布局大小
-   */
-  size?: string;
-
-  /**
-   * 语言
-   */
-  language?: string;
-
-  /**
-   * 是否显示动态标题
-   */
-  dynamicTitle?: boolean;
-  /**
-   * 是否启用动画效果
-   */
-  animationEnable?: boolean;
-  /**
-   *  是否启用暗黑模式
-   *
-   * true:暗黑模式
-   * false: 明亮模式
-   */
-  dark?: boolean;
-
-  errorLog?: string;
-};