From 99bd4727edbb3d7f8a3a42a325bca47c4578de71 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 24 Jun 2021 18:21:59 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AFtree=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=9Bname=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/common/DatasetGroupSelector.vue | 39 ++++++++++++------- .../common/DatasetGroupSelectorTree.vue | 2 +- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index fc5a2ce319..d3174bfab1 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -9,27 +9,29 @@ - - - - - - - - - - - - - + + + + + + +
{ this.kettleRunning = res.data @@ -270,6 +280,7 @@ export default { nodeClick(data, node) { // if (data.type === 'scene') { + this.filterText = '' this.sceneMode = true this.currGroup = data this.tableTree() diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue index fc41c663f9..ad521c8736 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue @@ -113,7 +113,7 @@ import { isKettleRunning, post } from '@/api/dataset/dataset' export default { - name: 'DatasetGroupSelector', + name: 'DatasetGroupSelectorTree', props: { customType: { type: Array, From 256c0efe6baa70a3839e13bde26c2a5cc13840c5 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 24 Jun 2021 18:34:05 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E7=BB=87=E4=BC=9A=E9=97=AA=E7=8E=B0?= =?UTF-8?q?0(null)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/service/sys/SysUserService.java | 2 ++ frontend/src/layout/components/Topbar.vue | 2 +- frontend/src/views/link/pwd/index.vue | 3 ++- frontend/src/views/system/user/form.vue | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java index d5a067fbb1..740e20946e 100644 --- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -30,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -117,6 +118,7 @@ public class SysUserService { user.setUpdateTime(now); deleteUserRoles(user.getUserId());//先删除用户角色关联 saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联 + if (ObjectUtils.isEmpty(user.getDeptId())) user.setDeptId(0L); return sysUserMapper.updateByPrimaryKeySelective(user); } diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue index 59a09def0b..c7ef78be59 100644 --- a/frontend/src/layout/components/Topbar.vue +++ b/frontend/src/layout/components/Topbar.vue @@ -106,7 +106,7 @@ export default { const { meta, path } = route // if set path, the sidebar will highlight the path you set if (meta.activeMenu) { - return meta.activeMenu + // return meta.activeMenu } // 如果是首页，首页高亮 if (path === '/panel') { diff --git a/frontend/src/views/link/pwd/index.vue b/frontend/src/views/link/pwd/index.vue index 9ce3dc973e..50fdbbe94e 100644 --- a/frontend/src/views/link/pwd/index.vue +++ b/frontend/src/views/link/pwd/index.vue @@ -5,7 +5,8 @@
- {{ $t('pblink.key_pwd') }} + {{ $t('pblink.key_pwd') }} +
diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 113cb40964..ba5309f28b 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -288,7 +288,7 @@ export default { save() { this.$refs.createUserForm.validate(valid => { if (valid) { - !this.form.deptId && (this.form.deptId = 0) + // !this.form.deptId && (this.form.deptId = 0) const method = this.formType === 'add' ? addUser : editUser method(this.form).then(res => { this.$success(this.$t('commons.save_success')) From 898062ae9b2518e1e4a6e7c937155a698e0dec97 Mon Sep 17 00:00:00 2001 From: junjie Date: Thu, 24 Jun 2021 18:53:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AFtree=E6=90=9C?= =?UTF-8?q?=E7=B4=A2,=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/common/DatasetGroupSelector.vue | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue index d3174bfab1..8e0bf542e0 100644 --- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue +++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue @@ -78,30 +78,35 @@ - - - - - - - - + + +
+ + + + + + + + + + + + + + {{ data.name }} + - - - - - {{ data.name }} - - - + +
+ From f9d66b7774ce37627fc23d353e681d0c9eed3c32 Mon Sep 17 00:00:00 2001 From: maninhill <41712985+maninhill@users.noreply.github.com> Date: Thu, 24 Jun 2021 19:47:55 +0800 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 448119d367..5a79a2fe88 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ curl -sSL https://github.com/dataease/dataease/releases/latest/download/quick_st ``` - [在线文档](https://dataease.io/docs/) -- [演示视频](https://dataease.oss-cn-hangzhou.aliyuncs.com/video/de-v1-demo.mp4) +- [演示视频](https://www.bilibili.com/video/BV1UB4y1K7jA) ## 微信群 From 1de011a9b2c1542ec1c1df5e8717563d04ca00cf Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Thu, 24 Jun 2021 21:43:27 +0800 Subject: [PATCH 5/9] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a79a2fe88..19566bd619 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,9 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 ## 在线体验 -- 环境地址： +- 环境地址： - 用户名：demo -- 密码：P@ssw0rd123.. +- 密码：dataease ## 快速开始 From 9cfbfd53364c1dc2101509020462e72c72589840 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Thu, 24 Jun 2021 21:58:52 +0800 Subject: [PATCH 6/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19566bd619..26c7b7aec5 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ curl -sSL https://github.com/dataease/dataease/releases/latest/download/quick_st ## 微信群 -![wechat-group](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/wechat-group.png) + ## 技术栈 From 65361fb50d33b126d39181b2fe9c2a107aac6d0d Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Fri, 25 Jun 2021 11:28:13 +0800 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26c7b7aec5..56d21eee9f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 ## 在线体验 -- 环境地址： +- 环境地址： - 用户名：demo - 密码：dataease From 47600403a8ce465741abf5ab225c67d336ac2200 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Fri, 25 Jun 2021 12:44:05 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feat:=20=E5=8F=96=E6=8E=89sqlserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/datasource/form.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue index b191e1e9fb..71b260931e 100644 --- a/frontend/src/views/system/datasource/form.vue +++ b/frontend/src/views/system/datasource/form.vue @@ -90,8 +90,7 @@ export default { 'configuration.host': [{ required: true, message: this.$t('datasource.please_input_host'), trigger: 'change' }], 'configuration.port': [{ required: true, message: this.$t('datasource.please_input_port'), trigger: 'change' }] }, - allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' }, - { name: 'sqlServer', label: 'SQL Server', type: 'jdbc' }], + allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' }], canEdit: false } }, From b717b406b2d93da5e11c866dc892e0a3149cd665 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 25 Jun 2021 14:05:36 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E7=9B=98=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E5=85=AC=E5=85=B1=E8=BF=9E=E6=8E=A5=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=B8=BAlocalhost=EF=BC=8C=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/panel/PanelLinkService.java | 3 +-- frontend/src/views/link/generate/index.vue | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java index 1d3cca44df..53109c5b2d 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java @@ -24,8 +24,7 @@ import java.util.Map; @Service public class PanelLinkService { - @Value("${public-link-url:http://localhost:9528/link.html?link=}") - private String baseUrl; + private static final String baseUrl = "/link.html?link="; @Value("${public-link-salt:DataEaseLinkSalt}") private String salt; diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue index 27de4c9cdf..83a53eb9cd 100644 --- a/frontend/src/views/link/generate/index.vue +++ b/frontend/src/views/link/generate/index.vue @@ -66,6 +66,11 @@ export default { defaultForm: { enablePwd: false, pwd: null, uri: null } } }, + computed: { + origin() { + return window.location.origin + } + }, created() { this.form = this.defaultForm this.currentGenerate() @@ -76,7 +81,7 @@ export default { const { valid, enablePwd, pwd, uri } = res.data this.valid = valid this.form.enablePwd = enablePwd - this.form.uri = uri + this.form.uri = uri ? (this.origin + uri) : uri // 返回的密码是共钥加密后的 所以展示需要私钥解密一波 pwd && (this.form.pwd = decrypt(pwd)) })