[incubator-dolphinscheduler] branch dev-1.3.0 updated: Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008)

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
     new 08beae8  Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008)
08beae8 is described below

commit 08beae8358d61c1c2da3a9db3df8e244f770838a
Author: break60 <79...@qq.com>
AuthorDate: Wed Jun 17 18:52:06 2020 +0800

    Fix unfiltered jar files in resource directory and UDF upload resource parameters (#3008)
    
    * Change email to default
    
    * Fix unfiltered jar files in resource directory and UDF upload resource parameters
---
 .../pages/resource/pages/udf/pages/function/_source/createUdf.vue   | 5 +++++
 .../src/js/module/components/fileUpdate/udfUpdate.vue               | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
index 1408c55..beaa7d7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
@@ -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()
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
index 7c852c5..7135d1b 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
@@ -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">
@@ -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;">
@@ -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()