From 466724080e4360d6f86c20db84592bc3e92b129b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8F=B2=E9=B8=BD?= <1020103647@qq.com>
Date: Mon, 6 Jan 2025 13:32:39 +0800
Subject: [PATCH] Merge pull request #42 from Rem-Blove/main
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 枚举失效问题 & 分离全局声明和模块化内容
---
 src/pages/index/index.vue |  2 ++
 src/typings.d.ts          | 28 ++++++++++++++++++++++++++++
 src/typings.ts            | 31 ++++---------------------------
 tsconfig.json             |  3 ++-
 4 files changed, 36 insertions(+), 28 deletions(-)
 create mode 100644 src/typings.d.ts

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 84d3606..59da0ab 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -31,6 +31,7 @@
 </template>
 
 <script lang="ts" setup>
+import { TestEnum } from '@/typings'
 import PLATFORM from '@/utils/platform'
 
 defineOptions({
@@ -46,6 +47,7 @@ const description = ref(
 // 测试 uni API 自动引入
 onLoad(() => {
   console.log(author)
+  console.log(TestEnum.A)
 })
 </script>
 
diff --git a/src/typings.d.ts b/src/typings.d.ts
new file mode 100644
index 0000000..0ab0858
--- /dev/null
+++ b/src/typings.d.ts
@@ -0,0 +1,28 @@
+// 全局要用的类型放到这里
+
+declare global {
+  type IResData<T> = {
+    code: number
+    msg: string
+    data: T
+  }
+
+  // uni.uploadFile文件上传参数
+  type IUniUploadFileOptions = {
+    file?: File
+    files?: UniApp.UploadFileOptionFiles[]
+    filePath?: string
+    name?: string
+    formData?: any
+  }
+
+  type IUserInfo = {
+    nickname?: string
+    avatar?: string
+    /** 微信的 openid，非微信没有这个字段 */
+    openid?: string
+    token?: string
+  }
+}
+
+export {} // 防止模块污染
diff --git a/src/typings.ts b/src/typings.ts
index 06354be..016e462 100644
--- a/src/typings.ts
+++ b/src/typings.ts
@@ -1,29 +1,6 @@
-// 全局要用的类型放到这里
+// 枚举定义
 
-type IResData<T> = {
-  code: number
-  msg: string
-  data: T
-}
-
-// uni.uploadFile文件上传参数
-type IUniUploadFileOptions = {
-  file?: File
-  files?: UniApp.UploadFileOptionFiles[]
-  filePath?: string
-  name?: string
-  formData?: any
-}
-
-type IUserInfo = {
-  nickname?: string
-  avatar?: string
-  /** 微信的 openid，非微信没有这个字段 */
-  openid?: string
-  token?: string
-}
-
-enum TestEnum {
-  A = 'a',
-  B = 'b',
+export enum TestEnum {
+  A = '1',
+  B = '2',
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8390fbe..495932e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,8 @@
       "@uni-helper/uni-types",
       "@types/wechat-miniprogram",
       "wot-design-uni/global.d.ts",
-      "z-paging/types"
+      "z-paging/types",
+      "./src/typings.d.ts"
     ]
   },
   "vueCompilerOptions": {