Unverified Commit 2114c8d9 authored by 向偲彪's avatar 向偲彪 Committed by GitHub
Browse files

Modify ans-ui version and timing management style (#2339) 

* Change DOM label

* Change name to lowercase

* Limit customization file content to no more than 3000 lines

* dd branch flow node verification

* datax

* datax add custom

* Change normalize.scss import method and animation.scss license modification

* Resource tree code merge

* Modify ans-ui version and timing management style
parent b5ff3ad3

dolphinscheduler-ui/package.json

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  },

  "dependencies": {

    "@riophae/vue-treeselect": "^0.4.0",

    "ans-ui": "1.1.7",

    "ans-ui": "1.1.9",

    "axios": "^0.16.2",

    "bootstrap": "3.3.7",

    "canvg": "1.5.1",

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

+7 −0
Original line number Diff line number Diff line
@@ -413,4 +413,11 @@ 
      padding: 0;

    }

  }

  .x-date-packer-panel .x-date-packer-day .lattice label.bg-hover {

    background: #00BFFF!important; 

    margin-top: -4px;

  }

  .x-date-packer-panel .x-date-packer-day .lattice em:hover {

    background: #0098e1!important; 

  }

</style>

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

+4 −4
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
          <th scope="col" width="50">

            <x-checkbox @on-change="_topCheckBoxClick" v-model="checkAll"></x-checkbox>

          </th>

          <th scope="col" width="40">

          <th scope="col">

            <span>{{$t('#')}}</span>

          </th>

          <th scope="col">

          <th scope="col" width="70">

            <span>{{$t('Process Name')}}</span>

          </th>

          <th scope="col" width="70">

          <th scope="col" width="60">

            <span>{{$t('Executor')}}</span>

          </th>

          <th scope="col" width="70">
@@ -71,7 +71,7 @@ 
            <span class="ellipsis" style="padding-left: 4px;"><router-link :to="{ path: '/projects/instance/list/' + item.id}" tag="a" class="links" :title="item.name">{{item.name}}</router-link></span>

          </td>

          <td>

            <span v-if="item.executorName">{{item.executorName}}</span>

            <span style="word-break: break-all" v-if="item.executorName">{{item.executorName}}</span>

            <span v-else>-</span>

          </td>

          <td><span>{{_rtRunningType(item.commandType)}}</span></td>