Commit 5739afb9 authored by 向偲彪's avatar 向偲彪 Committed by qiaozhanwei
Browse files

Fix DAG task nodes keep requesting API and tooltip background color modification (#1837) 

* 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
parent c531c88e

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

+7 −2
Original line number Diff line number Diff line
@@ -159,6 +159,9 @@ 
      border-radius: 0 3px 0 0;

      .ans-btn-text {

        color: #337ab7;

        .ans-icon {

          font-size: 16px;

        }

      }

      .assist-btn {

        position: absolute;
@@ -206,7 +209,7 @@ 
              color: #333;

            }

            &.active {

              background: #e1e2e3;

              // background: #e1e2e3;

              i {

                color: #2d8cf0;

              }
@@ -234,7 +237,9 @@ 
    border-radius: 3px 3px 0px 0px;

  }

}



#screen {

  margin-right: 5px;

}

.v-modal-custom-log {

  z-index: 101;

}

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

+13 −9
Original line number Diff line number Diff line
@@ -68,13 +68,21 @@ 
               :id="item.code"

               :key="$index"

               @click="_ckOperation(item,$event)">

              <em :class="item.icon" data-toggle="tooltip" :title="item.description" ></em>

              <x-button type="text" data-container="body" :icon="item.icon" v-tooltip.light="item.desc"></x-button>

            </a>

          </div>

          <x-button type="text" icon="ans-icon-triangle-solid-right" @click="dagAutomaticLayout"></x-button>

          <x-button 

                  data-toggle="tooltip"

                  :title="$t('Refresh DAG status')"

                  type="primary" 

                  v-tooltip.light="$t('Format DAG')"

                  icon="ans-icon-triangle-solid-right" 

                  size="xsmall" 

                  data-container="body"

                  v-if="type === 'instance'"

                  style="vertical-align: middle;" 

                  @click="dagAutomaticLayout">

          </x-button>

          <x-button

                  v-tooltip.light="$t('Refresh DAG status')"

                  data-container="body"

                  style="vertical-align: middle;"

                  icon="ans-icon-refresh"
@@ -189,10 +197,6 @@ 
          Dag.backfill(true)

          if (this.type === 'instance') {

            this._getTaskState(false).then(res => {})

            // Round robin acquisition status

            this.setIntervalP = setInterval(() => {

              this._getTaskState(true).then(res => {})

            }, 90000)

          }

        } else {

          Dag.create()

dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
            </m-tooltips-JSON>

          </td>

          <td>

            <span v-if="item.note" class="ellipsis" v-tooltip.large.top.start="{text: item.note, maxWidth: '500px'}">{{item.note}}</span>

            <span v-if="item.note" class="ellipsis" v-tooltip.large.top.start.light="{text: item.note, maxWidth: '500px'}">{{item.note}}</span>

            <span v-else>-</span>

          </td>

          <td>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
            <span v-else>-</span>

          </td>

          <td>

            <span v-if="item.description" class="ellipsis" v-tooltip.large.top.start="{text: item.description, maxWidth: '500px'}">{{item.description}}</span>

            <span v-if="item.description" class="ellipsis" v-tooltip.large.top.start.light="{text: item.description, maxWidth: '500px'}">{{item.description}}</span>

            <span v-else>-</span>

          </td>

          <td>

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
            <span>{{item.instRunningCount}}</span>

          </td>

          <td>

            <span v-if="item.description" class="ellipsis" v-tooltip.large.top.start="{text: item.description, maxWidth: '500px'}">{{item.description}}</span>

            <span v-if="item.description" class="ellipsis" v-tooltip.large.top.start.light="{text: item.description, maxWidth: '500px'}">{{item.description}}</span>

            <span v-else>-</span>

          </td>

          <td>