From 915df23b2cca546ddf2ac188162d6072706c80e2 Mon Sep 17 00:00:00 2001 From: zhufu <17863654727@163.com> Date: Fri, 17 Jan 2025 09:15:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9C=E7=A8=8B=E7=BB=84=E4=BB=B6=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=8F=90=E4=BA=A4=EF=BC=8C=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20=20merge=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 11 +- src/enums/pageEnum.ts | 10 ++ src/i18n/en/index.ts | 33 ---- src/i18n/en/login.ts | 7 - src/i18n/en/project.ts | 15 -- src/i18n/index.ts | 33 ---- src/i18n/zh/index.ts | 33 ---- src/i18n/zh/login.ts | 7 - src/i18n/zh/project.ts | 16 -- src/locales/lang/en/project.json | 5 +- src/locales/lang/zh-CN/project.json | 5 +- src/main.ts | 3 - .../components/Diy/Diy/Remote/index.vue | 2 +- src/router/disposition/project.router.ts | 30 ++++ src/utils/http.ts | 2 +- src/views/project/index.vue | 2 +- .../components/CreateModal/index.vue | 35 ++-- .../components/ProjectLayoutCreate/index.vue | 10 +- .../components/ProjectLayoutSider/index.vue | 5 +- .../components/ProjectLayoutSider/menu.ts | 17 +- src/views/project/remote/create/index.vue | 150 ++++++++++++++++++ src/views/project/remote/list/index.vue | 9 ++ 22 files changed, 265 insertions(+), 175 deletions(-) delete mode 100644 src/i18n/en/index.ts delete mode 100644 src/i18n/en/login.ts delete mode 100644 src/i18n/en/project.ts delete mode 100644 src/i18n/index.ts delete mode 100644 src/i18n/zh/index.ts delete mode 100644 src/i18n/zh/login.ts delete mode 100644 src/i18n/zh/project.ts create mode 100644 src/views/project/remote/create/index.vue create mode 100644 src/views/project/remote/list/index.vue diff --git a/package.json b/package.json index 96dc7be..e079ec2 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,7 @@ "animate.css": "^4.1.1", "axios": "^1.6.4", "color": "^4.2.3", - "codemirror": "^5.65.16", + "codemirror": "^6.0.1", "cropperjs": "^1.6.1", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", @@ -137,7 +137,14 @@ "jszip":"^3.10.1", "shpjs":"^6.1.0", "js-base64":"3.7.7", - "monaco-editor": "^0.33.0" + "monaco-editor": "^0.33.0", + "@codemirror/lang-javascript": "^6.2.2", + "@codemirror/language": "^6.10.8", + "@codemirror/state": "^6.5.1", + "@codemirror/view": "^6.36.2", + "@codemirror/basic-setup": "^0.20.0", + "vue-codemirror": "^6.1.1", + "@codemirror/theme-one-dark": "^6.1.2" }, "devDependencies": { "@amap/amap-jsapi-loader": "^1.0.1", diff --git a/src/enums/pageEnum.ts b/src/enums/pageEnum.ts index 87fe7f2..823ff67 100644 --- a/src/enums/pageEnum.ts +++ b/src/enums/pageEnum.ts @@ -61,6 +61,16 @@ export enum PageEnum { BASE_HOME_ITEMS = '/project/items', BASE_HOME_ITEMS_NAME = 'Project-Items', + // 远程组件 + BASE_HOME_REMOTE = '/project/remote', + BASE_HOME_REMOTE_NAME = 'Project-Remote', + + BASE_HOME_LIST_REMOTE = '/project/remote/list', + BASE_HOME_LIST_REMOTE_NAME = 'Project-Remote-List', + + BASE_HOME_CREATE_REMOTE = '/project/remote/create/:id(.*)*', + BASE_HOME_CREATE_REMOTE_NAME = 'Project-Remote-Create', + // 我的模板 BASE_HOME_TEMPLATE = '/project/my-template', BASE_HOME_TEMPLATE_NAME = 'Project-My-Template', diff --git a/src/i18n/en/index.ts b/src/i18n/en/index.ts deleted file mode 100644 index 4ce0787..0000000 --- a/src/i18n/en/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import login from './login' -import project from './project' - -const global = { - doc_addr: 'Document', - code_addr: 'Code', - form_account: 'Please enter your account or email', - form_password: 'Please enter your password', - // header - doc: 'Document', - help: 'Help', - contact: 'About Software', - logout: 'Logout', - // system setting - sys_set: 'System Setting', - lang_set: 'Language Setting', - // right key - r_edit: 'Edit', - r_preview: 'Preview', - r_copy: 'Clone', - r_rename: 'Rename', - r_publish: 'Publish', - r_unpublish: 'Unpublish', - r_download: 'Download', - r_delete: 'Delete', - r_more: 'More', -} - -export default { - global, - login, - project -} diff --git a/src/i18n/en/login.ts b/src/i18n/en/login.ts deleted file mode 100644 index d6f7b75..0000000 --- a/src/i18n/en/login.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default { - desc: "Login", - form_auto: "Sign in automatically", - form_button: "Login", - login_success: "Login success", - login_message: "Please complete the letter", -} \ No newline at end of file diff --git a/src/i18n/en/project.ts b/src/i18n/en/project.ts deleted file mode 100644 index 6695cd5..0000000 --- a/src/i18n/en/project.ts +++ /dev/null @@ -1,15 +0,0 @@ -export default { - create_btn: 'Create', - create_tip: 'Please select a content for development', - project: 'Project', - my: 'My', - new_project: 'New Project', - all_project: 'All Project', - my_templete: 'My Templete', - template_market: 'Template Market', - - // items - release: 'Release', - unreleased: 'Unrelease', - last_edit: 'Last edit time' -} diff --git a/src/i18n/index.ts b/src/i18n/index.ts deleted file mode 100644 index 33161b1..0000000 --- a/src/i18n/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -//语言 -import { lang } from '@/settings/designSetting'; -import { createI18n } from 'vue-i18n'; //引入vue-i18n组件 -import { getLocalStorage } from '@/utils'; -import { StorageEnum } from '@/enums/storageEnum'; -import { LangEnum } from '@/enums/styleEnum'; -import { LangStateType } from '@/store/modules/langStore/langStore.d'; -import zh from './zh/index'; -import en from './en/index'; - -const langStorage: LangStateType = getLocalStorage(StorageEnum.GO_LANG_STORE); -// 语言数组 -export const langList = [ - { - label: '中文', - key: LangEnum.ZH, - }, - { - label: 'English', - key: LangEnum.EN, - }, -]; - -export const i18n = createI18n({ - legacy: false, - globalInjection: true, - locale: langStorage?.lang || lang, - fallbackLocale: langStorage?.lang || lang, - messages: { - [LangEnum.ZH]: zh, - [LangEnum.EN]: en, - }, -}); diff --git a/src/i18n/zh/index.ts b/src/i18n/zh/index.ts deleted file mode 100644 index c26d156..0000000 --- a/src/i18n/zh/index.ts +++ /dev/null @@ -1,33 +0,0 @@ -import login from './login' -import project from './project' - -const global = { - doc_addr: '文档地址', - code_addr: '仓库地址', - form_account: '请输入账号或邮箱', - form_password: '请输入密码', - // 头部 - doc: '说明文档', - help: '帮助中心', - contact: '关于软件', - logout: '退出登录', - // 系统设置 - sys_set: '系统设置', - lang_set: '语言设置', - // 功能键 - r_edit: '编辑', - r_preview: '预览', - r_copy: '克隆', - r_rename: '重命名', - r_publish: '发布', - r_unpublish: '取消发布', - r_download: '下载', - r_delete: '删除', - r_more: '更多', -} - -export default { - global, - login, - project -} diff --git a/src/i18n/zh/login.ts b/src/i18n/zh/login.ts deleted file mode 100644 index 38d53ea..0000000 --- a/src/i18n/zh/login.ts +++ /dev/null @@ -1,7 +0,0 @@ -export default { - desc: "登录", - form_auto: "自动登录", - form_button: "登录", - login_success: "登录成功", - login_message: "请填写完整信息", -} \ No newline at end of file diff --git a/src/i18n/zh/project.ts b/src/i18n/zh/project.ts deleted file mode 100644 index 49e8656..0000000 --- a/src/i18n/zh/project.ts +++ /dev/null @@ -1,16 +0,0 @@ -export default { - // aside - create_btn: '新建', - create_tip: '从哪里出发好呢？', - project: '项目', - my: '我的', - new_project: '新项目', - all_project: '全部项目', - my_templete: '我的模板', - template_market: '模板市场', - - // items - release: '已发布', - unreleased: '未发布', - last_edit: '最后编辑' -} diff --git a/src/locales/lang/en/project.json b/src/locales/lang/en/project.json index dbb036a..225c24a 100644 --- a/src/locales/lang/en/project.json +++ b/src/locales/lang/en/project.json @@ -1,6 +1,6 @@ { "create_btn": "Create", - "create_tip": "Please select a content for development", + "create_tip": "Please select the content to create", "project": "Project", "my": "My", "new_project": "New Project", @@ -9,5 +9,6 @@ "template_market": "Template Market", "release": "Release", "unreleased": "Unrelease", - "last_edit": "Last edit time" + "last_edit": "Last edit time", + "remote_component": "remote" } \ No newline at end of file diff --git a/src/locales/lang/zh-CN/project.json b/src/locales/lang/zh-CN/project.json index eb1e7f5..320be64 100644 --- a/src/locales/lang/zh-CN/project.json +++ b/src/locales/lang/zh-CN/project.json @@ -1,6 +1,6 @@ { "create_btn": "新建", - "create_tip": "从哪里出发好呢？", + "create_tip": "请选择要创建的内容", "project": "项目", "my": "我的", "new_project": "新项目", @@ -9,5 +9,6 @@ "template_market": "模板市场", "release": "已发布", "unreleased": "未发布", - "last_edit": "最后编辑" + "last_edit": "最后编辑", + "remote_component": "远程组件" } \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index f4fab05..5195841 100644 --- a/src/main.ts +++ b/src/main.ts @@ -35,7 +35,6 @@ import lineMdIcons from '@iconify/json/json/line-md.json'; import wiIcons from '@iconify/json/json/wi.json'; import { addCollection } from 'iconify-icon'; import { setupNaive, setupDirectives, setupCustomComponents, initFunction } from '@/plugins'; -import { i18n } from '@/i18n'; import { GoAppProvider } from '@/components/GoAppProvider/index'; import * as echarts from 'echarts' @@ -49,9 +48,7 @@ async function bootstrap() { // 语言注册 // app.use(i18n); // 在Vue应用挂载后绑定$t到window对象 - app.config.globalProperties.$t = i18n.global.t; app.config.globalProperties.$echarts = echarts - window['$t'] = i18n.global.t; // 注册全局常用的 naive-ui 组件 setupNaive(app); diff --git a/src/packages/components/Diy/Diy/Remote/index.vue b/src/packages/components/Diy/Diy/Remote/index.vue index 9c6285a..e5bc773 100644 --- a/src/packages/components/Diy/Diy/Remote/index.vue +++ b/src/packages/components/Diy/Diy/Remote/index.vue @@ -24,7 +24,7 @@ const props = defineProps({ }) let remote = ref() -let url = 'http://192.168.10.130:3000/getVue3Str1' +let url = 'http://192.168.10.124:3000/getVue3Str2' const data = ref(props.chartConfig.option.dataset) onMounted(() => { diff --git a/src/router/disposition/project.router.ts b/src/router/disposition/project.router.ts index 7503e42..97c33ea 100644 --- a/src/router/disposition/project.router.ts +++ b/src/router/disposition/project.router.ts @@ -5,6 +5,8 @@ import { PageEnum } from '@/enums/pageEnum'; const importPath = { 'PageEnum.BASE_HOME_NAME': () => import('@/views/project/index.vue'), 'PageEnum.BASE_HOME_ITEMS_NAME': () => import('@/views/project/items/index.vue'), + 'PageEnum.BASE_HOME_REMOTE_NAME': () => import('@/views/project/remote/list/index.vue'), + 'PageEnum.BASE_HOME_REMOTE_CREATE_NAME': () => import('@/views/project/remote/create/index.vue'), 'PageEnum.BASE_HOME_TEMPLATE_NAME': () => import('@/views/project/mtTemplate/index.vue'), 'PageEnum.BASE_HOME_TEMPLATE_MARKET_NAME': () => import('@/views/project/templateMarket/index.vue'), @@ -28,6 +30,34 @@ export const projectRoutes: RouteRecordRaw = { title: '我的项目', }, }, + { + path: PageEnum.BASE_HOME_REMOTE, + name: PageEnum.BASE_HOME_REMOTE_NAME, + redirect: PageEnum.BASE_HOME_LIST_REMOTE, + meta: { + title: '远程组件', + }, + children: [ + { + path: PageEnum.BASE_HOME_LIST_REMOTE, + name: PageEnum.BASE_HOME_LIST_REMOTE_NAME, + meta: { + title: '远程组件列表', + hideMenu: true, + }, + component: importPath['PageEnum.BASE_HOME_REMOTE_NAME'], + }, + { + path: PageEnum.BASE_HOME_CREATE_REMOTE, + name: PageEnum.BASE_HOME_CREATE_REMOTE_NAME, + meta: { + title: '创建远程组件', + hideMenu: true, + }, + component: importPath['PageEnum.BASE_HOME_REMOTE_CREATE_NAME'], + }, + ] + }, { path: PageEnum.BASE_HOME_TEMPLATE, name: PageEnum.BASE_HOME_TEMPLATE_NAME, diff --git a/src/utils/http.ts b/src/utils/http.ts index 8e92db7..c459af4 100644 --- a/src/utils/http.ts +++ b/src/utils/http.ts @@ -2,5 +2,5 @@ * * 请求失败统一处理 */ export const httpErrorHandle = () => { - window['$message'].error(window['$t']('http.error_message')) + window['$message'].error('error') } \ No newline at end of file diff --git a/src/views/project/index.vue b/src/views/project/index.vue index e422f91..7099d43 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -37,6 +37,6 @@ } } .go-project .content-top { - top: 10px; + top: 0px; } diff --git a/src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue b/src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue index 4f9fe13..6a35800 100644 --- a/src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue +++ b/src/views/project/layout/components/ProjectLayoutCreate/components/CreateModal/index.vue @@ -18,7 +18,7 @@ :disabled="item.disabled" v-for="item in typeList" :key="item.key" - @click="btnHandle" + @click="btnHandle(item.key)" >