Merge pull request #707 from dataease/refactor_demo-add

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

@@ -70,7 +70,7 @@
         )))
         WHERE
         sys_auth_detail.privilege_value = 1
-        AND sys_auth.auth_source_type = 'chart'
+        AND sys_auth.auth_source_type = 'link'
         AND (
         (
         sys_auth.auth_target_type = 'dept'

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

 package io.dataease.service.panel;
 
+import io.dataease.base.domain.PanelGroupWithBLOBs;
 import io.dataease.base.domain.PanelViewLinkage;
 import io.dataease.base.domain.PanelViewLinkageField;
+import io.dataease.base.mapper.PanelGroupMapper;
 import io.dataease.base.mapper.PanelViewLinkageFieldMapper;
 import io.dataease.base.mapper.PanelViewLinkageMapper;
 import io.dataease.base.mapper.ext.ExtPanelViewLinkageMapper;
@@ -10,6 +12,7 @@ import io.dataease.controller.request.panel.PanelLinkageRequest;
 import io.dataease.dto.LinkageInfoDTO;
 import io.dataease.dto.PanelViewLinkageDTO;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -35,6 +38,9 @@ public class PanelViewLinkageService {
     @Resource
     private ExtPanelViewLinkageMapper extPanelViewLinkageMapper;
 
+    @Resource
+    private PanelGroupMapper panelGroupMapper;
+
 
     public Map<String, PanelViewLinkageDTO> getViewLinkageGather(PanelLinkageRequest request) {
         if(CollectionUtils.isNotEmpty(request.getTargetViewIds())){
@@ -92,6 +98,10 @@ public class PanelViewLinkageService {
     }
 
     public Map<String, List<String>> getPanelAllLinkageInfo(String panelId) {
+        PanelGroupWithBLOBs panelInfo = panelGroupMapper.selectByPrimaryKey(panelId);
+        if(panelInfo!=null && StringUtils.isNotEmpty(panelInfo.getSource())){
+            panelId=panelInfo.getSource();
+        }
         List<LinkageInfoDTO> info = extPanelViewLinkageMapper.getPanelAllLinkageInfo(panelId);
         return Optional.ofNullable(info).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(LinkageInfoDTO::getSourceInfo,LinkageInfoDTO::getTargetInfoList));
     }

frontend/src/components/canvas/components/TextAttr.vue

@@ -41,6 +41,14 @@
         <el-input v-model="styleInfo.letterSpacing" type="number" size="mini" min="0" max="99" @change="styleChange" />
       </div>
 
+      <el-tooltip :content="$t('panel.opacity')">
+        <i style="float: left;margin-top: 3px;margin-left: 2px;" class="icon iconfont icon-touming" />
+      </el-tooltip>
+
+      <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
+        <el-input v-model="innerOpacity" type="number" size="mini" min="0" max="100" step="10" @change="styleChange" />
+      </div>
+
       <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
         <div style="width: 16px;height: 18px">
           <el-tooltip :content="$t('panel.color')">
@@ -79,6 +87,7 @@ export default {
   },
   data() {
     return {
+      innerOpacity: 0,
       textAlignOptions: [
         {
           icon: 'iconfont icon-juzuo',
@@ -97,8 +106,19 @@ export default {
         }
       ] }
   },
+  watch: {
+    innerOpacity: {
+      handler(oldVal, newVal) {
+        this.styleInfo['opacity'] = this.innerOpacity / 100
+      }
+    }
+  },
+  mounted() {
+    if (this.styleInfo['opacity']) {
+      this.innerOpacity = this.styleInfo['opacity'] * 100
+    }
+  },
   computed: {
-
     letterDivColor() {
       const style = {
         height: '2px',
@@ -153,7 +173,7 @@ export default {
         ps = x + 60
       }
       // 防止toolbar超出边界
-      const xGap = ps + 395 - this.canvasWidth
+      const xGap = ps + 495 - this.canvasWidth
       // console.log('canvasWidth:' + this.canvasWidth + ';xGap:' + xGap)
       if (xGap > 0) {
         return ps - xGap
@@ -185,7 +205,7 @@ export default {
   .el-card-main {
     height: 34px;
     z-index: 10;
-    width: 450px;
+    width: 550px;
     position: absolute;
 
   }