Merge remote-tracking branch 'origin/dev-v3' into dev-v3

core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue

@@ -202,9 +202,6 @@ const PointShadow = defineAsyncComponent(
 )
 const ContextMenu = defineAsyncComponent(() => import('./ContextMenu.vue'))
 const MarkLine = defineAsyncComponent(() => import('./MarkLine.vue'))
-const UserViewEnlarge = defineAsyncComponent(
-  () => import('@/components/visualization/UserViewEnlarge.vue')
-)
 const LinkJumpSet = defineAsyncComponent(() => import('@/components/visualization/LinkJumpSet.vue'))
 const LinkageSet = defineAsyncComponent(() => import('@/components/visualization/LinkageSet.vue'))
 const DatasetParamsComponent = defineAsyncComponent(
@@ -1445,17 +1442,19 @@ const handleDragOver = e => {
 const getMoveItem = () => {
   return infoBox.value.moveItem
 }
-
+const userViewEnlarge = ref()
 const userViewEnlargeOpen = (opt, item) => {
-  userViewEnlargeRefShow.value = true
-  nextTick(() => {
-    userViewEnlargeRef.value.dialogInit(
-      canvasStyleData.value,
-      canvasViewInfo.value[item.id],
-      item,
-      opt,
-      { scale: curBaseScale.value }
-    )
+  import('@/components/visualization/UserViewEnlarge.vue').then(res => {
+    userViewEnlarge.value = res.default
+    nextTick(() => {
+      userViewEnlargeRef.value.dialogInit(
+        canvasStyleData.value,
+        canvasViewInfo.value[item.id],
+        item,
+        opt,
+        { scale: curBaseScale.value }
+      )
+    })
   })
 }
 
@@ -1773,7 +1772,7 @@ defineExpose({
     <MarkLine v-if="markLineShow" />
     <!-- 选中区域 -->
     <Area v-show="isShowArea" :start="start" :width="width" :height="height" />
-    <user-view-enlarge v-if="userViewEnlargeRefShow" ref="userViewEnlargeRef"></user-view-enlarge>
+    <component ref="userViewEnlargeRef" :is="userViewEnlarge"></component>
     <link-jump-set v-if="linkJumpRefShow" ref="linkJumpRef"></link-jump-set>
     <linkage-set v-if="linkageRefShow" ref="linkageRef"></linkage-set>
     <dataset-params-component

core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue

@@ -1562,7 +1562,9 @@ const handleBeforeClose = () => {
   defaultConfigurationRef.value?.mult()
   defaultConfigurationRef.value?.single()
   handleDialogClick()
-  curComponent.value.id = ''
+  if (curComponent.value) {
+    curComponent.value.id = ''
+  }
   relationshipChartIndex.value = 0
   dialogVisible.value = false
 }
@@ -2269,6 +2271,7 @@ const timeGranularityMultipleChange = (val: string) => {
 watch(
   () => showError.value,
   val => {
+    if (!curComponent.value) return
     curComponent.value.showError = val
   }
 )

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

@@ -1660,6 +1660,7 @@ const sourceChange = val => {
 
 const finish = res => {
   const { id, pid, name } = res
+  isUpdate = false
   datasetName.value = name
   nodeInfo = {
     id,