tongtong/vue3-element-admin
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ray.Hao
2025-03-01 00:50:55 +08:00
parent 70b53cf306 7b6ea62996
commit 7e7ca3a954
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mock/auth.mock.ts
View File

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

1
src/components/Upload/MultiImageUpload.vue
View File

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

1
src/components/Upload/SingleImageUpload.vue
View File

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

7
src/store/modules/tags-view.ts
View File

@@ -8,8 +8,11 @@ export const useTagsViewStore = defineStore("tagsView", () => {
* 添加已访问视图到已访问视图列表中 * 添加已访问视图到已访问视图列表中
*/ */
function addVisitedView(view: TagView) { 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; return;
} }
// 如果视图是固定的（affix），则在已访问的视图列表的开头添加 // 如果视图是固定的（affix），则在已访问的视图列表的开头添加