From b8fa7dac9d2ff3a4885fa9937f3f676546056a9a Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 7 Jan 2020 10:36:43 +0800 Subject: [PATCH] Fix front-end code specifications (#1726) * Fix api url * Fixed DAG zoom in and zoom out nodes separated from arrows * Fix front-end code specifications * Fix front-end code specifications * Fix front-end code specifications --- .../src/js/conf/home/pages/dag/_source/dag.js | 7 +--- .../js/conf/home/pages/dag/_source/dag.scss | 19 ++++------ .../js/conf/home/pages/dag/_source/dag.vue | 8 ++-- .../_source/formModel/_source/selectInput.vue | 4 +- .../dag/_source/formModel/formModel.scss | 2 - .../pages/dag/_source/formModel/formModel.vue | 6 +-- .../home/pages/dag/_source/formModel/log.vue | 8 ++-- .../tasks/_source/dependItemList.vue | 10 ++--- .../formModel/tasks/_source/httpParams.vue | 6 +-- .../formModel/tasks/_source/localParams.vue | 6 +-- .../formModel/tasks/_source/scriptBox.vue | 2 +- .../formModel/tasks/_source/statementList.vue | 6 +-- .../dag/_source/formModel/tasks/dependent.vue | 8 ++-- .../dag/_source/formModel/tasks/shell.vue | 2 +- .../pages/dag/_source/formModel/tasks/sql.vue | 4 +- .../pages/dag/_source/jumpAffirm/index.js | 1 - .../pages/dag/_source/plugIn/downChart.js | 6 +-- .../pages/dag/_source/plugIn/jsPlumbHandle.js | 8 ++-- .../home/pages/dag/_source/plugIn/util.js | 2 +- .../pages/dag/_source/startingParam/index.vue | 2 +- .../dag/_source/variable/variablesView.vue | 10 ++--- .../pages/list/_source/createDataSource.vue | 14 +++---- .../datasource/pages/list/_source/list.vue | 16 ++++---- .../pages/servers/_source/zookeeperList.vue | 4 +- .../home/pages/monitor/pages/servers/db.vue | 12 +++--- .../pages/monitor/pages/servers/master.vue | 2 +- .../monitor/pages/servers/statistics.vue | 8 ++-- .../pages/monitor/pages/servers/worker.vue | 2 +- .../_source/instanceConditions/index.vue | 4 +- .../taskRecordList/_source/conditions.vue | 4 +- .../definition/pages/list/_source/email.vue | 2 +- .../definition/pages/list/_source/list.vue | 18 ++++----- .../definition/pages/list/_source/start.vue | 4 +- .../definition/pages/list/_source/timing.vue | 4 +- .../pages/definition/pages/tree/index.vue | 4 +- .../pages/instance/pages/gantt/index.vue | 2 +- .../instance/pages/list/_source/list.vue | 26 ++++++------- .../pages/list/_source/createProject.vue | 2 +- .../projects/pages/list/_source/list.vue | 18 ++++----- .../pages/taskInstance/_source/list.vue | 24 ++++++------ .../pages/file/pages/create/index.vue | 6 +-- .../pages/file/pages/details/index.vue | 2 +- .../pages/file/pages/list/_source/list.vue | 14 +++---- .../pages/file/pages/list/_source/rename.vue | 2 +- .../udf/pages/function/_source/createUdf.vue | 8 ++-- .../pages/udf/pages/function/_source/list.vue | 20 +++++----- .../pages/udf/pages/resource/_source/list.vue | 16 ++++---- .../udf/pages/resource/_source/rename.vue | 2 +- .../pages/queue/_source/createQueue.vue | 4 +- .../pages/tenement/_source/createTenement.vue | 6 +-- .../pages/users/_source/createUser.vue | 12 +++--- .../warningGroups/_source/createWarning.vue | 4 +- .../workerGroups/_source/createWorker.vue | 4 +- .../user/pages/token/_source/createToken.vue | 4 +- .../module/components/crontab/source/app.vue | 12 +++--- .../fileUpdate/definitionUpdate.vue | 8 ++-- .../components/fileUpdate/fileUpdate.vue | 10 ++--- .../src/js/module/components/nav/nav.vue | 38 +++++++++---------- .../module/components/priority/priority.vue | 6 +-- .../secondaryMenu/secondaryMenu.vue | 8 ++-- .../components/tooltipsJSON/tooltipsJSON.vue | 4 +- .../module/components/transfer/resource.vue | 4 +- .../module/components/transfer/transfer.vue | 4 +- .../src/sass/common/index.scss | 24 ++++-------- 64 files changed, 250 insertions(+), 269 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js index 11f22132c7..8225673ecd 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js @@ -177,8 +177,6 @@ Dag.prototype.backfill = function (arg) { // Number of tree node levels let countTree = getLeafCountTree(datas[0]) function getMaxFloor(treeData) { - let floor = 0 - let v = this let max = 0 function each (data, floor) { data.forEach(e => { @@ -224,9 +222,8 @@ Dag.prototype.backfill = function (arg) { return [] } function toLine(data){ - return data.reduce((arr, {id, name, targetarr, x, y, children = []}) => - arr.concat([{id, name, targetarr, x, y}], toLine(children)), []) - return result; + return data.reduce((arrData, {id, name, targetarr, x, y, children = []}) => + arrData.concat([{id, name, targetarr, x, y}], toLine(children)), []) } let listarr = toLine(datas); let listarrs = toLine(datas) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index 88a8bdad39..237e6f5cd9 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss @@ -317,6 +317,7 @@ svg path:hover { .jtk-demo-canvas { position: relative; height: 100%; + display: flex; } .jtk-bootstrap { @@ -359,10 +360,6 @@ svg path:hover { list-style-type: disc !important; } -.jtk-demo-canvas { - display: flex; -} - .canvas-wide { padding-top: 10px; margin-left: 0; @@ -459,6 +456,12 @@ svg path:hover { -webkit-transition: background-color 0.25s ease-in; -moz-transition: background-color 0.25s ease-in; transition: background-color 0.25s ease-in; + background-color: white; + opacity: 0.8; + padding: 0.3em; + border-radius: 0.5em; + border: 1px solid #346789; + cursor: pointer; } .aLabel.jtk-hover, @@ -485,14 +488,6 @@ svg path:hover { } } -.aLabel { - background-color: white; - opacity: 0.8; - padding: 0.3em; - border-radius: 0.5em; - border: 1px solid #346789; - cursor: pointer; -} .jtk-ep { .ep { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 01da782246..feb756dabe 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -58,7 +58,7 @@ {{name}}   - +
@@ -68,7 +68,7 @@ :id="item.code" :key="$index" @click="_ckOperation(item,$event)"> - +
@@ -257,8 +257,8 @@ let state = dom.find('.state-p') dom.attr('data-state-id', v1.stateId) dom.attr('data-dependent-result', v1.dependentResult || '') - state.append(``) - state.find('b').attr('title', titleTpl(v2, v1.desc)) + state.append(``) + state.find('strong').attr('title', titleTpl(v2, v1.desc)) } }) }) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue index f04e8f41d9..1d3902c83b 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue @@ -32,8 +32,8 @@ :value="selectedModel === null ? '0' : selectedModel.value" style="width: 100%;" @on-click-icon.stop="_ckIcon"> - - + + - - + + - {{$t('Enter this child node')}} + {{$t('Enter this child node')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue index 7ec9cdfa7a..dbe3e1d6b1 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue @@ -29,16 +29,16 @@ {{$t('View log')}}
- + - + - + - +
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue index 8ae0a7866a..d6c865716a 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue @@ -39,17 +39,17 @@ - + - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue index c5e635bfeb..de5f781132 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue @@ -52,18 +52,18 @@ - + - + - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue index 2b4ade1ad5..0bbbb661f4 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue @@ -66,18 +66,18 @@ - + - + - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue index c16d18cc38..91e1cb7e08 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue @@ -28,7 +28,7 @@ - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue index 226e23219a..ecd10a9411 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue @@ -32,18 +32,18 @@ - + - + - + diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue index 785a4fe193..cca9ec7003 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue @@ -23,8 +23,8 @@ - - + +
@@ -40,13 +40,13 @@ @click="!isDetails && _setRelation($index)"> {{el.relation === 'AND' ? $t('and') : $t('or')}} - - + - +
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 9cef7bb801..7ab032a798 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -45,7 +45,7 @@