From 8702af5db9f18e65a9a384164446b883ba93f11f Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 15 Feb 2023 16:12:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E3=80=81=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/datasource/ApiProvider.java | 17 +++++++++-------- .../functionStyle/MapMarkSelector.vue | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java index ddbcb5c9e0..913168cf15 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java @@ -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 fields, JSONObject item) { diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue index 8439fa2b92..0068368aa7 100644 --- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue +++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue @@ -393,7 +393,6 @@ export default { }, getItemTagType() { this.$refs['markForm'].validate((valid) => { - console.log(valid) }) } } From 2711415618407cf998f4af0fba92714aa236eb7f Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 15 Feb 2023 16:34:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0excel=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E9=A2=91=E7=B9=81=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=99=BB=E9=99=86=E8=BF=87=E6=9C=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/add/AddExcel.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue index cae74db8ae..fe20317a1f 100644 --- a/frontend/src/views/dataset/add/AddExcel.vue +++ b/frontend/src/views/dataset/add/AddExcel.vue @@ -237,8 +237,10 @@ import { $alert } from '@/utils/message' import store from '@/store' import msgCfm from '@/components/msgCfm/index' import cancelMix from './cancelMix' +import Config from "@/settings"; const token = getToken() +const RefreshTokenKey = Config.RefreshTokenKey export default { name: 'AddExcel', @@ -453,6 +455,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() {