Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin

mock/auth.mock.ts

@@ -24,7 +24,8 @@ export default defineMock([
         accessToken:
           "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImRlcHRJZCI6MSwiZGF0YVNjb3BlIjoxLCJ1c2VySWQiOjIsImlhdCI6MTcyODE5MzA1MiwiYXV0aG9yaXRpZXMiOlsiUk9MRV9BRE1JTiJdLCJqdGkiOiJhZDg3NzlhZDZlYWY0OWY3OTE4M2ZmYmI5OWM4MjExMSJ9.58YHwL3sNNC22jyAmOZeSm-7MITzfHb_epBIz7LvWeA",
         tokenType: "Bearer",
-        refreshToken: null,
+        refreshToken:
+          "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImRlcHRJZCI6MSwiZGF0YVNjb3BlIjoxLCJ1c2VySWQiOjIsImlhdCI6MTcyODE5MzA1MiwiYXV0aG9yaXRpZXMiOlsiUk9MRV9BRE1JTiJdLCJqdGkiOiJhZDg3NzlhZDZlYWY0OWY3OTE4M2ZmYmI5OWM4MjExMSJ9.58YHwL3sNNC22jyAmOZeSm-7MITzfHb_epBIz7LvWeA",
         expires: null,
       },
       msg: "一切ok",

src/components/Upload/MultiImageUpload.vue

@@ -87,7 +87,6 @@ const previewImageIndex = ref(0); // 预览图片的索引
 
 const modelValue = defineModel("modelValue", {
   type: [Array] as PropType<string[]>,
-  required: true,
   default: () => [],
 });
 

src/components/Upload/SingleImageUpload.vue

@@ -77,7 +77,6 @@ const props = defineProps({
 
 const modelValue = defineModel("modelValue", {
   type: String,
-  required: true,
   default: () => "",
 });
 

src/store/modules/tags-view.ts

@@ -8,8 +8,11 @@ export const useTagsViewStore = defineStore("tagsView", () => {
    * 添加已访问视图到已访问视图列表中
    */
   function addVisitedView(view: TagView) {
-    // 如果已经存在于已访问的视图列表中，则不再添加
-    if (visitedViews.value.some((v) => v.path === view.path)) {
+    // 如果已经存在于已访问的视图列表中或者是重定向地址，则不再添加
+    if (view.path.startsWith("/redirect")) {
+      return;
+    }
+    if (visitedViews.value.some((v) => v.name === view.name)) {
       return;
     }
     // 如果视图是固定的（affix），则在已访问的视图列表的开头添加