Merge branch 'dev' into v1.18

backend/src/main/resources/db/migration/V55__1.18.8.sql

@@ -0,0 +1,4 @@
+UPDATE `my_plugin`
+SET `version` = '1.18.8'
+where `plugin_id` > 0
+  and `version` = '1.18.7';

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease",
-  "version": "1.18.7",
+  "version": "1.18.8",
   "description": "dataease front",
   "private": true,
   "scripts": {

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

@@ -396,6 +396,9 @@ export default {
           chart_option.legend['pageIconInactiveColor'] = '#8c8c8c'
         }
       }
+      if (chart_option.tooltip) {
+        chart_option.tooltip.appendToBody = true
+      }
       this.myEcharts(chart_option)
       this.$nextTick(() => (this.linkageActive()))
     },

frontend/src/views/chart/view/CalcChartFieldEdit.vue

@@ -518,7 +518,7 @@ export default {
           if (name2Auto) {
             name2Auto.push(nameIdMap[ele])
           }
-          name2Id = name2Id.replace(ele, nameIdMap[ele])
+          name2Id = name2Id.replace(`[${ele}]`, `[${nameIdMap[ele]}]`)
         })
       }
       return name2Id

frontend/src/views/dataset/Form.vue

@@ -41,7 +41,7 @@
         >{{ $t('deDataset.selected') }} {{ tableNum }}
           {{ ['excel'].includes(datasetType) ? $t('deDataset.table') : $t('deDataset.item') }}</span>
         <deBtn
-          :disabled="['db', 'excel', 'api'].includes(datasetType) && !tableNum"
+          :disabled="['db', 'excel', 'api', 'union'].includes(datasetType) && !tableNum"
           type="primary"
           @click="datasetSave"
         >{{

frontend/src/views/dataset/add/AddUnion.vue

@@ -305,12 +305,14 @@ export default {
       const ds = JSON.parse(JSON.stringify(this.unionItem))
       ds.currentDs = this.tempDs
       this.dataset.push(ds)
+      this.$emit('setTableNum', this.dataset.length)
       this.closeSelectDs()
       this.calc('union')
     },
     deleteNode(index) {
       this.dataset.splice(index, 1)
       this.calc('delete')
+      this.$emit('setTableNum', this.dataset.length)
     },
     calc(param) {
       if (param.type === 'union') {
@@ -385,6 +387,7 @@ export default {
           (response) => {
             const table = JSON.parse(JSON.stringify(response.data))
             this.dataset = JSON.parse(table.info).union
+            this.$emit('setTableNum', this.dataset.length)
             this.previewData()
           }
         )

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

@@ -44,7 +44,7 @@
                 style="color: green;font-size: 12px"
               >&nbsp;({{ $t('panel.source_panel_name') }}:{{ panelInfo.sourcePanelName }})</span>
             </div>
-            <div style="width: 200px">
+            <div class="panel-create-cont">
               <span
                 v-if="!hasStar && panelInfo && showType !== 1&&panelInfo.status==='publish'"
                 style="margin-left: 9px"
@@ -72,7 +72,7 @@
                   style="margin: 0 16px;"
                   direction="vertical"
                 />
-                <span class="panel-create">
+                <span :title="panelInfo.creatorName" class="panel-create">
                 {{ $t('panel.create_by') + ':' + panelInfo.creatorName }}
               </span>
               </template>
@@ -863,12 +863,21 @@ export default {
 
   }
 
+  .panel-create-cont {
+    display: flex;
+    align-items: center;
+  }
+
   .panel-create {
     font-family: PingFang SC;
     font-size: 14px;
     font-weight: 400;
     line-height: 22px;
     color: var(--deTextSecondary, #646A73);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 200px;
   }
 }
 

mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataease-mobile",
-  "version": "1.18.7",
+  "version": "1.18.8",
   "private": true,
   "scripts": {
     "serve": "npm run dev:h5",

pom.xml

@@ -16,7 +16,7 @@
     </parent>
 
     <properties>
-        <dataease.version>1.18.7</dataease.version>
+        <dataease.version>1.18.8</dataease.version>
     </properties>
 
     <name>dataease</name>