From 2a350c61c78643f9418811b3e492fb7f3ccabfee Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Feb 2023 12:52:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?revert:=20excel=20=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/commons/utils/ExcelXlsxReader.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java index 2300f7dded..15014155a6 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java @@ -359,8 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler { formatIndex = style.getDataFormat(); formatString = style.getDataFormatString(); short format = this.formatIndex; - if ((14 <= format && format <= 17) || format == 0 || format == 20 || format == 22 || format == 31 || format == 35 || (45 <= format && format <= 49) || format == 46 || format == 47 || (57 <= format && format <= 59) - || (59 < format && format <= 76) || (175 < format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期 + if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59) + || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期 isDateFormat = true; } From dfadeb6dbb6e00871fdcb563d408ab3a6cb70b95 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 20 Feb 2023 12:58:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=20oralce=20data?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/query/oracle/OracleQueryProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java index e5dada23c6..ebd8846aa9 100644 --- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java @@ -916,6 +916,9 @@ public class OracleQueryProvider extends QueryProvider { continue; } String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); + if(datasetTableField.getType().equals("DATE")){ + originField = String.format(OracleConstants.TO_CHAR, originField, OracleConstants.DEFAULT_DATE_FORMAT); + } String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName()); xFields.add(getXFields(x, originField, fieldAlias)); } From 67672fbc94e0cca4e2f78214f19f744f016b4c90 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 20 Feb 2023 13:49:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf(=E7=99=BB=E5=BD=95):=20=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E9=92=89=E9=92=89=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E5=85=8D=E7=99=BB=E4=BD=BF=E7=94=A8DE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/ehcache/ehcache.xml | 18 ++++-------------- mobile/src/locale/zh-Hans.json | 2 +- mobile/src/locale/zh-Hant.json | 2 +- mobile/src/pages.json | 2 +- mobile/src/pages/login/index.vue | 11 +++++++++-- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/backend/src/main/resources/ehcache/ehcache.xml b/backend/src/main/resources/ehcache/ehcache.xml index f8d8591b20..5976911a62 100644 --- a/backend/src/main/resources/ehcache/ehcache.xml +++ b/backend/src/main/resources/ehcache/ehcache.xml @@ -273,23 +273,13 @@ - + \ No newline at end of file diff --git a/mobile/src/locale/zh-Hans.json b/mobile/src/locale/zh-Hans.json index afaed12e0f..3da2e19ea1 100644 --- a/mobile/src/locale/zh-Hans.json +++ b/mobile/src/locale/zh-Hans.json @@ -1,5 +1,5 @@ { - "app.name": "Hello uni-app", + "app.name": "DataEase", "navigate.menuHome": "首页", "navigate.menuDir": "目录", diff --git a/mobile/src/locale/zh-Hant.json b/mobile/src/locale/zh-Hant.json index a3b8f5f97c..ff6fb1f846 100644 --- a/mobile/src/locale/zh-Hant.json +++ b/mobile/src/locale/zh-Hant.json @@ -1,5 +1,5 @@ { - "app.name": "Hello uni-app", + "app.name": "DataEase", "navigate.menuHome": "首頁", "navigate.menuDir": "目錄", "navigate.menuMe": "我的", diff --git a/mobile/src/pages.json b/mobile/src/pages.json index 1fcfb0dc34..11a720f61d 100644 --- a/mobile/src/pages.json +++ b/mobile/src/pages.json @@ -4,7 +4,7 @@ { "path": "pages/login/index", "style": { - "navigationBarTitleText": "%navigate.login%", + "navigationBarTitleText": "%app.name%", "app-plus": { "titleNView": false } diff --git a/mobile/src/pages/login/index.vue b/mobile/src/pages/login/index.vue index 12b9d94dee..5c68fc6808 100644 --- a/mobile/src/pages/login/index.vue +++ b/mobile/src/pages/login/index.vue @@ -69,7 +69,7 @@ title: this.$t('commons.loading') }); this.loadUiInfo() - this.loadPublicKey() + this.loadPublicKey() if (!this.autoLogin() && getToken() && getUserInfo()) { this.toMain() } @@ -154,8 +154,15 @@ const url = window.location.href const param = getUrlParams(url) if (param?.detoken) { + if(param.detoken.endsWith('#/')) + param.detoken = param.detoken.substr(0, param.detoken.length - 2) setToken(param.detoken) - this.toMain() + getInfo().then(res => { + setUserInfo(res.data) + const redirect = window.location.href.split('?')[0] + + window.location.href = redirect + }) return true } return false