Commit 269ba169 authored by 向偲彪's avatar 向偲彪 Committed by qiaozhanwei
Browse files

Fix UDF function list delete data without refresh and page data display widened #1851 (#1852) 

* merge dev branch front-end code

* fix udfs assignment

* Fix task instance page jump

* fix udfs assignment and task instance page jump #1789

* Fixed space and icon display issues before and after the input box

* add license

* add license

* Fix data echo, style and popup cannot be closed

* Fix page number loading issue and dag not getting value

* Fix DAG add dependent project value exception # 1816 and keep requesting task interface

* Fix UDF function list delete data without refresh and page data display widened
parent 18c69a85

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue

+2 −1
Original line number Diff line number Diff line
@@ -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"

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -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()

dolphinscheduler-ui/src/js/module/components/transfer/resource.vue

+3 −3
Original line number Diff line number Diff line
@@ -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 {