From cd7a4cfae0f1bc68f5ae006b87a35399a0a09ffa Mon Sep 17 00:00:00 2001 From: congzc Date: Wed, 30 Aug 2023 18:03:05 +0800 Subject: [PATCH] 2 --- index.html | 2 +- package.json | 1 - src/lang/package/en.ts | 2 +- src/lang/package/zh-cn.ts | 2 +- src/settings.ts | 2 +- src/types/components.d.ts | 33 -- src/views/createVideo/index copy.vue | 42 +-- src/views/createVideo/index.vue | 2 +- src/views/login/index.vue | 13 +- yarn.lock | 484 +-------------------------- 10 files changed, 46 insertions(+), 537 deletions(-) diff --git a/index.html b/index.html index 5511258..88f8717 100644 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - Metavatar-PC + Metavatar-慧语 diff --git a/package.json b/package.json index 78d618b..7f40e27 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "dayjs": "^1.11.8", "echarts": "^5.2.2", "element-plus": "^2.3.1", - "fabric": "^5.3.0", "js-audio-recorder": "^1.0.7", "nprogress": "^0.2.0", "path-browserify": "^1.0.1", diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts index f85c632..aeffe3c 100644 --- a/src/lang/package/en.ts +++ b/src/lang/package/en.ts @@ -13,7 +13,7 @@ export default { }, // 登录页面国际化 login: { - title: "Metavatar-PC", + title: "MetaTalker", username: "Username", email: "E-mail/Phone", password: "Password", diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts index 5466d16..6cdd1e8 100644 --- a/src/lang/package/zh-cn.ts +++ b/src/lang/package/zh-cn.ts @@ -13,7 +13,7 @@ export default { }, // 登录页面国际化 login: { - title: "Metavatar-PC", + title: "MetaTalker", username: "用户名", email: "电子邮件/手机号", password: "密码", diff --git a/src/settings.ts b/src/settings.ts index 5ad7cba..8fb6cf4 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -42,7 +42,7 @@ interface DefaultSettings { } const defaultSettings: DefaultSettings = { - title: "Metavatar-PC", + title: "MetaTalker", showSettings: false, tagsView: false, fixedHeader: false, diff --git a/src/types/components.d.ts b/src/types/components.d.ts index bb99a00..8801e41 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,15 +8,9 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] - copy: typeof import('./../components/myLoading copy.vue')['default'] - ElAlert: typeof import('element-plus/es')['ElAlert'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] - ElCard: typeof import('element-plus/es')['ElCard'] - ElCol: typeof import('element-plus/es')['ElCol'] - ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] - ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] @@ -25,54 +19,28 @@ declare module '@vue/runtime-core' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] - ElLink: typeof import('element-plus/es')['ElLink'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] - ElPopover: typeof import('element-plus/es')['ElPopover'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] - ElTable: typeof import('element-plus/es')['ElTable'] - ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTabPane: typeof import('element-plus/es')['ElTabPane'] ElTabs: typeof import('element-plus/es')['ElTabs'] - ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect'] - ElUpload: typeof import('element-plus/es')['ElUpload'] GithubCorner: typeof import('./../components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./../components/Hamburger/index.vue')['default'] IconSelect: typeof import('./../components/IconSelect/index.vue')['default'] - IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default'] - IEpCaretTop: typeof import('~icons/ep/caret-top')['default'] IEpClose: typeof import('~icons/ep/close')['default'] - IEpCloseBold: typeof import('~icons/ep/close-bold')['default'] - IEpCollection: typeof import('~icons/ep/collection')['default'] IEpDelete: typeof import('~icons/ep/delete')['default'] IEpDocumentAdd: typeof import('~icons/ep/document-add')['default'] - IEpDownload: typeof import('~icons/ep/download')['default'] IEpEdit: typeof import('~icons/ep/edit')['default'] IEpGoods: typeof import('~icons/ep/goods')['default'] IEpHeadset: typeof import('~icons/ep/headset')['default'] - IEpLoading: typeof import('~icons/ep/loading')['default'] IEpLock: typeof import('~icons/ep/lock')['default'] IEpMenu: typeof import('~icons/ep/menu')['default'] IEpMic: typeof import('~icons/ep/mic')['default'] - IEpPlus: typeof import('~icons/ep/plus')['default'] - IEpPosition: typeof import('~icons/ep/position')['default'] - IEpRefresh: typeof import('~icons/ep/refresh')['default'] - IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default'] - IEpSearch: typeof import('~icons/ep/search')['default'] - IEpSetting: typeof import('~icons/ep/setting')['default'] IEpSwitchButton: typeof import('~icons/ep/switch-button')['default'] - IEpTop: typeof import('~icons/ep/top')['default'] - IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default'] - IEpVideoCamera: typeof import('~icons/ep/video-camera')['default'] IEpVideoPause: typeof import('~icons/ep/video-pause')['default'] IEpVideoPlay: typeof import('~icons/ep/video-play')['default'] LangSelect: typeof import('./../components/LangSelect/index.vue')['default'] @@ -91,6 +59,5 @@ declare module '@vue/runtime-core' { } export interface ComponentCustomProperties { vInfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll'] - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] } } diff --git a/src/views/createVideo/index copy.vue b/src/views/createVideo/index copy.vue index 725d8b3..b0dcd87 100644 --- a/src/views/createVideo/index copy.vue +++ b/src/views/createVideo/index copy.vue @@ -741,7 +741,7 @@ import { useI18n } from "vue-i18n"; import Recorder from "js-audio-recorder"; //mp3插件 import imageCompression from "browser-image-compression"; //压缩图片插件 import { useRoute, useRouter } from "vue-router"; -import { fabric } from "fabric"; +// import { fabric } from "fabric"; //#endregion --------------------------------- @@ -1923,26 +1923,26 @@ const canvasImgRef = ref(null); //图片dom const imgWidth=ref(null) const imgHeight=ref(null) const myText = ref("hello world"); -const iText = new fabric.IText(myText.value,{ - top:50, - left:50 -}); -function setCanvasText() { - canvas.value = new fabric.Canvas("myCanvas",{ - width:500, - height:500, - }); - iText.on("mouseup", function () { - console.log(iText, "iText"); - console.log(iText.angle.toFixed(0), "angle"); - console.log(iText.left.toFixed(0), "left"); - console.log(iText.top.toFixed(0), "top"); - console.log(iText.width.toFixed(0), "width"); - console.log(iText.height.toFixed(0), "height"); - }); - canvas.value.add(iText); - -} +// const iText = new fabric.IText(myText.value,{ +// top:50, +// left:50 +// }); +// function setCanvasText() { +// canvas.value = new fabric.Canvas("myCanvas",{ +// width:500, +// height:500, +// }); +// iText.on("mouseup", function () { +// console.log(iText, "iText"); +// console.log(iText.angle.toFixed(0), "angle"); +// console.log(iText.left.toFixed(0), "left"); +// console.log(iText.top.toFixed(0), "top"); +// console.log(iText.width.toFixed(0), "width"); +// console.log(iText.height.toFixed(0), "height"); +// }); +// canvas.value.add(iText); + +// } // 监听字幕显示 watch( () => SubtitlesSwitch, diff --git a/src/views/createVideo/index.vue b/src/views/createVideo/index.vue index 4bfa457..d6e23c0 100644 --- a/src/views/createVideo/index.vue +++ b/src/views/createVideo/index.vue @@ -829,7 +829,7 @@ import { useI18n } from "vue-i18n"; import Recorder from "js-audio-recorder"; //mp3插件 import imageCompression from "browser-image-compression"; //压缩图片插件 import { useRoute, useRouter } from "vue-router"; -import { fabric } from "fabric"; +// import { fabric } from "fabric"; //#endregion --------------------------------- diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 72a809b..c7c09b0 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1652,6 +1652,7 @@ onMounted(() => {