dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4573 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-02-20 14:12:32 +08:00 committed by GitHub
commit bcc71b4f42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
View File

@ -359,8 +359,8 @@ public class ExcelXlsxReader extends DefaultHandler {
formatIndex = style.getDataFormat(); formatIndex = style.getDataFormat();
formatString = style.getDataFormatString(); formatString = style.getDataFormatString();
short format = this.formatIndex; 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) if ((14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
|| (59 < format && format <= 76) || (175 < format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期 || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format)) { // 日期
isDateFormat = true; isDateFormat = true;
} }

3
backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
View File

@ -916,6 +916,9 @@ public class OracleQueryProvider extends QueryProvider {
continue; continue;
} }
String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName()); 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()); String fieldAlias = String.format(OracleConstants.KEYWORD_TABLE, x.getOriginName());
xFields.add(getXFields(x, originField, fieldAlias)); xFields.add(getXFields(x, originField, fieldAlias));
} }

18
backend/src/main/resources/ehcache/ehcache.xml
View File

@ -273,23 +273,13 @@
<cache <cache
name="sys_token_store" name="sys_token_store"
eternal="true" eternal="true"
maxElementsInMemory="100" maxElementsInMemory="1"
maxElementsOnDisk="3000" maxElementsOnDisk="0"
overflowToDisk="true" overflowToDisk="true"
diskPersistent="false" diskPersistent="true"
/> />
<cache
name="sys_token_store_delay"
eternal="false"
maxElementsInMemory="100"
maxElementsOnDisk="3000"
overflowToDisk="true"
diskPersistent="false"
timeToIdleSeconds="3"
timeToLiveSeconds="5"
memoryStoreEvictionPolicy="LRU"
/>
</ehcache> </ehcache>

2
mobile/src/locale/zh-Hans.json
View File

@ -1,5 +1,5 @@
{ {
"app.name": "Hello uni-app", "app.name": "DataEase",
"navigate.menuHome": "首页", "navigate.menuHome": "首页",
"navigate.menuDir": "目录", "navigate.menuDir": "目录",

2
mobile/src/locale/zh-Hant.json
View File

@ -1,5 +1,5 @@
{ {
"app.name": "Hello uni-app", "app.name": "DataEase",
"navigate.menuHome": "首頁", "navigate.menuHome": "首頁",
"navigate.menuDir": "目錄", "navigate.menuDir": "目錄",
"navigate.menuMe": "我的", "navigate.menuMe": "我的",

2
mobile/src/pages.json
View File

@ -4,7 +4,7 @@
{ {
"path": "pages/login/index", "path": "pages/login/index",
"style": { "style": {
"navigationBarTitleText": "%navigate.login%", "navigationBarTitleText": "%app.name%",
"app-plus": { "app-plus": {
"titleNView": false "titleNView": false
} }

11
mobile/src/pages/login/index.vue
View File

@ -69,7 +69,7 @@
title: this.$t('commons.loading') title: this.$t('commons.loading')
}); });
this.loadUiInfo() this.loadUiInfo()
this.loadPublicKey() this.loadPublicKey()
if (!this.autoLogin() && getToken() && getUserInfo()) { if (!this.autoLogin() && getToken() && getUserInfo()) {
this.toMain() this.toMain()
} }
@ -154,8 +154,15 @@
const url = window.location.href const url = window.location.href
const param = getUrlParams(url) const param = getUrlParams(url)
if (param?.detoken) { if (param?.detoken) {
if(param.detoken.endsWith('#/'))
param.detoken = param.detoken.substr(0, param.detoken.length - 2)
setToken(param.detoken) 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 true
} }
return false return false