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

backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.18.3</version>
+        <version>1.18.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -204,7 +204,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.18.3</version>
+            <version>1.18.4</version>
             <exclusions>
                 <exclusion>
                     <artifactId>guava</artifactId>
@@ -215,12 +215,12 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-view</artifactId>
-            <version>1.18.3</version>
+            <version>1.18.4</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-datasource</artifactId>
-            <version>1.18.3</version>
+            <version>1.18.4</version>
         </dependency>
         <!-- kettle及数据源依赖 -->
         <dependency>

frontend/package.json

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

frontend/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <artifactId>dataease-server</artifactId>
     <groupId>io.dataease</groupId>
-    <version>1.18.3</version>
+    <version>1.18.4</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

frontend/src/views/chart/components/compare/CustomSortEdit.vue

@@ -69,6 +69,7 @@ export default {
     init() {
       post('/chart/view/getFieldData/' + this.chart.id + '/' + this.panelInfo.id + '/' + this.field.id + '/' + this.fieldType, {}).then(response => {
         this.sortList = response.data
+        this.onUpdate()
       })
     },
     onMove() {

mobile/package.json

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

mobile/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.18.3</version>
+        <version>1.18.4</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease-server</artifactId>
-    <version>1.18.3</version>
+    <version>1.18.4</version>
     <packaging>pom</packaging>
 
     <parent>