This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-resource-tree
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-resource-tree by this push:
new e2b1125 UDF changed to multiple choice (#2077)
e2b1125 is described below
commit e2b112574fd5dcc6d06522a74c353b576437d603
Author: lgcareer <[email protected]>
AuthorDate: Thu Mar 5 08:50:12 2020 +0800
UDF changed to multiple choice (#2077)
* Change crumb position
* UDF changed to multiple choice
---
.../src/js/conf/home/pages/security/pages/users/_source/list.vue | 4 ++--
dolphinscheduler-ui/src/js/module/components/transfer/resource.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 59d9199..303b1ad 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -247,8 +247,8 @@
udfTargetList.push(value)
}
})
- fileSourceList = fileSourceList.concat(fileTargetList)
- udfSourceList = udfSourceList.concat(udfTargetList)
+ fileSourceList = fileTargetList.concat(fileSourceList)
+ udfSourceList = udfTargetList.concat(udfSourceList)
fileTargetList = _.map(fileTargetList, v => {
return v.id
})
diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index 91bcbf5..97397c1 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -27,7 +27,7 @@
<treeselect v-show="checkedValue=='fileResource'"
v-model="selectFileSource" :multiple="true" :options="fileList"
:normalizer="normalizer" :placeholder="$t('Please select resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
- <treeselect v-show="checkedValue=='udfResource'"
v-model="selectUdfSource" :disable-branch-nodes="true" :options="udfList"
:normalizer="normalizer" :placeholder="$t('Please select resources')">
+ <treeselect v-show="checkedValue=='udfResource'"
v-model="selectUdfSource" :multiple="true" :options="udfList"
:normalizer="normalizer" :placeholder="$t('Please select resources')">
<div slot="value-label" slot-scope="{ node }">{{ node.raw.fullName
}}</div>
</treeselect>
<!-- <div class="select-list-box">
