Browse Source

Merge pull request #336 from millionfor/branch-1.0.2

Branch 1.0.2
pull/2/head
millionfor 5 years ago committed by GitHub
parent
commit
26ae74cb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      escheduler-ui/.env
  2. 5
      escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
  3. 3
      escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

8
escheduler-ui/.env

@ -1,9 +1,5 @@
# 后端接口地址
#API_BASE = http://192.168.221.188:12345
# 后端接口地址 # 后端接口地址
API_BASE = http://192.168.220.154:12345 API_BASE = http://192.168.xx.xx:12345
# 本地开发如需ip访问项目把"#"号去掉 # 本地开发如需ip访问项目把"#"号去掉
#DEV_HOST = 192.168.xx.xx #DEV_HOST = 192.168.xx.xx

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

@ -138,7 +138,7 @@
.assist-btn { .assist-btn {
position: absolute; position: absolute;
left: 10px; left: 10px;
top: 4px; top: 7px;
>.name { >.name {
padding-left: 6px; padding-left: 6px;
vertical-align: middle; vertical-align: middle;
@ -146,6 +146,8 @@
>.copy-name { >.copy-name {
cursor: pointer; cursor: pointer;
padding-left: 4px; padding-left: 4px;
position: relative;
top: -2px;
&:hover { &:hover {
i { i {
color: #47c3ff; color: #47c3ff;
@ -154,6 +156,7 @@
i { i {
color: #333; color: #333;
font-size: 18px; font-size: 18px;
vertical-align: middle;
} }
} }
} }

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

@ -29,7 +29,8 @@
icon="fa fa-code"> icon="fa fa-code">
</x-button> </x-button>
<span class="name">{{name}}</span> <span class="name">{{name}}</span>
<span v-if="name" class="copy-name" @click="_copyName" :data-clipboard-text="name"><i class="iconfont" data-container="body" data-toggle="tooltip" title="复制名称" >&#xe61e;</i></span> &nbsp;
<span v-if="name" class="copy-name" @click="_copyName" :data-clipboard-text="name"><i class="iconfont" data-container="body" data-toggle="tooltip" title="复制名称" >&#xe61e;</i></span>
</div> </div>
<div class="save-btn"> <div class="save-btn">
<div class="operation" style="vertical-align: middle;"> <div class="operation" style="vertical-align: middle;">

Loading…
Cancel
Save