This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.1.2 by this push:
new 01d5e67fe fix #2145 (#2176)
01d5e67fe is described below
commit 01d5e67fe0cdd9606c9ef9c3db81ff55595e419a
Author: [email protected] <[email protected]>
AuthorDate: Thu May 26 16:07:05 2022 +0800
fix #2145 (#2176)
---
.../apps/URM/module/functionManagement/index.vue | 21 ++++++++++++++-------
web/src/apps/URM/module/udfManagement/index.vue | 20 +++++++++++++-------
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/web/src/apps/URM/module/functionManagement/index.vue
b/web/src/apps/URM/module/functionManagement/index.vue
index 9879d5df2..71afb0fe5 100644
--- a/web/src/apps/URM/module/functionManagement/index.vue
+++ b/web/src/apps/URM/module/functionManagement/index.vue
@@ -105,6 +105,7 @@
>
<span>移交给：</span>
<Select ref="userSelect" v-model="handleUser" filterable
+ v-if=allUsers.length
:remoteMethod="filterSelect"
@on-query-change="queryChange"
placeholder="请输入用户名" style="width:200px;">
@@ -115,6 +116,7 @@
:key="item"
/>
</Select>
+ <Input v-if=!allUsers.length v-model="handleUser" placeholder="请输入用户名"
style="width: 250px" />
<div slot="footer">
<Button @click="changUserModal=false">取消</Button>
<Button type="primary" :disabled="!this.handleUser"
@click="changeUser">确定</Button>
@@ -193,7 +195,8 @@ export default {
vlistModal: false,
sharedUsers: '',
handleRow: {},
- udfUsers: []
+ udfUsers: [],
+ allUsers: []
}
},
created() {
@@ -208,11 +211,6 @@ export default {
// this.getCreators = ['all', ...res.engineType]
// })
// 所有用户列表，移交时选择用户
- api.fetch('/dss/framework/workspace/listAllUsers', 'get').then(res => {
- let allUsers = (res.users || []).map(it => it.username)
- this.udfUsers = allUsers.slice(0, 150)
- this.allUsers = allUsers
- })
},
mounted() {
this.init()
@@ -616,6 +614,15 @@ export default {
this.handleUser = ''
this.changUserModal = true
this.handleRow = args.row
+
+ api.fetch('/dss/framework/workspace/listAllUsers', 'get').then(res => {
+ let allUsers = (res.users || []).map(it => it.username)
+ this.udfUsers = allUsers.slice(0, 150)
+ this.allUsers = allUsers
+ }).catch(()=>{
+ this.udfUsers = [];
+ this.allUsers = [];
+ })
} else {
const params = {
udfId: this.handleRow.id,
@@ -660,7 +667,7 @@ export default {
},
changUserModalChange(v) {
if (v) {
- this.$refs.userSelect.setQuery(null);
+ this.$refs.userSelect && this.$refs.userSelect.setQuery(null);
this.handleUser = ''
let options = this.allUsers.slice(0, 150)
this.udfUsers = options
diff --git a/web/src/apps/URM/module/udfManagement/index.vue
b/web/src/apps/URM/module/udfManagement/index.vue
index d9f7ebf81..c51a65f84 100644
--- a/web/src/apps/URM/module/udfManagement/index.vue
+++ b/web/src/apps/URM/module/udfManagement/index.vue
@@ -103,6 +103,7 @@
>
<span>移交给：</span>
<Select ref="userSelect" v-model="handleUser" filterable
+ v-if=allUsers.length
:remoteMethod="filterSelectTransUser"
@on-query-change="queryChange"
placeholder="请输入用户名" style="width:200px;">
@@ -113,6 +114,7 @@
:key="item"
/>
</Select>
+ <Input v-if=!allUsers.length v-model="handleUser" placeholder="请输入用户名"
style="width: 300px" />
<div slot="footer">
<Button @click="changUserModal=false">取消</Button>
<Button type="primary" :disabled="!this.handleUser"
@click="changeUser">确定</Button>
@@ -192,7 +194,8 @@ export default {
sharedUsers: '',
handleRow: {},
udfUsers: [],
- transUsers: []
+ transUsers: [],
+ allUsers: []
}
},
created() {
@@ -207,11 +210,6 @@ export default {
// this.getCreators = ['all', ...res.engineType]
// })
// 所有用户列表，移交时选择用户
- api.fetch('/dss/framework/workspace/listAllUsers', 'get').then(res => {
- let allUsers = (res.users || []).map(it => it.username)
- this.udfUsers = allUsers.slice(0, 150)
- this.allUsers = allUsers
- })
},
mounted() {
this.init()
@@ -611,6 +609,14 @@ export default {
this.handleUser = ''
this.changUserModal = true
this.handleRow = args.row
+ api.fetch('/dss/framework/workspace/listAllUsers', 'get').then(res => {
+ let allUsers = (res.users || []).map(it => it.username)
+ this.udfUsers = allUsers.slice(0, 150)
+ this.allUsers = allUsers
+ }).catch(()=>{
+ this.udfUsers = [];
+ this.allUsers = [];
+ })
} else {
const params = {
udfId: this.handleRow.id,
@@ -657,7 +663,7 @@ export default {
},
changUserModalChange(v) {
if (v) {
- this.$refs.userSelect.setQuery(null);
+ this.$refs.userSelect && this.$refs.userSelect.setQuery(null);
this.handleUser = ''
let options = this.allUsers.slice(0, 150)
this.transUsers = options
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
