diff --git a/core/core-frontend/src/components/data-visualization/DeGrid.vue b/core/core-frontend/src/components/data-visualization/DeGrid.vue
index b4673faddc..4c108e7d5e 100644
--- a/core/core-frontend/src/components/data-visualization/DeGrid.vue
+++ b/core/core-frontend/src/components/data-visualization/DeGrid.vue
@@ -7,7 +7,12 @@
:height="smallGridH"
patternUnits="userSpaceOnUse"
>
-
+
-
+
-
+
diff --git a/core/core-frontend/src/components/data-visualization/DeGridScreen.vue b/core/core-frontend/src/components/data-visualization/DeGridScreen.vue
new file mode 100644
index 0000000000..286489da37
--- /dev/null
+++ b/core/core-frontend/src/components/data-visualization/DeGridScreen.vue
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
index fe1e1ad056..063dd6c8d8 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
@@ -46,6 +46,7 @@ import { activeWatermarkCheckUser } from '@/components/watermark/watermark'
import PopArea from '@/custom-component/pop-area/Component.vue'
import DatasetParamsComponent from '@/components/visualization/DatasetParamsComponent.vue'
import DeGrid from '@/components/data-visualization/DeGrid.vue'
+import DeGridScreen from '@/components/data-visualization/DeGridScreen.vue'
const snapshotStore = snapshotStoreWithOut()
const dvMainStore = dvMainStoreWithOut()
@@ -1422,7 +1423,19 @@ const contextMenuShow = computed(() => {
const markLineShow = computed(() => isMainCanvas(canvasId.value))
const showGrid = computed(() => {
- return Boolean(canvasStyleData.value.dashboard.showGrid) && isMainCanvas(canvasId.value)
+ return (
+ Boolean(canvasStyleData.value.dashboard.showGrid) &&
+ isMainCanvas(canvasId.value) &&
+ isDashboard()
+ )
+})
+
+const showGridScreen = computed(() => {
+ return (
+ Boolean(canvasStyleData.value.dashboard.showGrid) &&
+ isMainCanvas(canvasId.value) &&
+ !isDashboard()
+ )
})
// 批量设置
@@ -1557,6 +1570,11 @@ defineExpose({
>
+
-
-
-
-
diff --git a/core/core-frontend/src/custom-component/common/DeRuler.vue b/core/core-frontend/src/custom-component/common/DeRuler.vue
index 0022151e0f..6b1b074854 100644
--- a/core/core-frontend/src/custom-component/common/DeRuler.vue
+++ b/core/core-frontend/src/custom-component/common/DeRuler.vue
@@ -1,5 +1,5 @@