fix: bug fix

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 => {
   })

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",

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'

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'

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'

core/core-frontend/src/layout/components/LayoutTransition.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 const route = useRoute()
 </script>
 <template>

core/core-frontend/src/layout/components/Main.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ElMain } from 'element-plus-secondary'
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 const route = useRoute()
 </script>
 

core/core-frontend/src/layout/components/Menu.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { ElMenu } from 'element-plus-secondary'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router_2'
 import { isExternal } from '@/utils/validate'
 import { useCache } from '@/hooks/web/useCache'
 import MenuItem from './MenuItem.vue'

core/core-frontend/src/layout/components/SystemCfg.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import iconSetting from '@/assets/svg/icon_organization_outlined.svg'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { computed } from 'vue'
 

core/core-frontend/src/layout/components/ToolboxCfg.vue

@@ -4,7 +4,7 @@ import toolboxIcon_template from '@/assets/svg/toolbox-icon_template.svg'
 import toolboxLog from '@/assets/svg/toolbox-log.svg'
 import sysTools from '@/assets/svg/sys-tools.svg'
 import { ref, onMounted, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import TopDocCard from '@/layout/components/TopDocCard.vue'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 const appearanceStore = useAppearanceStoreWithOut()

core/core-frontend/src/layout/index.vue

@@ -7,7 +7,7 @@ import Menu from './components/Menu.vue'
 import Main from './components/Main.vue'
 import CollapseBar from './components/CollapseBar.vue'
 import { ElContainer } from 'element-plus-secondary'
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 import { XpackComponent } from '@/components/plugin'
 import { useI18n } from '@/hooks/web/useI18n'
 const route = useRoute()

core/core-frontend/src/pages/index/App.vue

@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import configGlobal from '@/components/config-global/src/ConfigGlobal.vue'
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 import ExportExcel from '@/views/visualized/data/dataset/ExportExcel.vue'
 const route = useRoute()
 const exportExcelRef = ref()

core/core-frontend/src/pages/panel/main.ts

@@ -47,10 +47,10 @@ const getPrefix = (): string => {
   })
   return prefix
 }
-
+const element = document.createElement('head')
 document.querySelector('head').appendChild = <T extends Node>(node: T) => {
   const newNode = formatterUrl(node, getPrefix())
-  cb(newNode)
+  element.appendChild(newNode)
   return newNode
 }
 import { App, createApp } from 'vue'

core/core-frontend/src/permission.ts

@@ -1,7 +1,7 @@
 import router from './router'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useAppStoreWithOut } from '@/store/modules/app'
-import type { RouteRecordRaw } from 'vue-router'
+import type { RouteRecordRaw } from 'vue-router_2'
 import { getDefaultSettings } from '@/api/common'
 import { useNProgress } from '@/hooks/web/useNProgress'
 import { usePermissionStoreWithOut, pathValid, getFirstAuthMenu } from '@/store/modules/permission'

core/core-frontend/src/router/embedded.ts

@@ -1,5 +1,5 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
-import type { RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router_2'
+import type { RouteRecordRaw } from 'vue-router_2'
 import type { App } from 'vue'
 
 export const routes: AppRouteRecordRaw[] = []
@@ -8,15 +8,6 @@ const router = createRouter({
   routes: routes as RouteRecordRaw[]
 })
 
-const rawInstall = router.install
-router.install = app => {
-  const hash = window.location.hash
-  rawInstall(app)
-  setTimeout(() => {
-    window.location.hash = hash
-  }, 100)
-}
-
 export const setupRouter = (app: App<Element>) => {
   app.use(router)
 }

core/core-frontend/src/router/index.ts

@@ -1,5 +1,5 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
-import type { RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router_2'
+import type { RouteRecordRaw } from 'vue-router_2'
 import type { App } from 'vue'
 
 export const routes: AppRouteRecordRaw[] = [

core/core-frontend/src/router/mobile.ts

@@ -1,5 +1,5 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
-import type { RouteRecordRaw } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router_2'
+import type { RouteRecordRaw } from 'vue-router_2'
 import type { App } from 'vue'
 
 export const routes: AppRouteRecordRaw[] = [

core/core-frontend/src/views/chart/components/editor/index.vue

@@ -47,7 +47,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 import { BASE_VIEW_CONFIG, getViewConfig } from '@/views/chart/components/editor/util/chart'
 import ChartType from '@/views/chart/components/editor/chart-type/ChartType.vue'
-import { useRouter, useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router_2'
 import CompareEdit from '@/views/chart/components/editor/drag-item/components/CompareEdit.vue'
 import ValueFormatterEdit from '@/views/chart/components/editor/drag-item/components/ValueFormatterEdit.vue'
 import CustomSortEdit from '@/views/chart/components/editor/drag-item/components/CustomSortEdit.vue'

core/core-frontend/src/views/chart/components/views/index.vue

@@ -54,7 +54,7 @@ import request from '@/config/axios'
 import { store } from '@/store'
 import { clearExtremum } from '@/views/chart/components/js/extremumUitl'
 import DePreviewPopDialog from '@/components/visualization/DePreviewPopDialog.vue'
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 const route = useRoute()
 const { wsCache } = useCache()
 const chartComponent = ref<any>()

core/core-frontend/src/views/data-visualization/PreviewCanvas.vue

@@ -16,7 +16,7 @@ import { propTypes } from '@/utils/propTypes'
 import { downloadCanvas2 } from '@/utils/imgUtils'
 import { isLink, setTitle } from '@/utils/utils'
 import EmptyBackground from '../../components/empty-background/src/EmptyBackground.vue'
-import { useRoute } from 'vue-router'
+import { useRoute } from 'vue-router_2'
 import { filterEnumMapSync } from '@/utils/componentUtils'
 import CanvasOptBar from '@/components/visualization/CanvasOptBar.vue'
 const routeWatch = useRoute()

core/core-frontend/src/views/mobile/directory/index.vue

@@ -15,7 +15,7 @@ import { BusiTreeRequest } from '@/models/tree/TreeNode'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import DashboardCell from '@/views/mobile/components/DashboardCell.vue'
 import { useI18n } from '@/hooks/web/useI18n'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import VanSticky from 'vant/es/sticky'
 import VanNavBar from 'vant/es/nav-bar'
 import 'vant/es/nav-bar/style'

core/core-frontend/src/views/mobile/home/index.vue

@@ -3,7 +3,7 @@ import { ref, computed, onMounted, reactive, watch } from 'vue'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useI18n } from '@/hooks/web/useI18n'
 import { shortcutOption } from '@/views/workbranch/ShortcutOption'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { useCache } from '@/hooks/web/useCache'
 import Workbranch from '@/views/mobile/components/Workbranch.vue'
 import request from '@/config/axios'

core/core-frontend/src/views/mobile/login/index.vue

@@ -11,7 +11,7 @@ import { loginApi, queryDekey } from '@/api/login'
 import { useAppStoreWithOut } from '@/store/modules/app'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useCache } from '@/hooks/web/useCache'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { rsaEncryp } from '@/utils/encryption'
 import VanForm from 'vant/es/form'
 import VanField from 'vant/es/field'

core/core-frontend/src/views/mobile/panel/Mobile.vue

@@ -5,7 +5,7 @@ import visualStar from '@/assets/svg/visual-star.svg'
 import icon_replace_outlined from '@/assets/svg/icon_replace_outlined.svg'
 import { initCanvasDataMobile } from '@/utils/canvasUtils'
 import { ref, nextTick, onBeforeMount } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router_2'
 import { storeApi, storeStatusApi } from '@/api/visualization/dataVisualization'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'

core/core-frontend/src/views/mobile/personal/index.vue

@@ -5,7 +5,7 @@ import userImg from '@/assets/img/user.png'
 import { mountedOrg, switchOrg } from '@/api/user'
 import { ref, onMounted, computed } from 'vue'
 import OrgCell from '@/views/mobile/components/OrgCell.vue'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { logoutApi } from '@/api/login'
 import { logoutHandler } from '@/utils/logout'
 import VanNavBar from 'vant/es/nav-bar'

core/core-frontend/src/views/visualized/data/dataset/form/index.vue

@@ -46,7 +46,7 @@ import EmptyBackground from '@/components/empty-background/src/EmptyBackground.v
 import { Icon } from '@/components/icon-custom'
 import { useWindowSize } from '@vueuse/core'
 import CalcFieldEdit from './CalcFieldEdit.vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router_2'
 import UnionEdit from './UnionEdit.vue'
 import type { FormInstance } from 'element-plus-secondary'
 import type { BusiTreeNode } from '@/models/tree/TreeNode'

core/core-frontend/src/views/visualized/data/dataset/index.vue

@@ -48,7 +48,7 @@ import {
 import { HandleMore } from '@/components/handle-more'
 import { Icon } from '@/components/icon-custom'
 import { useMoveLine } from '@/hooks/web/useMoveLine'
-import { useRouter, useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router_2'
 import CreatDsGroup from './form/CreatDsGroup.vue'
 import type { BusiTreeNode, BusiTreeRequest } from '@/models/tree/TreeNode'
 import {

core/core-frontend/src/views/visualized/data/datasource/form/index.vue

@@ -22,7 +22,7 @@ import { Base64 } from 'js-base64'
 import type { Param } from './ExcelDetail.vue'
 import type { Configuration, ApiConfiguration, SyncSetting } from './option'
 import { dsTypes, typeList, nameMap } from './option'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { uuid } from 'vue-uuid'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import FinishPage from '../FinishPage.vue'

core/core-frontend/src/views/visualized/data/datasource/index.vue

@@ -56,7 +56,7 @@ import CreatDsGroup from './form/CreatDsGroup.vue'
 import type { Tree } from '../dataset/form/CreatDsGroup.vue'
 import { previewData, getById } from '@/api/datasource'
 import { useI18n } from '@/hooks/web/useI18n'
-import { useRoute, useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router_2'
 import DatasetDetail from '@/views/visualized/data/dataset/DatasetDetail.vue'
 import { timestampFormatDate } from '@/views/visualized/data/dataset/form/util'
 import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue'

core/core-frontend/src/views/workbranch/ShortcutTable.vue

@@ -13,7 +13,7 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { ref, reactive, onMounted, computed, watch } from 'vue'
 import type { TabsPaneContext } from 'element-plus-secondary'
 import GridTable from '@/components/grid-table/src/GridTable.vue'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import dayjs from 'dayjs'
 import { shortcutOption } from './ShortcutOption'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'

core/core-frontend/src/views/workbranch/index.vue

@@ -13,7 +13,7 @@ import { useRequestStoreWithOut } from '@/store/modules/request'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import ShortcutTable from './ShortcutTable.vue'
 import { useUserStoreWithOut } from '@/store/modules/user'
-import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router_2'
 import { searchMarketRecommend } from '@/api/templateMarket'
 import TemplateBranchItem from '@/views/workbranch/TemplateBranchItem.vue'
 import { ElMessage } from 'element-plus-secondary'