From 678581d484d0f0f51333d77cdbf0a48976be22fb Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 30 Dec 2021 18:31:57 +0800 Subject: [PATCH 1/9] =?UTF-8?q?refactor:=20=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8E=86=E5=8F=B2=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index c03ed6cc32..a69a316336 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -315,7 +315,7 @@ export default { this.refId = uuid.v1 if (this.element && this.element.propValue && this.element.propValue.viewId) { const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value && !(item.options.value instanceof Object) || (item.options.attrs && item.options.attrs.default && item.options.attrs.default.isDynamic)) - hasFilter || this.getData(this.element.propValue.viewId, false) + if (hasFilter || this.filters.length > 0) { this.getData(this.element.propValue.viewId, false) } } }, methods: { From 34455d7ef2128c4b54011a6af7d067fde8afeba4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 30 Dec 2021 19:04:23 +0800 Subject: [PATCH 2/9] =?UTF-8?q?refactor:=20=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E9=80=82=E9=85=8D=E5=8E=86=E5=8F=B2=E8=BF=87=E6=BB=A4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/custom-component/UserView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index a69a316336..65e4160321 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -315,7 +315,7 @@ export default { this.refId = uuid.v1 if (this.element && this.element.propValue && this.element.propValue.viewId) { const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value && !(item.options.value instanceof Object) || (item.options.attrs && item.options.attrs.default && item.options.attrs.default.isDynamic)) - if (hasFilter || this.filters.length > 0) { this.getData(this.element.propValue.viewId, false) } + if (!hasFilter || this.filters.length > 0) { this.getData(this.element.propValue.viewId, false) } } }, methods: { From c43fd82ba1c3ebb5df0991ede88ac995b4057dc0 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 30 Dec 2021 19:31:28 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/GrantAuth/shareTree.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue index e75a259064..d892a044a8 100644 --- a/frontend/src/views/panel/GrantAuth/shareTree.vue +++ b/frontend/src/views/panel/GrantAuth/shareTree.vue @@ -3,7 +3,7 @@ {{ $t('panel.share_in') }}
- + @@ -20,7 +20,7 @@ {{ $t('panel.share_out') }}
- + @@ -110,6 +110,7 @@ export default { this.$store.dispatch('panel/setPanelInfo', data) bus.$emit('set-panel-show-type', 1) }) + this.$refs['botTree'].setCurrentKey(null) }, viewMyShare(data) { get('panel/group/findOne/' + data.id).then(response => { @@ -119,6 +120,7 @@ export default { this.$store.dispatch('panel/setPanelInfo', data) bus.$emit('set-panel-show-type', 2) }) + this.$refs['topTree'].setCurrentKey(null) }, resetID(data) { if (data) { From 0c8d930ee5fc31e12d1059679ac73ce733adb1e0 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Thu, 30 Dec 2021 20:30:31 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 41d3fb7329..363a93bd7f 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -1466,11 +1466,11 @@ export default { }).catch(err => { this.resetView() this.resetDrill() - this.httpRequest.status = err.response.data.success - this.httpRequest.msg = err.response.data.message this.$nextTick(() => { this.getChart(id) }) + this.httpRequest.status = err.response.data.success + this.httpRequest.msg = err.response.data.message return true }) } else { From 7812d73545fa490d284c0ea10ad2f277a68e5b97 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Thu, 30 Dec 2021 20:31:01 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dataset/DataSetTableFieldsService.java | 8 ++++++++ backend/src/main/resources/i18n/messages_en_US.properties | 3 ++- backend/src/main/resources/i18n/messages_zh_CN.properties | 3 ++- backend/src/main/resources/i18n/messages_zh_TW.properties | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java index 7e768f3a0e..5eddd4eb2e 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java @@ -3,7 +3,9 @@ package io.dataease.service.dataset; import io.dataease.base.domain.DatasetTableField; import io.dataease.base.domain.DatasetTableFieldExample; import io.dataease.base.mapper.DatasetTableFieldMapper; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.DorisTableUtils; +import io.dataease.i18n.Translator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -30,6 +32,12 @@ public class DataSetTableFieldsService { } public DatasetTableField save(DatasetTableField datasetTableField) { + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andNameEqualTo(datasetTableField.getName()).andTableIdEqualTo(datasetTableField.getTableId()); + List datasetTableFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + if (CollectionUtils.isNotEmpty(datasetTableFields)) { + DEException.throwException(Translator.get("i18n_field_name_repeat")); + } if (StringUtils.isEmpty(datasetTableField.getId())) { datasetTableField.setId(UUID.randomUUID().toString()); // 若dataeasename为空，则用MD5(id)作为dataeasename diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index bf8b774aba..a05de81cb2 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -297,4 +297,5 @@ i18n_invalid_ds=Invalid Datasource 任务管理=Task Manager 数据同步=Data Sync 定时报告=Regular report -i18n_rp_exist=Row permission of the same type already exists \ No newline at end of file +i18n_rp_exist=Row permission of the same type already exists +i18n_field_name_repeat=Field name can't repeat diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 643108af35..701e45def7 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -296,4 +296,5 @@ i18n_invalid_ds=无效数据源 任务管理=任务管理 数据同步=数据同步 定时报告=定时报告 -i18n_rp_exist=已有同类型的行权限存在 \ No newline at end of file +i18n_rp_exist=已有同类型的行权限存在 +i18n_field_name_repeat=字段名不能重复 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index ace5c7bf60..cb4a7a916d 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -299,4 +299,5 @@ i18n_invalid_ds=無效數據源 任务管理=任務管理 数据同步=數據同步 定时报告=定時報告 -i18n_rp_exist=已有同類型餓行權限存在 \ No newline at end of file +i18n_rp_exist=已有同類型餓行權限存在 +i18n_field_name_repeat=字段名不能重復 From a17e55c2d7dae6825f5d4db73157ed3305099bb0 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Thu, 30 Dec 2021 20:55:53 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/data/FieldEdit.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue index 63faa3b88b..e74c771470 100644 --- a/frontend/src/views/dataset/data/FieldEdit.vue +++ b/frontend/src/views/dataset/data/FieldEdit.vue @@ -347,6 +347,8 @@ export default { post('/dataset/field/save', item).then(response => { this.initField() + }).catch(res => { + this.initField() }) }, From 1eb4dc6e01f2bb7be50d7f9c94515d8c40250b07 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Fri, 31 Dec 2021 00:21:01 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/DataSetTableFieldController.java | 9 +++++++- .../dataset/DataSetTableFieldsService.java | 21 +++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index 7ac5c1e2ad..4583380c62 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -5,13 +5,19 @@ import com.auth0.jwt.interfaces.DecodedJWT; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.filter.F2CLinkFilter; import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.mapper.DatasetTableFieldMapper; +import io.dataease.commons.exception.DEException; import io.dataease.controller.request.dataset.MultFieldValuesRequest; import io.dataease.controller.response.DatasetTableField4Type; +import io.dataease.i18n.Translator; import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetTableFieldsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -73,6 +79,7 @@ public class DataSetTableFieldController { @ApiOperation("保存") @PostMapping("save") public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { + dataSetTableFieldsService.checkFieldName(datasetTableField); return dataSetTableFieldsService.save(datasetTableField); } @@ -85,7 +92,7 @@ public class DataSetTableFieldController { @ApiOperation("多字段值枚举") @PostMapping("linkMultFieldValues") public List linkMultFieldValues(@RequestBody MultFieldValuesRequest multFieldValuesRequest) throws Exception { - HttpServletRequest request =((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String linkToken = request.getHeader(F2CLinkFilter.LINK_TOKEN_KEY); DecodedJWT jwt = JWT.decode(linkToken); Long userId = jwt.getClaim("userId").asLong(); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java index 5eddd4eb2e..9b5c480810 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java @@ -32,12 +32,6 @@ public class DataSetTableFieldsService { } public DatasetTableField save(DatasetTableField datasetTableField) { - DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); - datasetTableFieldExample.createCriteria().andNameEqualTo(datasetTableField.getName()).andTableIdEqualTo(datasetTableField.getTableId()); - List datasetTableFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); - if (CollectionUtils.isNotEmpty(datasetTableFields)) { - DEException.throwException(Translator.get("i18n_field_name_repeat")); - } if (StringUtils.isEmpty(datasetTableField.getId())) { datasetTableField.setId(UUID.randomUUID().toString()); // 若dataeasename为空，则用MD5(id)作为dataeasename @@ -54,6 +48,21 @@ public class DataSetTableFieldsService { return datasetTableField; } + public void checkFieldName(DatasetTableField datasetTableField) { + if (StringUtils.isNotEmpty(datasetTableField.getName()) && StringUtils.isNotEmpty(datasetTableField.getTableId())) { + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + DatasetTableFieldExample.Criteria criteria = datasetTableFieldExample.createCriteria(); + criteria.andNameEqualTo(datasetTableField.getName()).andTableIdEqualTo(datasetTableField.getTableId()); + if (StringUtils.isNotEmpty(datasetTableField.getId())) { + criteria.andIdNotEqualTo(datasetTableField.getId()); + } + List datasetTableFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + if (CollectionUtils.isNotEmpty(datasetTableFields)) { + DEException.throwException(Translator.get("i18n_field_name_repeat")); + } + } + } + public List list(DatasetTableField datasetTableField) { DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); DatasetTableFieldExample.Criteria criteria = datasetTableFieldExample.createCriteria(); From fcbe38d04000449d219c9daaee6e574949231a79 Mon Sep 17 00:00:00 2001 From: xiajunjie <752696511@qq.com> Date: Fri, 31 Dec 2021 00:22:07 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DataSetTableFieldController.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index 4583380c62..e10f7b84c7 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -5,19 +5,13 @@ import com.auth0.jwt.interfaces.DecodedJWT; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.filter.F2CLinkFilter; import io.dataease.base.domain.DatasetTableField; -import io.dataease.base.domain.DatasetTableFieldExample; -import io.dataease.base.mapper.DatasetTableFieldMapper; -import io.dataease.commons.exception.DEException; import io.dataease.controller.request.dataset.MultFieldValuesRequest; import io.dataease.controller.response.DatasetTableField4Type; -import io.dataease.i18n.Translator; import io.dataease.service.dataset.DataSetFieldService; import io.dataease.service.dataset.DataSetTableFieldsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; From 570143769887acf2010f99277970bcead8dbc659 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 31 Dec 2021 10:29:26 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/DeWidget/DeSelectGrid.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue index 5b4e518617..0d927843f5 100644 --- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue +++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue @@ -17,13 +17,13 @@ {{ $t('commons.all') }} - {{ item.id }} + {{ item.id }}
- + {{ item.id }} @@ -36,8 +36,8 @@