From 3918a958d0e6a334dbd736428ac644fc73f4a1be Mon Sep 17 00:00:00 2001 From: gongzijian Date: Thu, 23 May 2019 10:22:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?dag=E5=90=8D=E7=A7=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/conf/home/pages/dag/_source/dag.scss | 15 ++++++++++++++- .../src/js/conf/home/pages/dag/_source/dag.vue | 18 +++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index dcfa6b7d5d..bcff822a2e 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -138,11 +138,24 @@ .assist-btn { position: absolute; left: 10px; - top: 8px; + top: 4px; >.name { padding-left: 6px; vertical-align: middle; } + >.copy-name { + cursor: pointer; + padding-left: 4px; + &:hover { + i { + color: #47c3ff; + } + } + i { + color: #333; + font-size: 18px; + } + } } .save-btn { position: absolute; diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index dd573d0d56..990b9bc0ab 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -28,7 +28,8 @@ @click="_toggleView" icon="fa fa-code"> - {{name}} + {{name}} +
@@ -88,6 +89,7 @@ import mUdp from './udp/udp' import i18n from '@/module/i18n' import { jsPlumb } from 'jsplumb' + import Clipboard from 'clipboard' import { allNodesId } from './plugIn/util' import { toolOper, tasksType } from './config' import mFormModel from './formModel/formModel' @@ -139,6 +141,20 @@ Dag.create() } }, + _copyName(){ + let clipboard = new Clipboard(`.copy-name`) + clipboard.on('success', e => { + this.$message.success(`${i18n.$t('Copy success')}`) + // Free memory + clipboard.destroy() + }) + clipboard.on('error', e => { + // Copy is not supported + this.$message.warning(`${i18n.$t('The browser does not support automatic copying')}`) + // Free memory + clipboard.destroy() + }) + }, /** * Get state interface * @param isReset Whether to manually refresh From 9bb699434d4e1de264284606499d8630dcc6cdf4 Mon Sep 17 00:00:00 2001 From: gongzijian Date: Thu, 23 May 2019 10:33:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AEdag=20u?= =?UTF-8?q?dp=E7=BB=84=E4=BB=B6=E7=82=B9=E5=8F=96=E6=B6=88=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=9C=AA=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/conf/home/pages/dag/_source/dag.vue | 4 ++-- .../conf/home/pages/dag/_source/udp/udp.vue | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 990b9bc0ab..989ec166dd 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -28,8 +28,8 @@ @click="_toggleView" icon="fa fa-code"> - {{name}} - + {{name}} +
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue index 999ea19e64..76aaccdd93 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue @@ -110,6 +110,13 @@ } return true }, + _accuStore(){ + this.store.commit('dag/setGlobalParams', _.cloneDeep(this.udpList)) + this.store.commit('dag/setName', _.cloneDeep(this.name)) + this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout)) + this.store.commit('dag/setDesc', _.cloneDeep(this.desc)) + this.store.commit('dag/setSyncDefine', this.syncDefine) + }, /** * submit */ @@ -130,11 +137,8 @@ } // Storage global globalParams - this.store.commit('dag/setGlobalParams', _.cloneDeep(this.udpList)) - this.store.commit('dag/setName', _.cloneDeep(this.name)) - this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout)) - this.store.commit('dag/setDesc', _.cloneDeep(this.desc)) - this.store.commit('dag/setSyncDefine', this.syncDefine) + this._accuStore() + Affirm.setIsPop(false) this.$emit('onUdp') } @@ -155,7 +159,11 @@ * Close the popup */ close () { - this.$emit('close') + // Storage global globalParams + this._accuStore() + setTimeout(() => { + this.$emit('close') + }) } }, watch: { From 8b7e5457e1b130d58ef286ccb2303ea448fd9bfd Mon Sep 17 00:00:00 2001 From: gongzijian Date: Thu, 23 May 2019 11:17:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BA=E9=97=B4?= =?UTF-8?q?=E8=A1=A5=E6=95=B0=20=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- escheduler-ui/.env | 5 ++++- escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/escheduler-ui/.env b/escheduler-ui/.env index f87381db19..2905723bd3 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -1,6 +1,9 @@ # 后端接口地址 -API_BASE = http://192.168.221.188:12345 +#API_BASE = http://192.168.221.188:12345 + +# 后端接口地址 +API_BASE = http://192.168.220.154:12345 # 本地开发如需ip访问项目把"#"号去掉 #DEV_HOST = 192.168.xx.xx diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 989ec166dd..c60f5d3b49 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -141,6 +141,9 @@ Dag.create() } }, + /** + * copy name + */ _copyName(){ let clipboard = new Clipboard(`.copy-name`) clipboard.on('success', e => { @@ -170,6 +173,10 @@ let $item = _.filter(taskList, v => v.name === item.name)[0] return `
${i18n.$t('Name')}：${$item.name}
${i18n.$t('State')}：${desc}
${i18n.$t('type')}：${$item.taskType}
${i18n.$t('host')}：${$item.host || '-'}
${i18n.$t('Retry Count')}：${$item.retryTimes}
${i18n.$t('Submit Time')}：${formatDate($item.submitTime)}
${i18n.$t('Start Time')}：${formatDate($item.startTime)}
${i18n.$t('End Time')}：${$item.endTime ? formatDate($item.endTime) : '-'}
` } + + // remove tip state dom + $('.w').find('.state-p').html('') + data.forEach(v1 => { idArr.forEach(v2 => { if (v2.name === v1.name) { @@ -177,7 +184,6 @@ let state = dom.find('.state-p') dom.attr('data-state-id', v1.stateId) dom.attr('data-dependent-result', v1.dependentResult || '') - state.html('') state.append(`${v1.icoUnicode}`) state.find('b').attr('title', titleTpl(v2, v1.desc)) }