From 1fcdaa4d0cc2346d346b302433d0e2517e6f2ca7 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 10 Jun 2021 18:16:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=E7=BC=96=E8=BE=91=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=88=A0=E9=99=A4=E9=93=BE=E6=8E=A5=E7=A7=BB=E5=88=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=88=E6=9D=83=EF=BC=8C=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V3__init_data.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/main/resources/db/migration/V3__init_data.sql b/backend/src/main/resources/db/migration/V3__init_data.sql index 4f66e5abac..48802608c0 100644 --- a/backend/src/main/resources/db/migration/V3__init_data.sql +++ b/backend/src/main/resources/db/migration/V3__init_data.sql @@ -14,8 +14,7 @@ INSERT INTO `sys_menu` VALUES (15, 2, 0, 2, '创建用户', NULL, NULL, 999, NUL INSERT INTO `sys_menu` VALUES (16, 2, 0, 2, '删除用户', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'user:del', NULL, NULL, 1614930903502, 1614930903502); INSERT INTO `sys_menu` VALUES (17, 2, 0, 2, '编辑用户', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'user:edit', NULL, NULL, 1614930935529, 1614930935529); INSERT INTO `sys_menu` VALUES (24, 34, 0, 2, '创建连接', NULL, NULL, 997, NULL, NULL, b'0', b'0', b'0', 'datasource:add', NULL, NULL, 1614931168956, 1615783705537); -INSERT INTO `sys_menu` VALUES (25, 34, 0, 2, '删除连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:del', NULL, NULL, 1614931205899, 1614931205899); -INSERT INTO `sys_menu` VALUES (26, 34, 0, 2, '编辑连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:edit', NULL, NULL, 1614931234105, 1614931234105); + INSERT INTO `sys_menu` VALUES (27, 34, 0, 2, '校验连接', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'datasource:validate', NULL, NULL, 1614931268578, 1614931268578); INSERT INTO `sys_menu` VALUES (28, 2, 0, 2, '修改密码', NULL, NULL, 999, NULL, NULL, b'0', b'0', b'0', 'user:editPwd', NULL, NULL, 1615275128262, 1615275128262); INSERT INTO `sys_menu` VALUES (30, 0, 0, 1, '仪表板', 'panel', 'panel/index', 1, NULL, '/panel', b'0', b'0', b'0', NULL, NULL, NULL, NULL, 1619081449067); From 09d60f7fd93d3d78baa6a5d186580e4d5ee70583 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 10 Jun 2021 18:20:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(frontend):=E5=88=86=E7=BB=84=E3=80=81?= =?UTF-8?q?=E5=9C=BA=E6=99=AFpid=E4=BF=AE=E6=94=B9=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartGroupService.java | 1 + .../java/io/dataease/service/dataset/DataSetGroupService.java | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java index 94792dec80..d71d72cd9e 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java @@ -82,6 +82,7 @@ public class ChartGroupService { public List tree(ChartGroupRequest chartGroup) { chartGroup.setLevel(null); + chartGroup.setPid(null); chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); List treeInfo = extChartGroupMapper.search(chartGroup); List result = TreeUtils.mergeTree(treeInfo); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java index 4b84680302..55ea4eb284 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java @@ -89,6 +89,7 @@ public class DataSetGroupService { public List tree(DataSetGroupRequest datasetGroup) { datasetGroup.setLevel(null); + datasetGroup.setPid(null); datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); List treeInfo = extDataSetGroupMapper.search(datasetGroup); List result = TreeUtils.mergeTree(treeInfo); From 1c7fde3f5ab18d6099f6f41802c1fe759c523a01 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 11 Jun 2021 09:51:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E3=80=90ID1004278=E3=80=91=E3=80=90?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=91=E6=97=B6=E9=97=B4=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6-=E6=97=A5=E6=9C=9F=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=A5=E6=9C=9F=E6=B2=A1=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/widget/DeWidget/DeDate.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue index bdc86c10cc..0c46b2c6da 100644 --- a/frontend/src/components/widget/DeWidget/DeDate.vue +++ b/frontend/src/components/widget/DeWidget/DeDate.vue @@ -35,6 +35,9 @@ export default { }, created() { this.options = this.element.options + if ((this.options.attrs.type === 'date' || this.options.attrs.type === 'daterange') && Array.isArray(this.options.value) && this.options.value.length === 0) { + this.options.value = null + } }, methods: { search() {