From e23b7c0964b0a697aff4308cb317c6285f369a61 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 28 Aug 2023 22:59:22 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E7=B1=BB=E5=90=8DBEM?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 82c51004bd1f36d95a8e6604f9378b9b06d47e96
---
 src/components/Upload/SingleUpload.vue | 46 ++++++++++++--------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/components/Upload/SingleUpload.vue b/src/components/Upload/SingleUpload.vue
index 4038c72b..631dc28e 100644
--- a/src/components/Upload/SingleUpload.vue
+++ b/src/components/Upload/SingleUpload.vue
@@ -8,8 +8,8 @@
     :before-upload="handleBeforeUpload"
     :http-request="uploadFile"
   >
-    <img v-if="imgUrl" :src="imgUrl" class="single" />
-    <el-icon v-else class="single-uploader-icon"><i-ep-plus /></el-icon>
+    <img v-if="imgUrl" :src="imgUrl" class="single-uploader__image" />
+    <el-icon v-else class="single-uploader__icon"><i-ep-plus /></el-icon>
   </el-upload>
 </template>
 
@@ -49,33 +49,29 @@ function handleBeforeUpload(file: UploadRawFile) {
 }
 </script>
 
-<style scoped>
-.single-uploader .single {
-  display: block;
-  width: 178px;
-  height: 178px;
-}
-</style>
-
-<style>
-.single-uploader .el-upload {
-  position: relative;
+<style scoped lang="scss">
+.single-uploader {
   overflow: hidden;
   cursor: pointer;
-  border: 1px dashed var(--el-border-color);
+  border: 1px var(--el-border-color) solid;
   border-radius: 6px;
-  transition: var(--el-transition-duration-fast);
-}
 
-.single-uploader .el-upload:hover {
-  border-color: var(--el-color-primary);
-}
+  &:hover {
+    border-color: var(--el-color-primary);
+  }
 
-.el-icon.single-uploader-icon {
-  width: 178px;
-  height: 178px;
-  font-size: 28px;
-  color: #8c939d;
-  text-align: center;
+  &__image {
+    display: block;
+    width: 178px;
+    height: 178px;
+  }
+
+  &___icon {
+    width: 178px;
+    height: 178px;
+    font-size: 28px;
+    color: #8c939d;
+    text-align: center;
+  }
 }
 </style>

From a2c858eccaca2ca3c5f1aa39b9e87b9096d61b78 Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 28 Aug 2023 23:06:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20:bug:=20=E7=82=B9=E5=87=BB=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=A0=8F=E6=98=BE=E7=A4=BA/=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=97=B6transition=E5=8A=A8=E7=94=BB=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: b1cbf2e7385ebf5b56e29c466c7d172364d015ae
---
 src/layout/components/NavBar/index.vue | 2 +-
 src/layout/index.vue                   | 2 +-
 src/store/modules/app.ts               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index 1f6b70e8..e935d450 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -7,7 +7,7 @@ const appStore = useAppStore();
  * 左侧菜单栏显示/隐藏
  */
 function toggleSideBar() {
-  appStore.toggleSidebar(true);
+  appStore.toggleSidebar();
 }
 </script>
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b943089d..c96ef8b7 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -72,7 +72,7 @@ function handleOutsideClick() {
 }
 
 function toggleSideBar() {
-  appStore.toggleSidebar(true);
+  appStore.toggleSidebar();
 }
 </script>
 
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index b538d0cf..e2e82356 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -32,9 +32,9 @@ export const useAppStore = defineStore("app", () => {
   });
 
   // actions
-  function toggleSidebar(withoutAnimation: boolean) {
+  function toggleSidebar() {
     sidebar.opened = !sidebar.opened;
-    sidebar.withoutAnimation = withoutAnimation;
+    sidebar.withoutAnimation = false;
     if (sidebar.opened) {
       sidebarStatus.value = "opened";
     } else {

From 5fd62c26feb835152ed6aa2863cd055006c65d3c Mon Sep 17 00:00:00 2001
From: hxr <1490493387@qq.com>
Date: Mon, 28 Aug 2023 23:18:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20:bug:=20=E5=85=BC=E5=AE=B9=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE=E6=BA=90=E5=92=8C?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 9823b72487d02b4286249fd783a1bc836f1f3b5b
---
 src/components/Dictionary/index.vue | 52 ++++++++++++++++++-----------
 src/views/demo/dict.vue             |  4 +--
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/components/Dictionary/index.vue b/src/components/Dictionary/index.vue
index 855ad4e1..b2e01d0f 100644
--- a/src/components/Dictionary/index.vue
+++ b/src/components/Dictionary/index.vue
@@ -1,20 +1,18 @@
 <template>
-  <div>
-    <el-select
-      v-model="selectedValue"
-      :placeholder="placeholder"
-      :disabled="disabled"
-      clearable
-      @change="handleChange"
-    >
-      <el-option
-        v-for="option in options"
-        :key="option.value"
-        :label="option.label"
-        :value="option.value"
-      />
-    </el-select>
-  </div>
+  <el-select
+    v-model="selectedValue"
+    :placeholder="placeholder"
+    :disabled="disabled"
+    clearable
+    @change="handleChange"
+  >
+    <el-option
+      v-for="option in options"
+      :key="option.value"
+      :label="option.label"
+      :value="option.value"
+    />
+  </el-select>
 </template>
 
 <script setup lang="ts">
@@ -29,8 +27,7 @@ const props = defineProps({
     required: true,
   },
   modelValue: {
-    type: String,
-    default: "",
+    type: [String, Number],
   },
   placeholder: {
     type: String,
@@ -46,9 +43,24 @@ const emits = defineEmits(["update:modelValue"]); // 父组件监听事件，同
 
 const options: Ref<OptionType[]> = ref([]); // 字典下拉数据源
 
-const selectedValue = computed(() => props.modelValue.toString()); // 将父组件的值统一转化String和下拉数据源进行比较，避免值的类型不一致导致回显失败
+const selectedValue = ref<string | number | undefined>();
 
-function handleChange(val?: string) {
+watch([options, () => props.modelValue], ([newOptions, newModelValue]) => {
+  if (newOptions.length === 0) return; // 下拉数据源加载未完成不回显
+  if (newModelValue == undefined) {
+    selectedValue.value = undefined;
+    return;
+  }
+  if (typeof newOptions[0].value === "number") {
+    selectedValue.value = Number(newModelValue);
+  } else if (typeof newOptions[0].value === "string") {
+    selectedValue.value = String(newModelValue);
+  } else {
+    selectedValue.value = newModelValue;
+  }
+});
+
+function handleChange(val?: string | number | undefined) {
   emits("update:modelValue", val);
 }
 
diff --git a/src/views/demo/dict.vue b/src/views/demo/dict.vue
index bcd594da..fcb6e060 100644
--- a/src/views/demo/dict.vue
+++ b/src/views/demo/dict.vue
@@ -1,7 +1,7 @@
 <!-- 字典组件示例 -->
 <script setup lang="ts">
 const stringValue = ref("1"); // 性别(值为String)
-const nmberValue = ref(1); // 性别(值为Number)
+const numberValue = ref(1); // 性别(值为Number)
 </script>
 
 <template>
@@ -22,7 +22,7 @@ const nmberValue = ref(1); // 性别(值为Number)
       </el-form-item>
 
       <el-form-item label="性别">
-        <dictionary v-model="nmberValue" type-code="gender" />
+        <dictionary v-model="numberValue" type-code="gender" />
         <el-link :underline="false" type="success" class="ml-5"
           >值为Number: const value = ref(1);
         </el-link>