Merge branch 'dev' into v1.18

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -1310,6 +1310,17 @@ public class ExtractDataService {
                     .replace("ExcelCompletion", "");
         }
 
+        String handleMysqlBIGINTUNSIGNEDStr = "";
+        if (datasourceType.equals(DatasourceTypes.mysql)) {
+            for (DatasetTableField datasetTableField : datasetTableFields) {
+                if(datasetTableField.getType().equalsIgnoreCase("BIGINT UNSIGNED")){
+                    handleMysqlBIGINTUNSIGNEDStr = handleMysqlBIGINTUNSIGNEDStr + handleMysqlBIGINTUNSIGNED.replace("BIGINTUNSIGNEDFIELD", datasetTableField.getDataeaseName()) + "; \n";
+                }
+            }
+        }
+        tmp_code = tmp_code.replace("handleMysqlBIGINTUNSIGNED", handleMysqlBIGINTUNSIGNEDStr);
+
+
         UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
 
         userDefinedJavaClassDef.setActive(true);
@@ -1403,6 +1414,16 @@ public class ExtractDataService {
             "            }catch (Exception e){}\n" +
             "        }";
 
+    private final static String handleMysqlBIGINTUNSIGNED = "if(filed.equalsIgnoreCase(\"BIGINTUNSIGNEDFIELD\")){\n" +
+            "\t\t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
+            "            \ttry {\n" +
+            "                Long.valueOf(tmp.substring(0, tmp.length()-2));\n" +
+            "                get(Fields.Out, filed).setValue(r, tmp.substring(0, tmp.length()-2));\n" +
+            "                get(Fields.Out, filed).getValueMeta().setType(2);\n" +
+            "            }catch (Exception e){}\n" +
+            "       \t\t}\n" +
+            "\t\t}";
+
     private final static String handleWraps = "        if(tmp != null && ( tmp.contains(\"\\r\") || tmp.contains(\"\\n\"))){\n" +
             "\t\t\ttmp = tmp.trim();\n" +
             "            tmp = tmp.replaceAll(\"\\r\",\" \");\n" +
@@ -1445,6 +1466,7 @@ public class ExtractDataService {
             "    List<String> fields = Arrays.asList(\"Column_Fields\".split(\",\"));\n" +
             "    for (String filed : fields) {\n" +
             "        String tmp = get(Fields.In, filed).getString(r);\n" +
+            "handleMysqlBIGINTUNSIGNED \n" +
             "handleCharset \n" +
             "handleWraps \n" +
             "ExcelCompletion \n" +

backend/src/main/resources/db/migration/V54__1.18.7.sql

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

frontend/package.json

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

frontend/src/api/panel/enshrine.js

@@ -29,6 +29,6 @@ export function starStatus(panelId) {
   return request({
     url: '/api/store/status/' + panelId,
     method: 'post',
-    loading: true
+    loading: false
   })
 }

frontend/src/api/panel/linkJump.js

@@ -33,6 +33,7 @@ export function queryTargetPanelJumpInfo(requestInfo) {
 export function queryPanelJumpInfo(panelId) {
   return request({
     url: '/linkJump/queryPanelJumpInfo/' + panelId,
-    method: 'get'
+    method: 'get',
+    loading: false
   })
 }

frontend/src/api/panel/linkage.js

@@ -21,6 +21,7 @@ export function saveLinkage(requestInfo) {
 export function getPanelAllLinkageInfo(panelId) {
   return request({
     url: '/linkage/getPanelAllLinkageInfo/' + panelId,
-    method: 'get'
+    method: 'get',
+    loading: false
   })
 }

frontend/src/api/panel/panel.js

@@ -97,7 +97,7 @@ export function viewPanelLog(data) {
   return request({
     url: 'panel/group/viewLog',
     method: 'post',
-    loading: true,
+    loading: false,
     data
   })
 }

frontend/src/api/panel/pdfTemplate.js

@@ -4,6 +4,6 @@ export function queryAll() {
   return request({
     url: '/pdf-template/queryAll',
     method: 'get',
-    loading: true
+    loading: false
   })
 }

frontend/src/views/dataset/data/UpdateInfo.vue

@@ -909,7 +909,6 @@ export default {
           }
           this.incrementalConfig.tableId = this.table.id
           task.startTime = new Date(task.startTime).getTime()
-          console.log(task.endTime)
           task.endTime = new Date(task.endTime).getTime()
           task.tableId = this.table.id
           const form = JSON.parse(JSON.stringify(task))

mobile/package.json

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

pom.xml

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