+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.name }}
+
-
-
-
-
- {{ data.name }}
-
-
-
+
+
+
@@ -172,7 +179,8 @@ export default {
treeStyle: this.fixHeight ? {
height: '200px',
overflow: 'auto'
- } : {}
+ } : {},
+ filterText: ''
}
},
computed: {},
@@ -198,6 +206,9 @@ export default {
} else {
this.tableData = JSON.parse(JSON.stringify(this.tables))
}
+ },
+ filterText(val) {
+ this.$refs.tree.filter(val)
}
},
mounted() {
@@ -208,6 +219,10 @@ export default {
this.kettleState()
},
methods: {
+ filterNode(value, data) {
+ if (!value) return true
+ return data.name.indexOf(value) !== -1
+ },
kettleState() {
isKettleRunning(false).then(res => {
this.kettleRunning = res.data
@@ -270,6 +285,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,
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))
})
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 @@
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
}
},
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'))
## 技术栈
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/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/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index fc5a2ce319..8e0bf542e0 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -9,27 +9,29 @@