From 7d783ed0d04754561ca48aa7ed160c7eeb26eae2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 6 Apr 2022 10:09:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=A4=87=E9=80=89=E5=AD=97=E6=AE=B5=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=AB=8B=E5=8D=B3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtPanelViewLinkageMapper.xml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
index e6230125c2..2170582435 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
@@ -34,19 +34,19 @@
 
     <select id="getViewLinkageGather" resultMap="LinkageGatherMap">
         SELECT
-        chart_view.`name` as 'targetViewName',
-        chart_view.id as 'target_view_id',
-        chart_view.table_id,
+        chart_view_cache.`name` as 'targetViewName',
+        chart_view_cache.id as 'target_view_id',
+        chart_view_cache.table_id,
         (case when panel_view_linkage.target_view_id is null then 0 else 1 end) as 'linkageActive',
         panel_view_linkage_field.source_field,
         panel_view_linkage_field.target_field
         FROM
-        chart_view
-        LEFT JOIN panel_view_linkage ON chart_view.id = panel_view_linkage.target_view_id
+        chart_view_cache
+        LEFT JOIN panel_view_linkage ON chart_view_cache.id = panel_view_linkage.target_view_id
         AND panel_view_linkage.panel_id = #{panelId}
         AND panel_view_linkage.source_view_id = #{sourceViewId}
         LEFT JOIN panel_view_linkage_field ON panel_view_linkage.id = panel_view_linkage_field.linkage_id
-        where chart_view.id in
+        where chart_view_cache.id in
         <foreach collection="targetViewIds" item="targetViewId" index="index" open="(" close=")" separator=",">
             #{targetViewId}
         </foreach>

From 284fcefe2b08662c190567f21b4dd96fc3ebfbed Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 6 Apr 2022 10:09:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E9=80=89=E9=A1=B9=E5=8D=A1=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeTabs.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue
index 7e624a59b7..7b6d5001d4 100644
--- a/frontend/src/components/widget/DeWidget/DeTabs.vue
+++ b/frontend/src/components/widget/DeWidget/DeTabs.vue
@@ -93,7 +93,7 @@
       />
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">{{ $t('table.cancel') }}</el-button>
-        <el-button :disabled="!textarea" type="primary" @click="sureCurTitle">{{ $t('table.confirm') }}</el-button>
+        <el-button :disabled="!titleValid" type="primary" @click="sureCurTitle">{{ $t('table.confirm') }}</el-button>
       </span>
     </el-dialog>
 
@@ -202,6 +202,9 @@ export default {
     },
     borderActiveColor() {
       return this.element && this.element.style && this.element.style.headBorderActiveColor || 'none'
+    },
+    titleValid() {
+      return !!this.textarea && !!this.textarea.trim()
     }
   },
   watch: {