break60 4 years ago
parent
commit
1e3af6e326
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
  2. 1
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  4. 7
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
  5. 3
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
  6. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  7. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
  8. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
  9. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
  10. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
  11. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
  12. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  13. 1
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
  14. 5
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
  15. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  16. 3
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js

@ -53,7 +53,7 @@ const toolOper = (dagThis) => {
}, },
{ {
code: 'screen', code: 'screen',
icon: 'el-icon-rank', icon: 'el-icon-full-screen',
disable: false, disable: false,
desc: `${i18n.$t('Full Screen')}` desc: `${i18n.$t('Full Screen')}`
} }

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

@ -207,7 +207,6 @@
.operation { .operation {
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
margin-right: 10px;
a { a {
float: left; float: left;
width: 28px; width: 28px;

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

@ -874,6 +874,6 @@
<style lang="scss" rel="stylesheet/scss"> <style lang="scss" rel="stylesheet/scss">
@import "./dag"; @import "./dag";
.operBtn { .operBtn {
padding: 8px 20px; padding: 8px 6px;
} }
</style> </style>

7
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue

@ -35,10 +35,10 @@
<em class="el-icon-refresh"></em> <em class="el-icon-refresh"></em>
</a> </a>
<a href="javascript:" @click="_screenOpen" v-show="!isScreen" data-container="body" data-toggle="tooltip" :title="$t('Enter full screen')"> <a href="javascript:" @click="_screenOpen" v-show="!isScreen" data-container="body" data-toggle="tooltip" :title="$t('Enter full screen')">
<em class="el-icon-rank"></em> <em class="el-icon-full-screen"></em>
</a> </a>
<a href="javascript:" @click="_screenClose" v-show="isScreen" data-container="body" data-toggle="tooltip" :title="$t('Cancel full screen')"> <a href="javascript:" @click="_screenClose" v-show="isScreen" data-container="body" data-toggle="tooltip" :title="$t('Cancel full screen')">
<em class="el-icon-full-screen"></em> <em class="el-icon-minus"></em>
</a> </a>
</div> </div>
</div> </div>
@ -288,9 +288,10 @@
top: 12px; top: 12px;
a{ a{
color: #0097e0; color: #0097e0;
font-size: 12px;
margin-left: 10px; margin-left: 10px;
em { em {
font-size: 17px;
font-weight: 400;
text-decoration: none !important; text-decoration: none !important;
vertical-align: middle; vertical-align: middle;
} }

3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue

@ -109,8 +109,7 @@
} }
.from-mirror1 { .from-mirror1 {
.CodeMirror { .CodeMirror {
min-height: 600px; height: calc(70vh - 90px);
max-height: 700px;
} }
} }
</style> </style>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue

@ -48,7 +48,7 @@
style="opacity: 0;"> style="opacity: 0;">
</textarea> </textarea>
<a class="ans-modal-box-max"> <a class="ans-modal-box-max">
<em class="el-icon-rank" @click="setEditorVal"></em> <em class="el-icon-full-screen" @click="setEditorVal"></em>
</a> </a>
</div> </div>
</div> </div>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue

@ -23,7 +23,7 @@
<textarea id="code-python-mirror" name="code-python-mirror" style="opacity: 0;"> <textarea id="code-python-mirror" name="code-python-mirror" style="opacity: 0;">
</textarea> </textarea>
<a class="ans-modal-box-max"> <a class="ans-modal-box-max">
<em class="el-icon-rank" @click="setEditorVal"></em> <em class="el-icon-full-screen" @click="setEditorVal"></em>
</a> </a>
</div> </div>
</div> </div>

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue

@ -26,7 +26,7 @@
style="opacity: 0"> style="opacity: 0">
</textarea> </textarea>
<a class="ans-modal-box-max"> <a class="ans-modal-box-max">
<em class="el-icon-rank" @click="setEditorVal"></em> <em class="el-icon-full-screen" @click="setEditorVal"></em>
</a> </a>
</div> </div>
</div> </div>
@ -52,7 +52,7 @@
</m-list-box> </m-list-box>
<el-dialog <el-dialog
:visible.sync="scriptBoxDialog" :visible.sync="scriptBoxDialog"
modal-append-to-body="true" append-to-body="true"
width="80%"> width="80%">
<m-script-box :item="item" @getSriptBoxValue="getSriptBoxValue" @closeAble="closeAble"></m-script-box> <m-script-box :item="item" @getSriptBoxValue="getSriptBoxValue" @closeAble="closeAble"></m-script-box>
</el-dialog> </el-dialog>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue

@ -90,7 +90,7 @@
style="opacity: 0;"> style="opacity: 0;">
</textarea> </textarea>
<a class="ans-modal-box-max"> <a class="ans-modal-box-max">
<em class="el-icon-rank" @click="setEditorVal"></em> <em class="el-icon-full-screen" @click="setEditorVal"></em>
</a> </a>
</div> </div>
</div> </div>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue

@ -246,7 +246,7 @@
style="opacity: 0;"> style="opacity: 0;">
</textarea> </textarea>
<a class="ans-modal-box-max"> <a class="ans-modal-box-max">
<em class="el-icon-rank" @click="setEditorVal"></em> <em class="el-icon-full-screen" @click="setEditorVal"></em>
</a> </a>
</div> </div>
</div> </div>

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@ -573,10 +573,10 @@ JSP.prototype.copyNodes = function ($id) {
JSP.prototype.handleEventScreen = function ({ item, is }) { JSP.prototype.handleEventScreen = function ({ item, is }) {
let screenOpen = true let screenOpen = true
if (is) { if (is) {
item.icon = 'el-icon-full-screen' item.icon = 'el-icon-minus'
screenOpen = true screenOpen = true
} else { } else {
item.icon = 'el-icon-rank' item.icon = 'el-icon-full-screen'
screenOpen = false screenOpen = false
} }
const $mainLayoutModel = $('.main-layout-model') const $mainLayoutModel = $('.main-layout-model')

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

@ -141,7 +141,7 @@
<m-timing :timingData="timingData" @onUpdateTiming="onUpdateTiming" @closeTiming="closeTiming"></m-timing> <m-timing :timingData="timingData" @onUpdateTiming="onUpdateTiming" @closeTiming="closeTiming"></m-timing>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="提示" :title="$t('Info')"
:visible.sync="relatedItemsDialog" :visible.sync="relatedItemsDialog"
width="auto"> width="auto">
<m-related-items :tmp="tmp" @onBatchCopy="onBatchCopy" @onBatchMove="onBatchMove" @closeRelatedItems="closeRelatedItems"></m-related-items> <m-related-items :tmp="tmp" @onBatchCopy="onBatchCopy" @onBatchMove="onBatchMove" @closeRelatedItems="closeRelatedItems"></m-related-items>

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

@ -73,6 +73,7 @@
</el-table> </el-table>
</div> </div>
<el-dialog <el-dialog
:show-close="false"
:visible.sync="logDialog" :visible.sync="logDialog"
width="auto"> width="auto">
<m-log :item="item" :source="source" :logId="logId" @ok="ok" @close="close"></m-log> <m-log :item="item" :source="source" :logId="logId" @ok="ok" @close="close"></m-log>

5
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@ -197,5 +197,10 @@
} }
} }
} }
.list-model {
.el-dialog__header, .el-dialog__body {
padding: 0;
}
}
} }
</style> </style>

3
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@ -663,5 +663,6 @@ export default {
'Running Memory': 'Running Memory', 'Running Memory': 'Running Memory',
'Max Memory': 'Max Memory', 'Max Memory': 'Max Memory',
'Min Memory': 'Min Memory', 'Min Memory': 'Min Memory',
'The workflow canvas is abnormal and cannot be saved, please recreate': 'The workflow canvas is abnormal and cannot be saved, please recreate' 'The workflow canvas is abnormal and cannot be saved, please recreate': 'The workflow canvas is abnormal and cannot be saved, please recreate',
Info: 'Info'
} }

3
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -663,5 +663,6 @@ export default {
'Running Memory': '运行内存', 'Running Memory': '运行内存',
'Max Memory': '最大内存', 'Max Memory': '最大内存',
'Min Memory': '最小内存', 'Min Memory': '最小内存',
'The workflow canvas is abnormal and cannot be saved, please recreate': '该工作流画布异常无法保存请重新创建' 'The workflow canvas is abnormal and cannot be saved, please recreate': '该工作流画布异常无法保存请重新创建',
Info: '提示'
} }

Loading…
Cancel
Save