diff --git a/src/App.vue b/src/App.vue index 5c51614..0be91eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,11 +42,11 @@ const rootDirectory = reactive( // component就是一个vue组件,类似于miaoDirectory const createView = ( component: any, - currentDirectorys?: VirtualDirectory[], + currentDirectories?: VirtualDirectory[], currentFiles?: VirtualFile[], index?: number ) => { - views.push(component, currentDirectorys, currentFiles, index) + views.push(component, currentDirectories, currentFiles, index) } const deleteView = (index: number) => { @@ -147,7 +147,7 @@ onMounted(() => { @click=" createView( view.component, - view.currentDirectorys, + view.currentDirectories, view.currentFiles, index + 1 ) @@ -186,7 +186,7 @@ onMounted(() => { :key="view.uid"> boolean - func: (VDirectorys: VirtualDirectory[], VFiles: VirtualFile[]) => void + filter: (VDirectories: VirtualDirectory[], VFiles: VirtualFile[]) => boolean + func: (VDirectories: VirtualDirectory[], VFiles: VirtualFile[]) => void } export default class PluginCenter { @@ -30,7 +30,7 @@ export default class PluginCenter { name: string, getComponent: () => Promise, filter: ( - VDirectorys: VirtualDirectory[], + VDirectories: VirtualDirectory[], VFiles: VirtualFile[] ) => boolean ): void { @@ -40,22 +40,22 @@ export default class PluginCenter { name, filter, func: async ( - VDirectorys: VirtualDirectory[], + VDirectories: VirtualDirectory[], VFiles: VirtualFile[] ) => { - if (filter(VDirectorys, VFiles) === false) { + if (filter(VDirectories, VFiles) === false) { return } if (_component === undefined) _component = await getComponent() - views.push(_component, VDirectorys, VFiles) + views.push(_component, VDirectories, VFiles) } }) } - getUsablePlugin(VDirectorys: VirtualDirectory[], VFiles: VirtualFile[]) { + getUsablePlugin(VDirectories: VirtualDirectory[], VFiles: VirtualFile[]) { const usableList = [] for (let key of Object.keys(this.pluginsMap)) { - if (this.pluginsMap[key].filter(VDirectorys, VFiles)) { + if (this.pluginsMap[key].filter(VDirectories, VFiles)) { usableList.push(key) } } @@ -67,9 +67,9 @@ export default class PluginCenter { usePlugin( key: string, - VDirectorys: VirtualDirectory[], + VDirectories: VirtualDirectory[], VFiles: VirtualFile[] ) { - this.pluginsMap[key].func(VDirectorys, VFiles) + this.pluginsMap[key].func(VDirectories, VFiles) } } diff --git a/src/class/VirtualDirectory.ts b/src/class/VirtualDirectory.ts index 78de134..f740442 100644 --- a/src/class/VirtualDirectory.ts +++ b/src/class/VirtualDirectory.ts @@ -43,7 +43,7 @@ class VirtualDirectory { // 子文件 files?: VirtualFile[]; // 子目录 - directorys?: VirtualDirectory[]; + directories?: VirtualDirectory[]; // 没啥意义,标注一下就是了 type: "directory"; // 文件夹创建时间等杂项属性 @@ -98,9 +98,9 @@ class VirtualDirectory { updateContent(content: (file | directory)[]) { this.files = this.files ?? []; - this.directorys = this.directorys ?? []; + this.directories = this.directories ?? []; const fileNames: string[] = this.files.map(v => v.name); - const dirNames: string[] = this.directorys.map(v => v.name); + const dirNames: string[] = this.directories.map(v => v.name); const itemNames: string[] = content.map(v => v.name); // 删去远程端已不存在的文件与文件夹 const _delete = (target: (VirtualFile | VirtualDirectory)[]) => { @@ -114,7 +114,7 @@ class VirtualDirectory { } }; _delete(this.files); - _delete(this.directorys); + _delete(this.directories); // 加入新的文件与文件夹 for (let item of content) { if (item.type === "file") { @@ -123,7 +123,7 @@ class VirtualDirectory { } } else if (item.type === "directory") { if (!dirNames.includes(item.name)) { - this.directorys.push(new VirtualDirectory(item, this)); + this.directories.push(new VirtualDirectory(item, this)); } } } @@ -131,7 +131,7 @@ class VirtualDirectory { hasChild(item: VirtualDirectory | VirtualFile): boolean { if (item.type === "directory") { - return this.directorys?.includes(item) ?? false; + return this.directories?.includes(item) ?? false; } else { return this.files?.includes(item) ?? false; } diff --git a/src/class/VirtualPage.ts b/src/class/VirtualPage.ts index 63031ee..2bc4361 100644 --- a/src/class/VirtualPage.ts +++ b/src/class/VirtualPage.ts @@ -13,9 +13,9 @@ const getRandomWebSafeColor = (() => { })(); export default class VirtualPage { - constructor(component: any, initObjects?: { directorys?: VirtualDirectory[]; files?: VirtualFile[] }) { + constructor(component: any, initObjects?: { directories?: VirtualDirectory[]; files?: VirtualFile[] }) { this.component = shallowRef(component); - this.currentDirectorys = initObjects?.directorys ?? []; + this.currentDirectories = initObjects?.directories ?? []; this.currentFiles = initObjects?.files ?? []; this.visible = true; this.uid = generateId(); @@ -27,7 +27,7 @@ export default class VirtualPage { // 是否可见 visible: boolean; // 当前正在使用的文件夹 - currentDirectorys: VirtualDirectory[]; + currentDirectories: VirtualDirectory[]; // 当前正在使用的文件 currentFiles: VirtualFile[]; // 区分每一个页面的唯一id @@ -43,7 +43,7 @@ export default class VirtualPage { if (this._title) { return this._title; } - return this?.currentDirectorys[0]?.name ?? this?.currentFiles[0]?.name ?? "未命名标签"; + return this?.currentDirectories[0]?.name ?? this?.currentFiles[0]?.name ?? "未命名标签"; } setTitle(title: string) { @@ -101,14 +101,14 @@ export class VirtualPages { /** * 推入一个新的页面 */ - push(component: any, currentDirectorys?: VirtualDirectory[], currentFiles?: VirtualFile[], index?: number) { + push(component: any, currentDirectories?: VirtualDirectory[], currentFiles?: VirtualFile[], index?: number) { index ?? (index = this.length); this._views.splice( index, 0, reactive( new VirtualPage(component, { - directorys: [...(currentDirectorys ?? [])], + directories: [...(currentDirectories ?? [])], files: [...(currentFiles ?? [])] }) ) diff --git a/src/hooks/useVirtualPages.ts b/src/hooks/useVirtualPages.ts index 60537ec..175c5d0 100644 --- a/src/hooks/useVirtualPages.ts +++ b/src/hooks/useVirtualPages.ts @@ -3,7 +3,7 @@ import { Reactive, reactive } from "vue" let views: Reactive -export default function useViretualPages(){ +export default function useVirtualPages(){ if(views === undefined) { // views = reactive([]) views = reactive(new VirtualPages()) diff --git a/src/views/miaoDirectory.vue b/src/views/miaoDirectory.vue index 215ca8f..c5add56 100644 --- a/src/views/miaoDirectory.vue +++ b/src/views/miaoDirectory.vue @@ -154,20 +154,20 @@ class SelectedItem { return false } // @ts-ignore - return [...currentDirectory.value?.directorys, ...currentDirectory.value?.files].includes(v) + return [...currentDirectory.value?.directories, ...currentDirectory.value?.files].includes(v) }) } } // 已选择的item,用于多选功能 const selectedItem = reactive(new SelectedItem()) -const currentDirectorys = defineModel('currentDirectorys', { +const currentDirectories = defineModel('currentDirectories', { required: true }) // 目前展示的Dir const currentDirectory = computed(() => { - return currentDirectorys.value[0] + return currentDirectories.value[0] }) // 当前组件在views中的序号 @@ -177,8 +177,8 @@ const index = computed(() => { // 用于展示的数据,后续会增加排序等操作 const showData_directory = computed(() => { - const data = currentDirectory.value?.directorys - ? [...currentDirectory.value?.directorys] + const data = currentDirectory.value?.directories + ? [...currentDirectory.value?.directories] : [] return data }) @@ -189,8 +189,8 @@ const showData_files = computed(() => { return data }) // const showData_all = computed<(VirtualDirectory | VirtualFile)[]>(() => { -// const data = currentDirectory.value?.directorys -// ? [...currentDirectory.value?.directorys] +// const data = currentDirectory.value?.directories +// ? [...currentDirectory.value?.directories] // : [] // data.push(...currentDirectory.value?.files) // return data @@ -206,13 +206,13 @@ const setCurrentDirectory = async (virtualDirectory: VirtualDirectory) => { // 若没有缓存数据则同步刷新,有缓存数据则异步刷新 if ( virtualDirectory.files === undefined || - virtualDirectory.directorys === undefined + virtualDirectory.directories === undefined ) { await virtualDirectory.update() } else { virtualDirectory.update() } - currentDirectorys.value[0] = virtualDirectory + currentDirectories.value[0] = virtualDirectory } const reload = () => { diff --git a/src/views/miaoVideoPlayer.vue b/src/views/miaoVideoPlayer.vue index 61aee9f..7a5ec6d 100644 --- a/src/views/miaoVideoPlayer.vue +++ b/src/views/miaoVideoPlayer.vue @@ -10,7 +10,7 @@ import { VirtualFile } from '@/class/VirtualDirectory' import miaoDropHandler from '@/components/miaoDropHandler.vue' import { onBeforeUnmount, onMounted, ref } from 'vue' -// import useViretualPages from '@/hooks/useVirtualPages'; +// import useVirtualPages from '@/hooks/useVirtualPages'; import XGPlayer from 'xgplayer' import '@/style/xgplayer.scss' import TextTrack from 'xgplayer/es/plugins/track' @@ -26,7 +26,7 @@ const currentFiles = defineModel('currentFiles', { required: true }) -// const views = useViretualPages() +// const views = useVirtualPages() // const view = views.getView(props.id) // const videoPath = ref('');