Merge branch 'dev' of github.com:dataease/dataease into dev

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>

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: {