From 661ce85bc7817ba7b78d3ca8cdf603db7ce1fa07 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Aug 2022 17:52:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20diros=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E6=8B=96=E5=85=A5=E6=A0=87=E8=AE=B0=E5=A4=A7=E5=B0=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/util/ChartDataBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index a58c9b0d27..4d79b53bbe 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -881,9 +881,9 @@ public class ChartDataBuild { // 上面乱序了 List fields = new ArrayList<>(); if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis")))fields.addAll(fieldMap.get("xAxis")); - if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis")))fields.addAll(fieldMap.get("yAxis")); if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis")))fields.addAll(fieldMap.get("labelAxis")); if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis")))fields.addAll(fieldMap.get("tooltipAxis")); + if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis")))fields.addAll(fieldMap.get("yAxis")); return transTableNormal(fields, view, data, desensitizationList); } From 8f2a3612e273d4ac8528bea927d1e88bd0523120 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Aug 2022 21:28:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8):=20=E9=A2=84=E8=A7=88=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=B2=A1=E6=9C=89=E7=BA=B5=E5=90=91=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/dataease/DeOutWidget.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index 1312f5078a..ce5e13a7a8 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -171,7 +171,7 @@ export default { From 2ecd78a933c0a2e851f0e083b75c9a26586fbd08 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Aug 2022 13:30:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/system/EmailService.java | 6 +++-- .../src/components/DeViewSelect/index.vue | 25 ++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/system/EmailService.java b/backend/src/main/java/io/dataease/service/system/EmailService.java index 483ddd4056..a8880db29a 100644 --- a/backend/src/main/java/io/dataease/service/system/EmailService.java +++ b/backend/src/main/java/io/dataease/service/system/EmailService.java @@ -132,15 +132,16 @@ public class EmailService { } private MimeMultipart addFiles(MimeMultipart multipart, List files) throws Exception{ + for (int i = 0; i < files.size(); i++) { File file = files.get(i); MimeBodyPart attach = new MimeBodyPart(); FileDataSource fileDataSource = new FileDataSource(file); attach.setDataHandler(new DataHandler(fileDataSource)); - attach.setFileName(MimeUtility.encodeText(file.getName())); + attach.setFileName(MimeUtility.encodeText(file.getName(), "gb2312", null)); multipart.addBodyPart(attach); } - System.getProperties().setProperty("mail.mime.splitlongparameters", "false"); + multipart.setSubType("related"); return multipart; } @@ -170,6 +171,7 @@ public class EmailService { } public MailInfo mailInfo() { + System.getProperties().setProperty("mail.mime.splitlongparameters", "false"); String type = ParamConstants.Classify.MAIL.getValue(); List paramList = getParamList(type); MailInfo mailInfo = new MailInfo(); diff --git a/frontend/src/components/DeViewSelect/index.vue b/frontend/src/components/DeViewSelect/index.vue index e532e9a95e..c7b2949346 100644 --- a/frontend/src/components/DeViewSelect/index.vue +++ b/frontend/src/components/DeViewSelect/index.vue @@ -19,16 +19,13 @@ /> - - - -
+
- +
选择视图 - {{ $t('commons.confirm') }} + {{ $t('commons.confirm') }} {{ $t('commons.cancel') }}
@@ -124,11 +121,9 @@ export default { }, mounted() { this._updateH() - }, beforeDestroy() { this._selectClearFun() - }, created() { this.loadView() @@ -168,11 +163,10 @@ export default { }, _updateH() { this.$nextTick(() => { - if(this.$refs.contaninerDiv) { + if (this.$refs.contaninerDiv) { this.width = this.$refs.contaninerDiv.clientWidth this.panelHeight = this.width * 9 / 16 } - }) }, _popoverShowFun(val) { @@ -180,10 +174,9 @@ export default { this._updateH() this.$emit('onFoucs') }, - - + _selectRemoveTag(viewId) { - this.selectedViews.forEach(item => { + this.$store.getters.panelViews[this.panelId].forEach(item => { if (item === viewId) { this.$store.dispatch('task/delView', { 'panelId': this.panelId, 'viewId': item }) } @@ -200,13 +193,17 @@ export default { }, openDialog() { if (this.value && this.value.length) { - this.idsBeforeOpen = JSON.parse(JSON.stringify(this.value)) + this.idsBeforeOpen = JSON.parse(JSON.stringify(this.value)) } this.dialogShow = true }, closeDialog() { this.dialogShow = false }, + sureDialog() { + this.innerValues = JSON.parse(JSON.stringify(this.$store.getters.panelViews[this.panelId])) + this.closeDialog() + }, cancelDialog() { this.innerValues = JSON.parse(JSON.stringify(this.idsBeforeOpen)) const viewIds = JSON.parse(JSON.stringify(this.innerValues)) From 491c21599ed51ee53d1b0533d58ed666076041f9 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 3 Aug 2022 13:46:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?style:=20=E6=89=8B=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=A7=86=E5=9B=BE=E6=98=8E=E7=BB=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/ComponentWrapper.vue | 2 +- .../src/components/canvas/components/Editor/EditBar.vue | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 1e2092f4e7..d45db98d6a 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -5,7 +5,7 @@ @click="handleClick" @mousedown="elementMouseDown" > - +
- + @@ -58,6 +58,10 @@ export default { components: { SettingMenu, LinkageField }, props: { + terminal: { + type: String, + default: 'pc' + }, sourceElement: { type: Object, required: true