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

Merge pull request #4544 from dataease/pr@dev@pages

Browse Source 
Pr@dev@pages
This commit is contained in:
taojinlong 2023-02-15 16:48:41 +08:00 committed by GitHub
commit eebbb2195a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
View File

@ -336,14 +336,15 @@ public class ApiProvider extends Provider {
o.put("deType", 0);
o.put("extField", 0);
o.put("checked", false);
// for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
// if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
// o.put("checked", true);
// o.put("deExtractType", fieldDTO.getDeExtractType());
// o.put("name", fieldDTO.getName());
// }
// }
if (!apiDefinition.isUseJsonPath()) {
for (DatasetTableFieldDTO fieldDTO : apiDefinition.getFields()) {
if (StringUtils.isNotEmpty(o.getString("jsonPath")) && StringUtils.isNotEmpty(fieldDTO.getJsonPath()) && fieldDTO.getJsonPath().equals(o.getString("jsonPath"))) {
o.put("checked", true);
o.put("deExtractType", fieldDTO.getDeExtractType());
o.put("name", fieldDTO.getName());
}
}
}
}
static private boolean hasItem(ApiDefinition apiDefinition, List<JSONObject> fields, JSONObject item) {

1
frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
View File

@ -393,7 +393,6 @@ export default {
},
getItemTagType() {
this.$refs['markForm'].validate((valid) => {
console.log(valid)
})
}
}

8
frontend/src/views/dataset/add/AddExcel.vue
View File

@ -237,9 +237,11 @@ import { $alert } from '@/utils/message'
import store from '@/store'
import msgCfm from '@/components/msgCfm/index'
import cancelMix from './cancelMix'
import Config from "@/settings";
import { updateCacheTree } from '@/components/canvas/utils/utils'
const token = getToken()
const RefreshTokenKey = Config.RefreshTokenKey
export default {
name: 'AddExcel',
@ -454,6 +456,12 @@ export default {
this.$refs.tree.setCheckedKeys(this.defaultCheckedKeys)
})
this.fileList = fileList
if (response.headers[RefreshTokenKey]) {
const refreshToken = response.headers[RefreshTokenKey]
setToken(refreshToken)
store.dispatch('user/refreshToken', refreshToken)
}
},
save() {