From 37cf81a19d6170871b35456ae51e2aea4979a296 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 28 Feb 2023 14:36:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml       | 8 ++++----
 frontend/package.json | 2 +-
 frontend/pom.xml      | 2 +-
 mobile/package.json   | 2 +-
 mobile/pom.xml        | 2 +-
 pom.xml               | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 039930587b..624cc12ee6 100644
--- a/backend/pom.xml
+++ b/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>
diff --git a/frontend/package.json b/frontend/package.json
index 1a2b29da57..d24e88ba55 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dataease",
-  "version": "1.18.3",
+  "version": "1.18.4",
   "description": "dataease front",
   "private": true,
   "scripts": {
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 123e82483a..20bf7b361b 100644
--- a/frontend/pom.xml
+++ b/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>
diff --git a/mobile/package.json b/mobile/package.json
index 4e89f0a962..51f483e43b 100644
--- a/mobile/package.json
+++ b/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",
diff --git a/mobile/pom.xml b/mobile/pom.xml
index 063e794c90..3cfaae85d2 100644
--- a/mobile/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index e99f15476b..c9eebe174c 100644
--- a/pom.xml
+++ b/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>

From 3a0c6c962962275a765be72e08b8296e9d6da6a7 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 28 Feb 2023 15:08:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=BF=9B=E5=85=A5=E7=9B=B4=E6=8E=A5=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/compare/CustomSortEdit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/chart/components/compare/CustomSortEdit.vue b/frontend/src/views/chart/components/compare/CustomSortEdit.vue
index 0eeb7b4f3d..8340ce1c86 100644
--- a/frontend/src/views/chart/components/compare/CustomSortEdit.vue
+++ b/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() {