Unverified Commit 26ae74cb authored May 23, 2019 by millionfor Committed by GitHub May 23, 2019

Merge pull request #336 from millionfor/branch-1.0.2

Branch 1.0.2

parents 1d0ca07b 806a4e24

escheduler-ui/.env

+2 −6

Original line number	Diff line number	Diff line

		# 后端接口地址
		#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访问项目把"#"号去掉
		#DEV_HOST = 192.168.xx.xx
		No newline at end of file

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

+4 −1

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

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		icon="fa fa-code">
		</x-button>
		<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="复制名称" ></i></span>
		</div>
		<div class="save-btn">