Merge remote-tracking branch 'origin/dev' into dev

backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java

@@ -32,7 +32,12 @@ public interface StoreApi {
 
 
     @ApiOperation("移除收藏")
-    @PostMapping("/remove/{storeId}")
-    void remove(@PathVariable("storeId") String storeId);
+    @PostMapping("/remove/{panelId}")
+    void remove(@PathVariable("panelId") String panelId);
+
+    @ApiOperation("收藏状态")
+    @PostMapping("/status/{id}")
+    Boolean hasStar(@PathVariable("id") String id);
+
 
 }

backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java

@@ -29,4 +29,9 @@ public class StoreServer implements StoreApi {
     public void remove(String panelId) {
         storeService.removeByPanelId(panelId);
     }
+
+    @Override
+    public Boolean hasStar(String id) {
+        return storeService.count(id) > 0L;
+    }
 }

backend/src/main/java/io/dataease/service/panel/StoreService.java

@@ -53,4 +53,11 @@ public class StoreService {
         return extPanelStoreMapper.query(example);
     }
 
+    public Long count(String panelId) {
+        PanelStoreExample example = new PanelStoreExample();
+        example.createCriteria().andUserIdEqualTo(AuthUtils.getUser().getUserId()).andPanelGroupIdEqualTo(panelId);
+        return panelStoreMapper.countByExample(example);
+    }
+
+
 }

frontend/src/api/panel/enshrine.js

@@ -25,3 +25,10 @@ export function enshrineList(data) {
   })
 }
 
+export function starStatus(panelId) {
+  return request({
+    url: '/api/store/status/' + panelId,
+    method: 'post',
+    loading: true
+  })
+}

frontend/src/views/chart/components/drag-item/QuotaItem.vue

@@ -172,10 +172,7 @@ export default {
     }
   },
   watch: {
-    'chart.xaxis': function() {
-      this.isEnableCompare()
-    },
-    'chart.extStack': function() {
+    'chart': function() {
       this.isEnableCompare()
     }
   },
@@ -198,7 +195,7 @@ export default {
       const t2 = extStack.filter(ele => {
         return ele.deType === 1
       })
-      if (t1.length > 0 || t2.length > 0) {
+      if ((t1.length > 0 || t2.length > 0) && this.chart.type !== 'text' && this.chart.type !== 'gauge' && this.chart.type !== 'liquid') {
         this.disableEditCompare = false
       } else {
         this.disableEditCompare = true

frontend/src/views/panel/list/PanelViewShow.vue

@@ -125,7 +125,7 @@ import SaveToTemplate from '@/views/panel/list/SaveToTemplate'
 import { mapState } from 'vuex'
 import html2canvas from 'html2canvasde'
 import FileSaver from 'file-saver'
-import { enshrineList, saveEnshrine, deleteEnshrine } from '@/api/panel/enshrine'
+import { starStatus, saveEnshrine, deleteEnshrine } from '@/api/panel/enshrine'
 import bus from '@/utils/bus'
 import { queryAll } from '@/api/panel/pdfTemplate'
 import ShareHead from '@/views/panel/GrantAuth/ShareHead'
@@ -294,9 +294,8 @@ export default {
       })
     },
     initHasStar() {
-      const param = {}
-      enshrineList(param).then(res => {
-        this.hasStar = res.data && res.data.some(item => item.panelGroupId === this.panelInfo.id)
+      starStatus(this.panelInfo.id).then(res => {
+        this.hasStar = res.data
       })
     },
     refreshStarList(isStar) {