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

backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java

@@ -51,6 +51,7 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/api/map/areaEntitys/**", ANON);
         filterChainDefinitionMap.put("/dataset/field/fieldValues/**", ANON);
         filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON);
+        filterChainDefinitionMap.put("/linkJump/queryTargetPanelJumpInfo", ANON);
 
         filterChainDefinitionMap.put("/tempMobileLink/**", ANON);
         filterChainDefinitionMap.put("/de-app/**", ANON);

frontend/src/components/canvas/components/Editor/ComponentWrapper.vue

@@ -12,6 +12,7 @@
       :id="'component' + config.id"
       class="component-custom"
       :style="getComponentStyleDefault(config.style)"
+      style="overflow: hidden"
       :out-style="config.style"
       :element="config"
       :in-screen="inScreen"

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

@@ -51,7 +51,7 @@
       </el-tooltip>
 
       <div v-if="attrShow('fontSize')" style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.fontSize" type="number" size="mini" min="12" max="128" @change="styleChange" />
+        <el-input v-model="initFontSize" type="number" size="mini" :min="miniFontSize" :max="maxFontSize" @change="styleChange" />
       </div>
 
       <el-tooltip v-if="attrShow('fontWeight')" :content="$t('panel.fontWeight')">
@@ -150,6 +150,7 @@ import Hyperlinks from '@/components/canvas/components/Editor/Hyperlinks'
 import VideoLinks from '@/components/canvas/components/Editor/VideoLinks'
 import DateFormat from '@/components/canvas/components/Editor/DateFormat'
 import { COLOR_PANEL } from '@/views/chart/chart/chart'
+import { chartTransStr2Object } from '@/views/panel/panel'
 
 export default {
   components: { Hyperlinks, DateFormat, VideoLinks },
@@ -169,6 +170,9 @@ export default {
       showMain: true,
       innerOpacity: 0,
       mainWidthOffset: 600,
+      initFontSize: 12,
+      miniFontSize: 12,
+      maxFontSize: 128,
       textAlignOptions: [
         {
           icon: 'iconfont icon-juzuo',
@@ -285,7 +289,6 @@ export default {
       ]
     }
   },
-
   computed: {
     boardDivColor() {
       const style = {
@@ -330,11 +333,30 @@ export default {
 
   },
   watch: {
+    styleInfo: {
+      handler(newVal, oldVla) {
+        if (newVal.fontSize) {
+          this.initFontSize = newVal.fontSize
+        }
+      },
+      deep: true
+    },
     innerOpacity: {
       handler(oldVal, newVal) {
         this.styleInfo['opacity'] = this.innerOpacity / 100
       }
     },
+    initFontSize: {
+      handler(newVal) {
+        if (newVal < this.miniFontSize) {
+          this.styleInfo.fontSize = this.miniFontSize
+        } else if (newVal > this.maxFontSize) {
+          this.styleInfo.fontSize = this.maxFontSize
+        } else {
+          this.styleInfo.fontSize = newVal
+        }
+      }
+    },
     curComponent: {
       handler(oldVal, newVal) {
         this.$nextTick(() => {
@@ -346,6 +368,9 @@ export default {
   },
   mounted() {
     this.init()
+    if (this.attrShow('fontSize')) {
+      this.initFontSize = this.styleInfo.fontSize
+    }
   },
 
   methods: {

frontend/src/components/dataease/DeOutWidget.vue

@@ -87,8 +87,7 @@ export default {
   computed: {
     sizeInfo() {
       let size
-      if (this.duHeight > this.inputMaxSize) {
-      } else if (this.duHeight > this.inputLargeSize) {
+      if (this.duHeight > this.inputLargeSize) {
         size = 'medium'
       } else if (this.duHeight > this.inputSmallSize) {
         size = 'small'
@@ -101,6 +100,14 @@ export default {
       'curCanvasScale'
     ])
   },
+  watch: {
+    element: {
+      handler() {
+        this.watchSize()
+      },
+      deep: true
+    }
+  },
   mounted() {
     this.watchSize()
   },
@@ -121,13 +128,15 @@ export default {
           return
         }
         const titleWidth = this.$refs.deTitle.offsetWidth
-        this.duHeight = height - titleWidth
         this.$nextTick(() => {
-          let min = this.element.style.fontSize * 2 + 50
+          let numRange = 0
+          let min = this.element.style.fontSize * 2 + 30
           if (this.element.component === 'de-number-range') {
-            min = this.element.style.fontSize * 2 + 80
+            min = this.element.style.fontSize * 2 + 55
+            numRange = 25
           }
           if (height < min) {
+            this.duHeight = height - numRange
             this.mainClass = 'condition-main-line'
 
             if (deContentContainer) {
@@ -135,6 +144,7 @@ export default {
               deContentContainer.style.marginLeft = (titleWidth + 15) + 'px'
             }
           } else {
+            this.duHeight = height - titleWidth + numRange
             this.mainClass = ''
             if (deContentContainer) {
               deContentContainer.style.top = '2em'