From feb67dba6ec3e07e3700fe039cca9e839fdb0087 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:10:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B1=87=E6=80=BB=E8=A1=A8=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5=E5=90=8E=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E8=B7=B3=E8=BD=AC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=9C=AA=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/custom-component/DeRichTextView.vue   | 2 +-
 frontend/src/views/panel/LinkJumpSet/index.vue              | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/DeRichTextView.vue b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
index 5ccbf081b9..1c78d8ac4f 100644
--- a/frontend/src/components/canvas/custom-component/DeRichTextView.vue
+++ b/frontend/src/components/canvas/custom-component/DeRichTextView.vue
@@ -194,8 +194,8 @@ export default {
       if (this.editStatus&&this.canEdit===false) {
         this.canEdit = true
         this.element['editing'] = true
-        this.reShow()
         this.myValue = this.element.propValue.textValue
+        this.reShow()
       }
     },
     reShow() {
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index 26cef164c6..62c567cce5 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -362,8 +362,10 @@ export default {
       const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
       let checkJumpStr
       if (chartDetails.type === 'table-pivot') {
-        checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt
-      } else {
+        checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
+      }else if(chartDetails.type === 'table-info') {
+        checkJumpStr = chartDetails.xaxis + chartDetails.drillFields
+      }else {
         checkJumpStr = checkAllAxisStr
       }
       // 获取可关联的仪表板

From 4b4e9f135f76046555d1b9cf10f374ed7610fb3a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 23 Sep 2022 18:12:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E5=AD=97=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AD=97=E5=8F=B7=E6=97=B6=E6=95=B0=E5=AD=97=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E5=BC=82=E5=B8=B8=20#3099?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/components/TextAttr.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 6ebdf399ca..ab6926eefb 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -218,7 +218,7 @@ export default {
       innerOpacity: 0,
       mainWidthOffset: 600,
       initFontSize: 12,
-      miniFontSize: 12,
+      miniFontSize: 0,
       maxFontSize: 128,
       textAlignOptions: [
         {