From 4cb9e722a59e729421627292c1205338f875dd84 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Dec 2021 17:03:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E4=BB=AA=E8=A1=A8?= =?UTF-8?q?=E6=9D=BF=E5=88=B7=E6=96=B0=E6=B5=8F=E8=A7=88=E5=99=A8=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E4=B8=8D=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/PanelList.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 1af58c1307..35a1a27b6e 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -392,6 +392,7 @@ export default { this.editPanel.visible = false if (panelInfo) { this.defaultTree() + this.tree() // 默认展开 同时点击 新增的节点 if (panelInfo && panelInfo.panelType === 'self' && this.lastActiveNodeData.id) { if (this.editPanel.optType === 'rename') { @@ -409,8 +410,6 @@ export default { this.lastActiveNode.expanded = true } this.activeNodeAndClick(panelInfo) - } else { - this.tree() } } }, From 892a967d24a3a780eb2310b1467a44c3f1a28bf4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 28 Dec 2021 17:52:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=8C=E7=9B=B8=E5=90=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=92=8C=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E5=85=81=E8=AE=B8=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/panel/PanelGroupService.java | 16 ++++++++-------- frontend/src/views/panel/list/PanelList.vue | 9 ++++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java index 26e97f8a72..b063082e99 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java @@ -87,7 +87,7 @@ public class PanelGroupService { String panelId = request.getId(); if (StringUtils.isEmpty(panelId)) { // 新建 - checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, null); + checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, null,request.getNodeType()); panelId = UUID.randomUUID().toString(); request.setId(panelId); request.setCreateTime(System.currentTimeMillis()); @@ -105,7 +105,7 @@ public class PanelGroupService { newDefaultPanel.setLevel(0); newDefaultPanel.setSource(request.getId()); newDefaultPanel.setCreateBy(AuthUtils.getUser().getUsername()); - checkPanelName(newDefaultPanel.getName(), newDefaultPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, newDefaultPanel.getId()); + checkPanelName(newDefaultPanel.getName(), newDefaultPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, newDefaultPanel.getId(),newDefaultPanel.getNodeType()); panelGroupMapper.insertSelective(newDefaultPanel); } else if ("copy".equals(request.getOptType())) { panelId = UUID.randomUUID().toString(); @@ -113,7 +113,7 @@ public class PanelGroupService { PanelGroupWithBLOBs newPanel = panelGroupMapper.selectByPrimaryKey(request.getId()); // 插入校验 if (StringUtils.isNotEmpty(request.getName())) { - checkPanelName(request.getName(), newPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, request.getId()); + checkPanelName(request.getName(), newPanel.getPid(), PanelConstants.OPT_TYPE_INSERT, request.getId(),newPanel.getNodeType()); } newPanel.setName(request.getName()); newPanel.setId(panelId); @@ -133,7 +133,7 @@ public class PanelGroupService { } // 移动校验 if (StringUtils.isNotEmpty(request.getName())) { - checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, request.getId()); + checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_INSERT, request.getId(),panelInfo.getNodeType()); } PanelGroupWithBLOBs record = new PanelGroupWithBLOBs(); record.setName(request.getName()); @@ -144,7 +144,7 @@ public class PanelGroupService { } else { // 更新 if (StringUtils.isNotEmpty(request.getName())) { - checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_UPDATE, request.getId()); + checkPanelName(request.getName(), request.getPid(), PanelConstants.OPT_TYPE_UPDATE, request.getId(),request.getNodeType()); } panelGroupMapper.updateByPrimaryKeySelective(request); } @@ -161,12 +161,12 @@ public class PanelGroupService { } - private void checkPanelName(String name, String pid, String optType, String id) { + private void checkPanelName(String name, String pid, String optType, String id,String nodeType) { PanelGroupExample groupExample = new PanelGroupExample(); if (PanelConstants.OPT_TYPE_INSERT.equalsIgnoreCase(optType)) { - groupExample.createCriteria().andPidEqualTo(pid).andNameEqualTo(name); + groupExample.createCriteria().andPidEqualTo(pid).andNameEqualTo(name).andNodeTypeEqualTo(nodeType); } else if (PanelConstants.OPT_TYPE_UPDATE.equalsIgnoreCase(optType)) { - groupExample.createCriteria().andPidEqualTo(pid).andNameEqualTo(name).andIdNotEqualTo(id); + groupExample.createCriteria().andPidEqualTo(pid).andNameEqualTo(name).andIdNotEqualTo(id).andNodeTypeEqualTo(nodeType); } List checkResult = panelGroupMapper.selectByExample(groupExample); diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 35a1a27b6e..6f1f47b855 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -448,7 +448,8 @@ export default { panelInfo: { id: param.data.id, pid: param.data.pid, - name: param.data.name + name: param.data.name, + nodeType: param.type } } break @@ -459,7 +460,8 @@ export default { panelInfo: { id: param.data.id, name: param.data.name, - optType: 'toDefaultPanel' + optType: 'toDefaultPanel', + nodeType: param.type } } break @@ -471,7 +473,8 @@ export default { panelInfo: { id: param.data.id, name: param.data.name, - optType: 'copy' + optType: 'copy', + nodeType: param.type } } break From a39ed6a8c0a28679a01aad9012f7ef4f92402105 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 28 Dec 2021 18:09:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/UserView.vue | 6 ++++-- frontend/src/components/widget/DeWidget/DeSelectGrid.vue | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index a0b1ad9fe7..d4e5a700cf 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -236,7 +236,8 @@ export default { 'nowPanelJumpInfo', 'publicLinkStatus', 'previewCanvasScale', - 'mobileLayoutStatus' + 'mobileLayoutStatus', + 'componentData' ]) }, @@ -309,7 +310,8 @@ export default { created() { this.refId = uuid.v1 if (this.element && this.element.propValue && this.element.propValue.viewId) { - this.getData(this.element.propValue.viewId, false) + const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value) + hasFilter || this.getData(this.element.propValue.viewId, false) } }, methods: { diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue index b2d842e3b7..ed0b1fbb1e 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 }}