Merge branch 'dev' into v1.18

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/dataset/add/AddSQL.vue

@@ -273,12 +273,27 @@
               :description="$t('deDataset.run_failed')"
             >{{ errMsgCont }}
             </el-empty>
+            <div style="float: left" v-else-if="fields.length">
               <el-table
-              v-else
               :data="plxTableData"
               size="mini"
               border
-              style="width: 100%; height: 100%;overflow-y: auto;"
+            >
+              <el-table-column
+                v-for="field in fields"
+                :key="field.fieldName"
+                min-width="200px"
+                :prop="field.fieldName"
+                :label="field.remarks"
+                resizable
+              />
+            </el-table>
+            </div>
+            <el-table
+              :data="plxTableData"
+              v-else
+              size="mini"
+              border
             >
               <el-table-column
                 v-for="field in fields"
@@ -1300,9 +1315,9 @@ export default {
     }
 
     .table-sql {
-      height: calc(100% - 110px);
-      padding: 0 25px 18px 25px;
-      overflow-y: auto;
+      height: calc(100% - 128px);
+      margin: 0 25px 18px 25px;
+      overflow: auto;
       box-sizing: border-box;
 
       .el-empty__bottom,

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>