Merge branch 'dev' into pr@dev_memory_component

backend/src/main/java/io/dataease/ext/ExtDataSetTableMapper.xml

@@ -234,6 +234,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where dt.id=#{datasetId,jdbcType=VARCHAR}
+        group by id,panel_id
         order by id
     </select>
 </mapper>

backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml

@@ -239,6 +239,7 @@
             group by sa.auth_source
         ) pg_auth on pg_auth.id = pg.id
         where ds.id=#{datasourceId,jdbcType=VARCHAR}
+        group by id,panel_id
         order by id
     </select>
 </mapper>

backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml

@@ -285,7 +285,7 @@
             )
             group by sa.auth_source
         ) dt_auth on dt.id = dt_auth.id
-        join datasource ds on dt.data_source_id = ds.id
+        left join datasource ds on dt.data_source_id = ds.id
         left join
         (
             select
@@ -318,7 +318,8 @@
             group by sa.auth_source
         ) ds_auth on ds_auth.id = ds.id
         where pg.id=#{panelId,jdbcType=VARCHAR}
-        group by dt.id
+        group by id,dt_id
+        order by id
     </select>
 
     <select id="listPanelByUser" resultType="io.dataease.plugins.common.base.domain.PanelGroup"

frontend/src/components/canvas/components/editor/PreviewEject.vue

@@ -141,7 +141,7 @@ export default {
         }
         //透视表中的其他维度数据数据都进行匹配
         if (jumpParam.sourceType && jumpParam.sourceType === 'table-pivot') {
-          jumpRequestParam.targetPanelId = null
+          jumpRequestParam.sourceFieldId = null
         }
         try {
           // 刷新跳转目标仪表板联动信息

frontend/src/components/canvas/customComponent/UserView.vue

@@ -792,12 +792,14 @@ export default {
             this.requestStatus = 'success'
             this.httpRequest.status = true
           } else {
+            console.error('err2-' + JSON.stringify(response))
             this.requestStatus = 'error'
             this.message = response.message
           }
           this.isFirstLoad = false
           return true
         }).catch(err => {
+          console.error('err-' + err)
           this.requestStatus = 'error'
           if (err.message && err.message.indexOf('timeout') > -1) {
             this.message = this.$t('panel.timeout_refresh')
@@ -878,10 +880,10 @@ export default {
           }
           if (formatterCfg) {
             const v = valueFormatter(value, formatterCfg)
-            rowData[key] = v.includes('NaN') ? value : v
+            rowData[key] = v && v.includes('NaN') ? value : v
           } else {
             const v = valueFormatter(value, formatterItem)
-            rowData[key] = v.includes('NaN') ? value : v
+            rowData[key] = v && v.includes('NaN') ? value : v
           }
         }
       }

frontend/src/components/canvas/utils/shortcutKey.js

@@ -53,12 +53,14 @@ export function listenGlobalKeyDown() {
   window.onkeydown = (e) => {
     if (!store.state.isInEditor) return
     const { keyCode } = e
-    e.preventDefault()
-    e.stopPropagation()
     if (keyCode === ctrlKey || keyCode === commandKey) {
+      e.preventDefault()
+      e.stopPropagation()
       isCtrlOrCommandDown = true
     } else if (isCtrlOrCommandDown) {
       if (keyCode === zKey || keyCode === yKey || keyCode === dKey || keyCode === sKey || keyCode === enlargeKey) {
+        e.preventDefault()
+        e.stopPropagation()
         unlockMap[keyCode]()
       }
     }
@@ -74,13 +76,14 @@ export function listenGlobalKeyDown() {
 export function listenGlobalKeyDownPreview() {
   window.onkeydown = (e) => {
     const { keyCode } = e
-    e.preventDefault()
-    e.stopPropagation()
     if (keyCode === ctrlKey || keyCode === commandKey) {
+      e.preventDefault()
+      e.stopPropagation()
       isCtrlOrCommandDown = true
     } else if (isCtrlOrCommandDown) {
       if (keyCode === enlargeKey) {
         e.preventDefault()
+        e.stopPropagation()
         unlockMap[keyCode]()
       }
     }

frontend/src/views/chart/components/ChartComponentS2.vue

@@ -426,7 +426,8 @@ export default {
         name: this.pointParam.data.name,
         viewId: this.chart.id,
         dimensionList: this.pointParam.data.dimensionList,
-        quotaList: this.pointParam.data.quotaList
+        quotaList: this.pointParam.data.quotaList,
+        sourceType: this.pointParam.data.sourceType
       }
       switch (trackAction) {
         case 'drill':

frontend/src/views/link/view/index.vue

@@ -152,6 +152,9 @@ export default {
               sourceFieldId: jumpParam.sourceFieldId,
               targetPanelId: this.resourceId
             }
+            if (jumpParam.sourceType && jumpParam.sourceType === 'table-pivot') {
+              jumpRequestParam.sourceFieldId = null
+            }
             // 刷新跳转目标仪表板联动信息
             queryTargetPanelJumpInfo(jumpRequestParam).then(rsp => {
               this.show = true