From d74e006cee61ccf4f04deae7f2e612bcb1179704 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Aug 2022 13:52:18 +0800 Subject: [PATCH 1/8] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE):=20=E6=96=B0=E5=A2=9E-?= =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=8C=BA=E5=9F=9F=E4=B8=8B=E6=8B=89=E6=A0=91?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysParam/MapSetting/MapSettingRight.vue | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue index ad024cf0f5..041e8a78d7 100644 --- a/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue +++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingRight.vue @@ -1,22 +1,9 @@ @@ -345,5 +347,8 @@ export default { From 557b2f306f6b411383504ac16908b2553d5f9046 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 3 Aug 2022 13:59:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix(=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E7=B1=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/panel/PanelTemplateService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java index 3e9ffdbe02..26756ccad7 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java @@ -80,11 +80,14 @@ public class PanelTemplateService { exampleDelete.createCriteria().andPidEqualTo(request.getPid()).andNameEqualTo(request.getName()); panelTemplateMapper.deleteByExample(exampleDelete); } - //Store static resource into the server - staticResourceService.saveFilesToServe(request.getStaticResource()); - String snapshotName = "template-" + request.getId() + ".jpeg"; - staticResourceService.saveSingleFileToServe(snapshotName,request.getSnapshot().replace("data:image/jpeg;base64,","") ); - request.setSnapshot("/"+UPLOAD_URL_PREFIX+'/'+snapshotName); + if ("template".equals(request.getNodeType())) { + //Store static resource into the server + staticResourceService.saveFilesToServe(request.getStaticResource()); + String snapshotName = "template-" + request.getId() + ".jpeg"; + staticResourceService.saveSingleFileToServe(snapshotName, request.getSnapshot().replace("data:image/jpeg;base64,", "")); + request.setSnapshot("/" + UPLOAD_URL_PREFIX + '/' + snapshotName); + } + panelTemplateMapper.insert(request); } else { String nameCheckResult = this.nameCheck(CommonConstants.OPT_TYPE.UPDATE, request.getName(), request.getPid(), request.getId()); From df0ac137a3d2e50b9f6b7c3d0c2bd962ec29ca55 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Aug 2022 14:12:51 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E5=9C=B0=E5=9B=BE):?= =?UTF-8?q?=20=E5=8C=BA=E5=9F=9F=E6=98=A0=E5=B0=84=E7=BF=BB=E9=A1=B5?= =?UTF-8?q?=E5=90=8E=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/senior/MapMapping.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/chart/components/senior/MapMapping.vue b/frontend/src/views/chart/components/senior/MapMapping.vue index 3fb04c60c7..627918757d 100644 --- a/frontend/src/views/chart/components/senior/MapMapping.vue +++ b/frontend/src/views/chart/components/senior/MapMapping.vue @@ -123,6 +123,7 @@ export default { }, 'keyWord': { handler: function() { + this.currentPage = 1 this.buildGridList() } }, From 4662a2ea2ee28d8718fc52d1a5fdf04618074880 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 3 Aug 2022 14:19:05 +0800 Subject: [PATCH 4/8] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD=E5=8F=AA=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8C=89=E9=92=AE=EF=BC=8C=E5=A4=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=98=AF=E5=90=A6=E6=9C=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=86=8D=E8=BF=9B=E8=A1=8C=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/EditBar.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue index 206e4a9b65..d21a22cbf9 100644 --- a/frontend/src/components/canvas/components/Editor/EditBar.vue +++ b/frontend/src/components/canvas/components/Editor/EditBar.vue @@ -5,7 +5,7 @@ -
+
@@ -108,6 +108,16 @@ export default { mounted() { }, computed: { + curComponentTypes() { + const types = [] + this.componentData.forEach(component => { + types.push(component.type) + }) + return types + }, + showMultiplexingCheck() { + return this.element.type !== 'custom-button' || (this.element.type === 'custom-button' && !this.curComponentTypes.includes('custom-button')) + }, showEditPosition() { if (this.activeModel === 'edit' && !this.linkageAreaShow && !this.batchOptAreaShow) { const toRight = (this.canvasStyleData.width - this.element.style.left - this.element.style.width) * this.curCanvasScale.scalePointWidth From 6db6419c12f7d930c3f86f1b40f233e32b7aa2ed Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:05:05 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20input=20border=E8=89=B2=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2=E4=B8=BAcss=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 2d534cfe58..8b8c47ef42 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -719,8 +719,8 @@ export default { } .normal { - color: #1f2329; - border: 1px solid #bbbfc4; + color: var(----deTextPrimary, #1F2329); + border: 1px solid var(--deBorderBase, #BBBFC4); margin-left: 12px; } @@ -755,9 +755,6 @@ export default { .name-email-search { width: 240px; - ::v-deep input { - border-color: #bbbfc4; - } } .active-btn { From 7b1be5836d59ce0381798f156581a57d9a33d661 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 15:05:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20input=20border=E8=89=B2=E5=80=BC?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=9B=BF=E6=8D=A2=E4=B8=BAcss=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue index 2d534cfe58..8b8c47ef42 100644 --- a/frontend/src/views/system/user/index.vue +++ b/frontend/src/views/system/user/index.vue @@ -719,8 +719,8 @@ export default { } .normal { - color: #1f2329; - border: 1px solid #bbbfc4; + color: var(----deTextPrimary, #1F2329); + border: 1px solid var(--deBorderBase, #BBBFC4); margin-left: 12px; } @@ -755,9 +755,6 @@ export default { .name-email-search { width: 240px; - ::v-deep input { - border-color: #bbbfc4; - } } .active-btn { From fef0881b51ca1e6d09908489cae21f8b6615bcf4 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 3 Aug 2022 15:26:57 +0800 Subject: [PATCH 7/8] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=98=E9=87=8F=E6=94=AF=E6=8C=81?= =?UTF-8?q?=20between=20and?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 234ac51990..6c3b5e20b0 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2620,6 +2620,15 @@ public class DataSetTableService { } } + @Override + public void visit(Between between) { + if(hasVarible(between.getBetweenExpressionStart().toString()) || hasVarible(between.getBetweenExpressionEnd().toString())){ + getBuffer().append(SubstitutedSql); + }else { + getBuffer().append(between.getLeftExpression()).append(" BETWEEN ").append(between.getBetweenExpressionStart()).append(" AND ").append(between.getBetweenExpressionEnd()); + } + } + @Override public void visit(LikeExpression likeExpression) { if (hasVarible(likeExpression.toString())) { From 6087dcd92c5d7ba862f61ce998350c1d81da9556 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 3 Aug 2022 15:46:43 +0800 Subject: [PATCH 8/8] =?UTF-8?q?style(=E6=A8=A1=E6=9D=BF=E5=B8=82=E5=9C=BA)?= =?UTF-8?q?:=20=E6=A8=A1=E6=9D=BF=E5=AE=9E=E4=BE=8B=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E5=AE=BD=E9=AB=98=E6=AF=94=E4=BC=B8=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/TemplateMarketItem.vue | 16 +++++++++++----- .../src/views/panel/templateMarket/index.vue | 10 ++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue index a9d9d8ce9b..333334b857 100644 --- a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue +++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue @@ -25,6 +25,9 @@ export default { }, baseUrl: { type: String + }, + width: { + type: Number } }, data() { @@ -34,6 +37,8 @@ export default { computed: { classBackground() { return { + width: this.width + 'px', + height: this.width * 0.58 + 'px', background: `url(${this.thumbnailUrl}) no-repeat`, 'background-size': `100% 100%` } @@ -66,12 +71,12 @@ export default { .testcase-template { position: relative; display: inline-block; - margin: 24px 0 0 0; + margin: 0; box-shadow: 0 0 2px 0 rgba(31,31,31,0.15), 0 1px 2px 0 rgba(31,31,31,0.15); border: solid 2px #fff; box-sizing: border-box; border-radius: 4px; - height: 256px; + width: 100%; } .demonstration { @@ -87,8 +92,6 @@ export default { .template-img { background-size: 100% 100%; - height: 180px; - width: 318px; margin: 0 auto; border: solid 2px #fff; box-sizing: border-box; @@ -110,7 +113,10 @@ export default { position:absolute; bottom: 5px; left: 0px; - width: 318px; + width: 100%; } + .bottom-area{ + height: 75px; + } diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue index c026bf1b49..6e34c31f9f 100644 --- a/frontend/src/views/panel/templateMarket/index.vue +++ b/frontend/src/views/panel/templateMarket/index.vue @@ -22,12 +22,13 @@ v-for="(templateItem) in currentMarketTemplateShowList" v-show="templateItem.showFlag" :key="templateItem.id" - style="text-align: center" + style="text-align: center;padding: 24px 12px 0 12px" :style="{width: templateSpan}" > @@ -85,7 +86,6 @@ import { groupTree, panelSave } from '@/api/panel/panel' import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel' import MarketPreview from '@/views/panel/templateMarket/component/MarketPreview' import elementResizeDetectorMaker from 'element-resize-detector' -import { PHONE_REGEX } from '@/utils/validate' export default { name: 'TemplateMarket', @@ -94,6 +94,7 @@ export default { return { hasResult: true, templateMiniWidth: 330, + templateCurWidth: 310, templateSpan: '25%', previewModel: false, previewVisible: false, @@ -155,8 +156,9 @@ export default { // 监听div变动事件 erd.listenTo(templateMainDom, element => { _this.$nextTick(() => { + const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth) _this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%' - console.log('templateSpan=' + _this.templateSpan) + _this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 32 }) }) }, @@ -260,7 +262,7 @@ export default { .template-main{ text-align: center; border-radius: 4px; - padding-bottom: 24px; + padding: 0 12px 24px 12px; height: calc(100vh - 190px)!important; overflow-x: hidden; overflow-y: auto;