From 1d5133b6957d95c0c2b1e9641f21a03d9a1c85bb Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期四, 14 十二月 2023 16:17:12 +0800
Subject: [PATCH] !69 修复升级依赖带来的类型问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * 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 |  104 +++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 2083d4b..10cc438 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -1,18 +1,27 @@
-import { FormRules } from 'element-plus';
+import type { ComponentInternalInstance as ComponentInstance } from 'vue/runtime-core';
+import type { PropType as VuePropType } from 'vue';
+import { LanguageEnum } from '@/enums/LanguageEnum';
+
 declare global {
+  /** vue Instance */
+  declare type ComponentInternalInstance = ComponentInstance;
+  /**vue */
+  declare type PropType<T> = VuePropType<T>;
+
   /**
    * 鐣岄潰瀛楁闅愯棌灞炴��
    */
-  interface FieldOption {
+  declare interface FieldOption {
     key: number;
     label: string;
     visible: boolean;
+    children?: Array<FieldOption>;
   }
 
   /**
    * 寮圭獥灞炴��
    */
-  interface DialogOption {
+  declare interface DialogOption {
     /**
      * 寮圭獥鏍囬
      */
@@ -23,7 +32,7 @@
     visible: boolean;
   }
 
-  interface UploadOption {
+  declare interface UploadOption {
     /** 璁剧疆涓婁紶鐨勮姹傚ご閮� */
     headers: { [key: string]: any };
 
@@ -34,7 +43,7 @@
   /**
    * 瀵煎叆灞炴��
    */
-  interface ImportOption extends UploadOption {
+  declare interface ImportOption extends UploadOption {
     /** 鏄惁鏄剧ず寮瑰嚭灞� */
     open: boolean;
     /** 寮瑰嚭灞傛爣棰� */
@@ -42,21 +51,24 @@
     /** 鏄惁绂佺敤涓婁紶 */
     isUploading: boolean;
 
+    updateSupport: number;
+
     /** 鍏朵粬鍙傛暟 */
     [key: string]: any;
   }
   /**
    * 瀛楀吀鏁版嵁  鏁版嵁閰嶇疆
    */
-  interface DictDataOption {
+  declare interface DictDataOption {
     label: string;
     value: string;
     elTagType?: ElTagType;
     elTagClass?: string;
   }
 
-  interface BaseEntity {
+  declare interface BaseEntity {
     createBy?: any;
+    createDept?: any;
     createTime?: string;
     updateBy?: any;
     updateTime?: any;
@@ -67,17 +79,89 @@
    * T : 琛ㄥ崟鏁版嵁
    * D : 鏌ヨ鍙傛暟
    */
-  interface PageData<T, D> {
+  declare interface PageData<T, D> {
     form: T;
     queryParams: D;
-    rules: FormRules;
+    rules: ElFormRules;
   }
   /**
    * 鍒嗛〉鏌ヨ鍙傛暟
    */
-  interface PageQuery {
+  declare interface PageQuery {
     pageNum: number;
     pageSize: number;
   }
+  declare interface LayoutSetting {
+    /**
+     * 鏄惁鏄剧ず椤堕儴瀵艰埅
+     */
+    topNav: boolean;
+
+    /**
+     * 鏄惁鏄剧ず澶氭爣绛惧鑸�
+     */
+    tagsView: boolean;
+    /**
+     * 鏄惁鍥哄畾澶撮儴
+     */
+    fixedHeader: boolean;
+    /**
+     * 鏄惁鏄剧ず渚ц竟鏍廘ogo
+     */
+    sidebarLogo: boolean;
+    /**
+     * 鏄惁鏄剧ず鍔ㄦ�佹爣棰�
+     */
+    dynamicTitle: boolean;
+    /**
+     * 渚ц竟鏍忎富棰� theme-dark | theme-light
+     */
+    sideTheme: string;
+    /**
+     * 涓婚妯″紡
+     */
+    theme: string;
+  }
+
+  declare interface DefaultSettings extends LayoutSetting {
+    /**
+     * 缃戦〉鏍囬
+     */
+    title: string;
+
+    /**
+     * 鏄惁鏄剧ず绯荤粺甯冨眬璁剧疆
+     */
+    showSettings: boolean;
+
+    /**
+     * 瀵艰埅鏍忓竷灞�
+     */
+    layout: string;
+
+    /**
+     * 甯冨眬澶у皬
+     */
+    size: 'large' | 'default' | 'small';
+
+    /**
+     * 璇█
+     */
+    language: LanguageEnum;
+
+    /**
+     * 鏄惁鍚敤鍔ㄧ敾鏁堟灉
+     */
+    animationEnable: boolean;
+    /**
+     *  鏄惁鍚敤鏆楅粦妯″紡
+     *
+     * true:鏆楅粦妯″紡
+     * false: 鏄庝寒妯″紡
+     */
+    dark: boolean;
+
+    errorLog: string;
+  }
 }
 export {};

--
Gitblit v1.9.3