Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unfiltered jar files in resource directory and UDF upload resource parameters #3008

Merged
merged 4 commits into from
Jun 17, 2020
Merged

Fix unfiltered jar files in resource directory and UDF upload resource parameters #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf94b83
Change email to default
break60 Jun 15, 2020
95576a7
Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolph…
break60 Jun 16, 2020
38ee971
Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolph…
break60 Jun 17, 2020
03563a9
Fix unfiltered jar files in resource directory and UDF upload resourc…
break60 Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...heduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@
this.diGuiTree(item)
this.diGuiTree(this.filterJarFile(item1))
item1 = item1.filter( item => {
if(item.dirctory) {
return item
}
});
this.udfResourceList = item
this.udfResourceDirList = item1
resolve()
Expand Down
6 changes: 3 additions & 3 deletions dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
*/
<template>
<div class="update-udf-model">
<div class="update-udf-box">
Expand All @@ -26,7 +26,7 @@
v-model="udfName"
:disabled="progress !== 0"
style="width: 535px"
:placeholder="$t('Please enter resource name')"
:placeholder="$t('Please enter name')"
autocomplete="off">
</x-input>
<div class="p1" style="position: absolute;">
Expand Down Expand Up @@ -96,7 +96,7 @@
_verifyName () {
return new Promise((resolve, reject) => {
this.store.dispatch('resource/resourceVerifyName', {
fullName: '/'+this.udfName,
fullName: '/'+this.currentDir+'/'+this.udfName,
type: 'UDF'
}).then(res => {
resolve()
Expand Down