Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
806e8d9b
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
806e8d9b
编写于
12月 29, 2020
作者:
S
Shiwen Cheng
提交者:
GitHub
12月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Improvement][UI] Improve script box and dialog css style (#4331)
上级
6dd803e8
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
26 addition
and
19 deletion
+26
-19
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
...scheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
...nscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+0
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
...inscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
...r-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+4
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
...e/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
+1
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
...js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+2
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
...rc/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
.../js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+2
-2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
...f/home/pages/projects/pages/taskInstance/_source/list.vue
+1
-0
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
.../js/conf/home/pages/projects/pages/taskInstance/index.vue
+5
-0
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+2
-1
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+2
-1
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
浏览文件 @
806e8d9b
...
...
@@ -53,7 +53,7 @@ const toolOper = (dagThis) => {
},
{
code
:
'
screen
'
,
icon
:
'
el-icon-
rank
'
,
icon
:
'
el-icon-
full-screen
'
,
disable
:
false
,
desc
:
`
${
i18n
.
$t
(
'
Full Screen
'
)}
`
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
浏览文件 @
806e8d9b
...
...
@@ -207,7 +207,6 @@
.operation
{
overflow
:
hidden
;
display
:
inline-block
;
margin-right
:
10px
;
a
{
float
:
left
;
width
:
28px
;
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
806e8d9b
...
...
@@ -874,6 +874,6 @@
<
style
lang=
"scss"
rel=
"stylesheet/scss"
>
@import
"./dag"
;
.operBtn
{
padding
:
8px
20
px
;
padding
:
8px
6
px
;
}
</
style
>
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
浏览文件 @
806e8d9b
...
...
@@ -35,10 +35,10 @@
<em
class=
"el-icon-refresh"
></em>
</a>
<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
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>
</div>
</div>
...
...
@@ -288,9 +288,10 @@
top
:
12px
;
a
{
color
:
#0097e0
;
font-size
:
12px
;
margin-left
:
10px
;
em
{
font-size
:
17px
;
font-weight
:
400
;
text-decoration
:
none
!
important
;
vertical-align
:
middle
;
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
浏览文件 @
806e8d9b
...
...
@@ -109,8 +109,7 @@
}
.from-mirror1
{
.CodeMirror
{
min-height
:
600px
;
max-height
:
700px
;
height
:
calc
(
70vh
-
90px
);
}
}
</
style
>
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
浏览文件 @
806e8d9b
...
...
@@ -48,7 +48,7 @@
style=
"opacity: 0;"
>
</textarea>
<a
class=
"ans-modal-box-max"
>
<em
class=
"el-icon-
rank
"
@
click=
"setEditorVal"
></em>
<em
class=
"el-icon-
full-screen
"
@
click=
"setEditorVal"
></em>
</a>
</div>
</div>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
浏览文件 @
806e8d9b
...
...
@@ -23,7 +23,7 @@
<textarea
id=
"code-python-mirror"
name=
"code-python-mirror"
style=
"opacity: 0;"
>
</textarea>
<a
class=
"ans-modal-box-max"
>
<em
class=
"el-icon-
rank
"
@
click=
"setEditorVal"
></em>
<em
class=
"el-icon-
full-screen
"
@
click=
"setEditorVal"
></em>
</a>
</div>
</div>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
浏览文件 @
806e8d9b
...
...
@@ -26,7 +26,7 @@
style=
"opacity: 0"
>
</textarea>
<a
class=
"ans-modal-box-max"
>
<em
class=
"el-icon-
rank
"
@
click=
"setEditorVal"
></em>
<em
class=
"el-icon-
full-screen
"
@
click=
"setEditorVal"
></em>
</a>
</div>
</div>
...
...
@@ -52,7 +52,7 @@
</m-list-box>
<el-dialog
:visible.sync=
"scriptBoxDialog"
modal-
append-to-body=
"true"
append-to-body=
"true"
width=
"80%"
>
<m-script-box
:item=
"item"
@
getSriptBoxValue=
"getSriptBoxValue"
@
closeAble=
"closeAble"
></m-script-box>
</el-dialog>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
浏览文件 @
806e8d9b
...
...
@@ -90,7 +90,7 @@
style=
"opacity: 0;"
>
</textarea>
<a
class=
"ans-modal-box-max"
>
<em
class=
"el-icon-
rank
"
@
click=
"setEditorVal"
></em>
<em
class=
"el-icon-
full-screen
"
@
click=
"setEditorVal"
></em>
</a>
</div>
</div>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
浏览文件 @
806e8d9b
...
...
@@ -246,7 +246,7 @@
style=
"opacity: 0;"
>
</textarea>
<a
class=
"ans-modal-box-max"
>
<em
class=
"el-icon-
rank
"
@
click=
"setEditorVal"
></em>
<em
class=
"el-icon-
full-screen
"
@
click=
"setEditorVal"
></em>
</a>
</div>
</div>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
806e8d9b
...
...
@@ -573,10 +573,10 @@ JSP.prototype.copyNodes = function ($id) {
JSP
.
prototype
.
handleEventScreen
=
function
({
item
,
is
})
{
let
screenOpen
=
true
if
(
is
)
{
item
.
icon
=
'
el-icon-
full-screen
'
item
.
icon
=
'
el-icon-
minus
'
screenOpen
=
true
}
else
{
item
.
icon
=
'
el-icon-
rank
'
item
.
icon
=
'
el-icon-
full-screen
'
screenOpen
=
false
}
const
$mainLayoutModel
=
$
(
'
.main-layout-model
'
)
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
806e8d9b
...
...
@@ -141,7 +141,7 @@
<m-timing
:timingData=
"timingData"
@
onUpdateTiming=
"onUpdateTiming"
@
closeTiming=
"closeTiming"
></m-timing>
</el-dialog>
<el-dialog
title=
"提示
"
:title=
"$t('Info')
"
:visible.sync=
"relatedItemsDialog"
width=
"auto"
>
<m-related-items
:tmp=
"tmp"
@
onBatchCopy=
"onBatchCopy"
@
onBatchMove=
"onBatchMove"
@
closeRelatedItems=
"closeRelatedItems"
></m-related-items>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
浏览文件 @
806e8d9b
...
...
@@ -73,6 +73,7 @@
</el-table>
</div>
<el-dialog
:show-close=
"false"
:visible.sync=
"logDialog"
width=
"auto"
>
<m-log
:item=
"item"
:source=
"source"
:logId=
"logId"
@
ok=
"ok"
@
close=
"close"
></m-log>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
浏览文件 @
806e8d9b
...
...
@@ -197,5 +197,10 @@
}
}
}
.list-model
{
.el-dialog__header
,
.el-dialog__body
{
padding
:
0
;
}
}
}
</
style
>
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
806e8d9b
...
...
@@ -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
'
'
The workflow canvas is abnormal and cannot be saved, please recreate
'
:
'
The workflow canvas is abnormal and cannot be saved, please recreate
'
,
Info
:
'
Info
'
}
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
806e8d9b
...
...
@@ -663,5 +663,6 @@ export default {
'
Running Memory
'
:
'
运行内存
'
,
'
Max 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
:
'
提示
'
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录