From 20fadd2cfde1587379b255d7871764a6fe4672f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= <me@yanhao.ren>
Date: Mon, 23 Dec 2024 10:09:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/{ => styles}/base.css           | 0
 src/assets/styles/index.ts                 | 6 ++++++
 src/assets/{ => styles}/main.css           | 8 +-------
 src/assets/{ => styles}/reset-primevue.css | 4 ++++
 src/components/primevue/primevue.vue       | 1 +
 src/main.ts                                | 8 +-------
 6 files changed, 13 insertions(+), 14 deletions(-)
 rename src/assets/{ => styles}/base.css (100%)
 create mode 100644 src/assets/styles/index.ts
 rename src/assets/{ => styles}/main.css (75%)
 rename src/assets/{ => styles}/reset-primevue.css (93%)

diff --git a/src/assets/base.css b/src/assets/styles/base.css
similarity index 100%
rename from src/assets/base.css
rename to src/assets/styles/base.css
diff --git a/src/assets/styles/index.ts b/src/assets/styles/index.ts
new file mode 100644
index 0000000..9b9c665
--- /dev/null
+++ b/src/assets/styles/index.ts
@@ -0,0 +1,6 @@
+import './main.css';
+
+import 'primeicons/primeicons.css';
+import './reset-primevue.css';
+
+import 'uno.css';
diff --git a/src/assets/main.css b/src/assets/styles/main.css
similarity index 75%
rename from src/assets/main.css
rename to src/assets/styles/main.css
index 42b50e1..8e37972 100644
--- a/src/assets/main.css
+++ b/src/assets/styles/main.css
@@ -1,5 +1,3 @@
-@import './base.css';
-
 #app {
   max-width: 1280px;
   margin: 0 auto;
@@ -7,8 +5,6 @@
   font-weight: normal;
 }
 
-/* button:not(.van-button),
-a, */
 .green {
   text-decoration: none;
   color: hsla(160, 100%, 37%, 1);
@@ -17,6 +13,4 @@ a, */
 }
 .green:hover {
   background-color: hsla(160, 100%, 37%, 0.2);
-}
-@media (hover: hover) {
-}
+}
\ No newline at end of file
diff --git a/src/assets/reset-primevue.css b/src/assets/styles/reset-primevue.css
similarity index 93%
rename from src/assets/reset-primevue.css
rename to src/assets/styles/reset-primevue.css
index 9489dbe..505585e 100644
--- a/src/assets/reset-primevue.css
+++ b/src/assets/styles/reset-primevue.css
@@ -24,3 +24,7 @@
 .p-fileupload-content .p-progressbar {
   --p-fileupload-progressbar-height: 1rem;
 }
+
+.p-dialog {
+  overflow: hidden;
+}
diff --git a/src/components/primevue/primevue.vue b/src/components/primevue/primevue.vue
index 2eda578..e5acedd 100644
--- a/src/components/primevue/primevue.vue
+++ b/src/components/primevue/primevue.vue
@@ -6,6 +6,7 @@ import { openConfirm, openDialog, openToast } from './fns';
 
 <template>
   <div class="primevue py-4 flex items-start flex-wrap gap-6">
+    <ProgressSpinner class="w-6 h-6 m-0" />
     <FloatLabel>
       <InputText default-value="DEFAULT_VALUE" id="username" />
       <label for="username">Username</label>
diff --git a/src/main.ts b/src/main.ts
index dcd3464..4903bed 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,10 +1,4 @@
-import './assets/main.css';
-
-// TODO: 测试样式导入顺序问题。 <ProgressSpinner v-if="!isLoading" class="w-6! h-6! m-0!" />
-import 'primeicons/primeicons.css';
-import '../assets/reset-primevue.css';
-
-import 'virtual:uno.css';
+import './assets/styles';
 
 import { createHead } from '@unhead/vue';
 import { setupEruda } from './plugins/eruda';