From 01d6cc7a93c03f0b35de0a9f1b8cfcd8b29ffc90 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 29 May 2024 15:14:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E8=B7=91=E9=A9=AC=E7=81=AF=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A2=84=E8=A7=88=E4=B8=8D?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-visualization/canvas/CanvasCore.vue | 1 + .../src/custom-component/common/CommonStyleSet.vue | 14 +++++++------- .../src/custom-component/scroll-text/Component.vue | 11 +++++------ .../src/store/modules/data-visualization/dvMain.ts | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) 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 4a25678b42..7d48537771 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -1391,6 +1391,7 @@ onMounted(() => { if (isMainCanvas(canvasId.value)) { initSnapshotTimer() initWatermark() + dvMainStore.setEditMode('edit') } // 获取编辑器元素 composeStore.getEditor(canvasId.value) diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue index b18c074c0d..0958e58229 100644 --- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue +++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue @@ -319,13 +319,13 @@ const scrollSpeedList = [ { name: '1', value: 80 }, { name: '2', value: 60 }, { name: '3', value: 40 }, - { name: '4', value: 20 }, - { name: '5', value: 10 }, - { name: '6', value: 8 }, - { name: '7', value: 6 }, - { name: '8', value: 4 }, - { name: '9', value: 2 }, - { name: '10', value: 1 } + { name: '4', value: 30 }, + { name: '5', value: 20 }, + { name: '6', value: 15 }, + { name: '7', value: 10 }, + { name: '8', value: 8 }, + { name: '9', value: 6 }, + { name: '10', value: 3 } ] const opacitySizeList = [ diff --git a/core/core-frontend/src/custom-component/scroll-text/Component.vue b/core/core-frontend/src/custom-component/scroll-text/Component.vue index 32b2cfb962..b510ce476b 100644 --- a/core/core-frontend/src/custom-component/scroll-text/Component.vue +++ b/core/core-frontend/src/custom-component/scroll-text/Component.vue @@ -78,8 +78,6 @@ const clearStyle = e => { if (text !== '') { document.execCommand('insertText', false, text) } - - emit('input', element.value, e.target.innerHTML) } const handleBlur = e => { @@ -141,11 +139,12 @@ const textStyle = computed(() => { @mousedown="handleMousedown" @blur="handleBlur" @input="handleInput" - v-html="element['propValue']" - > + > + {{ element['propValue'] }} + -
-
+
+
{{ element['propValue'] }}
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts index 4367d1de5a..e50a781ca6 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -33,7 +33,7 @@ export const dvMainStore = defineStore('dataVisualization', { datasetAreaCollapse: false }, embeddedCallBack: 'no', // 嵌入模式是否允许反馈参数 - editMode: 'edit', // 编辑器模式 edit preview + editMode: 'preview', // 编辑器模式 edit preview mobileInPc: false, firstLoadMap: [], canvasStyleData: { ...deepCopy(DEFAULT_CANVAS_STYLE_DATA_DARK), backgroundColor: null },