diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 35651738da..4efc52dd57 100644 --- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/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 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" + diff --git a/backend/src/main/resources/db/migration/V54__1.18.7.sql b/backend/src/main/resources/db/migration/V54__1.18.7.sql new file mode 100644 index 0000000000..29cc920895 --- /dev/null +++ b/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'; \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index da5e15b445..28b3f37216 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "dataease", - "version": "1.18.6", + "version": "1.18.7", "description": "dataease front", "private": true, "scripts": { diff --git a/frontend/src/api/panel/enshrine.js b/frontend/src/api/panel/enshrine.js index e8b98951ec..92a64cf51e 100644 --- a/frontend/src/api/panel/enshrine.js +++ b/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 }) } diff --git a/frontend/src/api/panel/linkJump.js b/frontend/src/api/panel/linkJump.js index ed85ac5398..e5d98dce45 100644 --- a/frontend/src/api/panel/linkJump.js +++ b/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 }) } diff --git a/frontend/src/api/panel/linkage.js b/frontend/src/api/panel/linkage.js index 6b0bd72fa6..80dc272446 100644 --- a/frontend/src/api/panel/linkage.js +++ b/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 }) } diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js index 6bd6714b92..375c39fd17 100644 --- a/frontend/src/api/panel/panel.js +++ b/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 }) } diff --git a/frontend/src/api/panel/pdfTemplate.js b/frontend/src/api/panel/pdfTemplate.js index 729a3c2b97..3e898ca1fa 100644 --- a/frontend/src/api/panel/pdfTemplate.js +++ b/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 }) } diff --git a/frontend/src/assets/datasource/pg.jpg b/frontend/src/assets/datasource/pg.jpg index 7e5e9db2e9..51a99ca1e1 100644 Binary files a/frontend/src/assets/datasource/pg.jpg and b/frontend/src/assets/datasource/pg.jpg differ diff --git a/frontend/src/assets/datasource/sqlServer.jpg b/frontend/src/assets/datasource/sqlServer.jpg index d77494a226..0cb4927e04 100644 Binary files a/frontend/src/assets/datasource/sqlServer.jpg and b/frontend/src/assets/datasource/sqlServer.jpg differ diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue index 0d13f46cd1..e6f68f94f6 100644 --- a/frontend/src/views/dataset/data/UpdateInfo.vue +++ b/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)) diff --git a/mobile/package.json b/mobile/package.json index 3417ce608e..32ac241c6c 100644 --- a/mobile/package.json +++ b/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", diff --git a/pom.xml b/pom.xml index 1fa739fcc5..c4d7c90dc6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.18.6 + 1.18.7 dataease