You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/01/19 03:59:16 UTC

[incubator-dolphinscheduler] branch dev updated: Fix UDF function list delete data without refresh and page data display widened #1851 (#1853)

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 9549910  Fix UDF function list delete data without refresh and page data display widened #1851 (#1853)
9549910 is described below

commit 9549910fccb52b2b8726ca26c79dd6daa3aff385
Author: break60 <79...@qq.com>
AuthorDate: Sun Jan 19 11:59:06 2020 +0800

    Fix UDF function list delete data without refresh and page data display widened #1851 (#1853)
    
    * fix udfs assignment and task instance page jump #1789
    
    * jest add coverage display
    
    * Fix data echo, style, popup cannot be closed and license
    
    * Fix data echo, style, popup cannot be closed and license
    
    * fix
    
    * Requests the previous page when there is no data on the list page
    
    * Fix DAG task nodes keep requesting API and tooltip background color modification
    
    * Modify list tooltip theme color
    
    * Fix UDF function list delete data without refresh and page data display widened
---
 .../pages/resource/pages/udf/pages/function/_source/createUdf.vue   | 3 ++-
 .../home/pages/resource/pages/udf/pages/function/_source/list.vue   | 3 ++-
 dolphinscheduler-ui/src/js/module/components/transfer/resource.vue  | 6 +++---
 3 files changed, 7 insertions(+), 5 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 13a337d..01d8d22 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
@@ -76,7 +76,8 @@
                     filterable
                     v-model="resourceId"
                     :disabled="isUpdate"
-                    style="width: 200px">
+                    :add-title="true"
+                    style="width: 261px">
               <x-option
                       v-for="city in udfResourceList"
                       :key="city.id"
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 5f788f8..ed441ba 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -142,7 +142,7 @@ v-ps<template>
           id: item.id
         }).then(res => {
           this.$refs[`poptip-${i}`][0].doClose()
-          this.$emit('_updateList')
+          this.$emit('on-update')
           this.$message.success(res.msg)
         }).catch(e => {
           this.$refs[`poptip-${i}`][0].doClose()
@@ -156,6 +156,7 @@ v-ps<template>
           showMask: true,
           escClose: true,
           className: 'v-modal-custom',
+          width: '800px',
           transitionName: 'opacityp',
           render (h) {
             return h(mCreateUdf, {
diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
index 8b7da81..1192ab2 100644
--- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
+++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue
@@ -17,7 +17,7 @@
 <template>
   <m-popup :ok-text="$t('Submit')" :nameText="type.name + $t('Authorize')" @ok="_ok" ref="popup">
     <template slot="content">
-      <div class="clearfix transfer-model">
+      <div class="clearfix transfer-model" style="width: 660px">
         <div>
             <x-button-group v-model="checkedValue" size="small">
                 <x-button type="ghost" value="fileResource" @click="_ckFile">{{$t('File resources')}}</x-button>
@@ -195,7 +195,7 @@
   .transfer-model {
     padding: 0 20px;
     .select-list-box {
-      width: 220px;
+      width: 300px;
       float: left;
       border: 1px solid #dcdee2;
       border-radius: 3px;
@@ -237,7 +237,7 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 210px;
+              width: 290px;
               display: inline-block;
             }
             &:hover {