From 496624a1525dd1999eaebf72b4d87aeb68499440 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Jan 2024 22:38:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=88=86=E7=BB=84=E4=B8=AD=E5=AF=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E8=BF=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=A7=BB=E5=8A=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rich-text/DeRichTextView.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue index 92e8e17ab7..6c47b38582 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -92,15 +92,10 @@ const props = defineProps({ themes: { type: String as PropType, default: 'dark' - }, - canvasActive: { - type: Boolean, - required: false, - default: true } }) -const { scale, element, editMode, active, disabled, showPosition, canvasActive } = toRefs(props) +const { scale, element, editMode, active, disabled, showPosition } = toRefs(props) const state = reactive({ data: null, @@ -276,8 +271,16 @@ const showPlaceHolder = computed(() => { ) }) +const editActive = computed(() => { + if (element.value.canvasId.includes('Group') && !active.value) { + return false + } else { + return true + } +}) + const setEdit = () => { - if (computedCanEdit.value && canvasActive.value) { + if (computedCanEdit.value && editActive.value) { canEdit.value = true element.value['editing'] = true myValue.value = element.value.propValue.textValue From 5823316316c0d99cd1c7d266b811f09be95e03c5 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 15 Jan 2024 22:47:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E5=AF=8C=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=98=BF=E9=87=8C=E5=B7=B4=E5=B7=B4=E6=99=AE?= =?UTF-8?q?=E6=83=A0=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/rich-text/DeRichTextView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue index 6c47b38582..8d39d7496d 100644 --- a/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue +++ b/core/core-frontend/src/custom-component/rich-text/DeRichTextView.vue @@ -127,7 +127,7 @@ const init = ref({ '| bdmap indent2em lineheight formatpainter axupimgs', toolbar_location: '/', font_formats: - '微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings', + '阿里巴巴普惠体=阿里巴巴普惠体 3.0 55 Regular L3;微软雅黑=Microsoft YaHei;宋体=SimSun;黑体=SimHei;仿宋=FangSong;华文黑体=STHeiti;华文楷体=STKaiti;华文宋体=STSong;华文仿宋=STFangsong;Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings', fontsize_formats: '12px 14px 16px 18px 20px 22px 24px 28px 32px 36px 48px 56px 72px', // 字体大小 menubar: false, placeholder: '', From 23dfe4ab7fa7e665a3b1dccba00f01fc8e27a387 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 16 Jan 2024 09:40:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F):=20=E5=A4=A7=E5=B1=8F=E4=BD=8D=E7=BD=AE=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E6=95=B0=E6=8D=AE=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=9A=8F=E7=BC=A9=E6=94=BE=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-backend/pom.xml | 10 +++++ .../common/ComponentPosition.vue | 40 ++++++++++++++++--- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml index 1e43ec1d51..a37a5973f0 100644 --- a/core/core-backend/pom.xml +++ b/core/core-backend/pom.xml @@ -96,6 +96,16 @@ com.h2database h2 + + io.dataease + xpack-permissions + ${project.version} + + + io.dataease + xpack-base + ${project.version} + diff --git a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue index 981fd92741..6e8ea71237 100644 --- a/core/core-frontend/src/components/visualization/common/ComponentPosition.vue +++ b/core/core-frontend/src/components/visualization/common/ComponentPosition.vue @@ -10,8 +10,8 @@ :min="min" :max="max" :step="step" - v-model="curComponent.style[key]" - @change="onPositionChange" + v-model="positionMounted[key]" + @change="onPositionChange(key)" controls-position="right" /> @@ -21,7 +21,7 @@