diff --git a/core/core-frontend/flushbonading/index.js b/core/core-frontend/flushbonading/index.js index fedc247ab5..c7cfd2a2bd 100644 --- a/core/core-frontend/flushbonading/index.js +++ b/core/core-frontend/flushbonading/index.js @@ -75,7 +75,7 @@ htmlStream.pipe(parserStream).on('finish', () => { eleArr.forEach((ele) => { produceTag(ele.attributes, ele.name) }) - document.documentElement.insertBefore(head, document.querySelector('head'))` + document.documentElement.insertBefore(head, document.querySelector('body'))` fs.writeFile(`../dist/js/div_import_${suffix}.js`, templateJs, err => { }) diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index eda3f30773..950af6808b 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -18,8 +18,8 @@ "@antv/l7": "^2.22.0", "@antv/l7plot": "^0.5.5", "@antv/s2": "^1.49.0", - "@codemirror/lang-sql": "^6.4.0", "@babel/runtime": "^7.5.5", + "@codemirror/lang-sql": "^6.4.0", "@npkg/tinymce-plugins": "^0.0.7", "@tinymce/tinymce-vue": "^5.1.0", "@turf/centroid": "^7.0.0", @@ -61,6 +61,7 @@ "vue-draggable-next": "^2.2.1", "vue-i18n": "^9.2.2", "vue-router": "4.1.3", + "vue-router_2": "^4.1.3", "vue-types": "^5.0.2", "vue-uuid": "^3.0.0", "vue3-ace-editor": "^2.2.2", diff --git a/core/core-frontend/src/layout/components/DesktopSetting.vue b/core/core-frontend/src/layout/components/DesktopSetting.vue index d5ee893044..4401996d98 100644 --- a/core/core-frontend/src/layout/components/DesktopSetting.vue +++ b/core/core-frontend/src/layout/components/DesktopSetting.vue @@ -2,7 +2,7 @@ import iconSetting from '@/assets/svg/icon-setting.svg' import copilot from '@/assets/svg/copilot.svg' import LangSelector from '@/layout/components/LangSelector.vue' -import { useRouter } from 'vue-router' +import { useRouter } from 'vue-router_2' import TopDesktopCard from './TopDesktopCard.vue' import icon_right_outlined from '@/assets/svg/icon_right_outlined.svg' import dvAi from '@/assets/svg/dv-ai.svg' diff --git a/core/core-frontend/src/layout/components/Header.vue b/core/core-frontend/src/layout/components/Header.vue index 5c556e1d52..30fb6d2ae4 100644 --- a/core/core-frontend/src/layout/components/Header.vue +++ b/core/core-frontend/src/layout/components/Header.vue @@ -13,7 +13,7 @@ import { useEmitt } from '@/hooks/web/useEmitt' import { Icon } from '@/components/icon-custom' import SystemCfg from './SystemCfg.vue' import ToolboxCfg from './ToolboxCfg.vue' -import { useRouter, useRoute } from 'vue-router' +import { useRouter, useRoute } from 'vue-router_2' import TopDoc from '@/layout/components/TopDoc.vue' import AccountOperator from '@/layout/components/AccountOperator.vue' import { isDesktop } from '@/utils/ModelUtil' diff --git a/core/core-frontend/src/layout/components/HeaderSystem.vue b/core/core-frontend/src/layout/components/HeaderSystem.vue index 76be99e334..ac6673551f 100644 --- a/core/core-frontend/src/layout/components/HeaderSystem.vue +++ b/core/core-frontend/src/layout/components/HeaderSystem.vue @@ -3,7 +3,7 @@ import logo from '@/assets/svg/logo.svg' import icon_left_outlined from '@/assets/svg/icon_left_outlined.svg' import { computed } from 'vue' import { ElHeader } from 'element-plus-secondary' -import { useRouter } from 'vue-router' +import { useRouter } from 'vue-router_2' import AccountOperator from '@/layout/components/AccountOperator.vue' import { useAppearanceStoreWithOut } from '@/store/modules/appearance' import { useI18n } from '@/hooks/web/useI18n' diff --git a/core/core-frontend/src/layout/components/LayoutTransition.vue b/core/core-frontend/src/layout/components/LayoutTransition.vue index 594a48b0ad..44abee6eb1 100644 --- a/core/core-frontend/src/layout/components/LayoutTransition.vue +++ b/core/core-frontend/src/layout/components/LayoutTransition.vue @@ -1,5 +1,5 @@