Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
02bccb99
DolphinScheduler
项目概览
apache
/
DolphinScheduler
上一次同步 接近 2 年
通知
707
Star
9572
Fork
3514
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
02bccb99
编写于
4月 28, 2020
作者:
B
break60
提交者:
gaojun2048
6月 29, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix page display incomplete
上级
dbe504cd
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
151 addition
and
28 deletion
+151
-28
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
...home/pages/projects/pages/definition/pages/list/index.vue
+11
-2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
...f/home/pages/projects/pages/instance/pages/list/index.vue
+9
-2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
.../js/conf/home/pages/projects/pages/taskInstance/index.vue
+9
-2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
.../conf/home/pages/resource/pages/file/pages/list/index.vue
+11
-2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
...me/pages/resource/pages/file/pages/subdirectory/index.vue
+10
-1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
...nf/home/pages/resource/pages/udf/pages/function/index.vue
+11
-3
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
...nf/home/pages/resource/pages/udf/pages/resource/index.vue
+11
-3
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
.../pages/resource/pages/udf/pages/subUdfDirectory/index.vue
+10
-1
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
...-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+10
-1
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
.../src/js/conf/home/pages/security/pages/tenement/index.vue
+10
-1
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
...-ui/src/js/conf/home/pages/security/pages/users/index.vue
+11
-2
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
...js/conf/home/pages/security/pages/warningGroups/index.vue
+10
-1
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
...uler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+11
-2
dolphinscheduler-ui/src/js/conf/login/App.vue
dolphinscheduler-ui/src/js/conf/login/App.vue
+1
-0
dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
.../src/js/module/components/secondaryMenu/secondaryMenu.vue
+7
-1
dolphinscheduler-ui/src/js/module/components/spin/spin.vue
dolphinscheduler-ui/src/js/module/components/spin/spin.vue
+4
-4
dolphinscheduler-ui/src/sass/conf/home/index.scss
dolphinscheduler-ui/src/sass/conf/home/index.scss
+5
-0
未找到文件。
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
浏览文件 @
02bccb99
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<
template
v-if=
"!processListP.length && total<=0"
>
<
template
v-if=
"!processListP.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -64,7 +64,8 @@
...
@@ -64,7 +64,8 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
,
searchVal
:
''
,
userId
:
''
userId
:
''
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -98,6 +99,11 @@
...
@@ -98,6 +99,11 @@
* get data list
* get data list
*/
*/
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getProcessListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getProcessListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -133,6 +139,9 @@
...
@@ -133,6 +139,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mList
,
mConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
components
:
{
mList
,
mConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
}
}
</
script
>
</
script
>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
浏览文件 @
02bccb99
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<
template
v-if=
"!processInstanceList.length && total<=0"
>
<
template
v-if=
"!processInstanceList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -74,7 +74,8 @@
...
@@ -74,7 +74,8 @@
endDate
:
''
,
endDate
:
''
,
// Exectuor Name
// Exectuor Name
executorName
:
''
executorName
:
''
}
},
isLeft
:
true
}
}
},
},
props
:
{},
props
:
{},
...
@@ -136,6 +137,11 @@
...
@@ -136,6 +137,11 @@
* @desc Prevent functions from being called multiple times
* @desc Prevent functions from being called multiple times
*/
*/
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
_getProcessInstanceListP
(
flag
)
this
.
_getProcessInstanceListP
(
flag
)
},
100
,
{
},
100
,
{
'
leading
'
:
false
,
'
leading
'
:
false
,
...
@@ -183,6 +189,7 @@
...
@@ -183,6 +189,7 @@
beforeDestroy
()
{
beforeDestroy
()
{
// Destruction wheel
// Destruction wheel
clearInterval
(
this
.
setIntervalP
)
clearInterval
(
this
.
setIntervalP
)
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
},
components
:
{
mList
,
mInstanceConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
components
:
{
mList
,
mInstanceConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
浏览文件 @
02bccb99
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
<
template
v-if=
"!taskInstanceList.length"
>
<
template
v-if=
"!taskInstanceList.length"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -71,7 +71,8 @@
...
@@ -71,7 +71,8 @@
endDate
:
''
,
endDate
:
''
,
// Exectuor Name
// Exectuor Name
executorName
:
''
executorName
:
''
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -118,6 +119,11 @@
...
@@ -118,6 +119,11 @@
* @desc Prevent functions from being called multiple times
* @desc Prevent functions from being called multiple times
*/
*/
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
_getList
(
flag
)
this
.
_getList
(
flag
)
},
100
,
{
},
100
,
{
'
leading
'
:
false
,
'
leading
'
:
false
,
...
@@ -146,6 +152,7 @@
...
@@ -146,6 +152,7 @@
beforeDestroy
()
{
beforeDestroy
()
{
// Destruction wheel
// Destruction wheel
clearInterval
(
this
.
setIntervalP
)
clearInterval
(
this
.
setIntervalP
)
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
},
components
:
{
mList
,
mInstanceConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
components
:
{
mList
,
mInstanceConditions
,
mSpin
,
mListConstruction
,
mSecondaryMenu
,
mNoData
}
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
浏览文件 @
02bccb99
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<
template
v-if=
"!fileResourcesList.length && total<=0"
>
<
template
v-if=
"!fileResourcesList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
>
</m-spin>
</m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
...
@@ -67,7 +67,8 @@
...
@@ -67,7 +67,8 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
,
searchVal
:
''
,
type
:
'
FILE
'
type
:
'
FILE
'
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -91,6 +92,11 @@
...
@@ -91,6 +92,11 @@
this
.
searchParams
.
pageSize
=
val
this
.
searchParams
.
pageSize
=
val
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -125,6 +131,9 @@
...
@@ -125,6 +131,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
浏览文件 @
02bccb99
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<
template
v-if=
"!fileResourcesList.length && total<=0"
>
<
template
v-if=
"!fileResourcesList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
>
</m-spin>
</m-spin>
</div>
</div>
</div>
</div>
...
@@ -73,6 +73,7 @@
...
@@ -73,6 +73,7 @@
searchVal
:
''
,
searchVal
:
''
,
type
:
'
FILE
'
type
:
'
FILE
'
},
},
isLeft
:
true
,
breadList
:
[]
breadList
:
[]
}
}
},
},
...
@@ -97,6 +98,11 @@
...
@@ -97,6 +98,11 @@
this
.
searchParams
.
pageSize
=
val
this
.
searchParams
.
pageSize
=
val
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -159,6 +165,9 @@
...
@@ -159,6 +165,9 @@
this
.
breadList
=
dir
this
.
breadList
=
dir
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
浏览文件 @
02bccb99
...
@@ -36,8 +36,7 @@
...
@@ -36,8 +36,7 @@
<
template
v-if=
"!udfFuncList.length && total<=0"
>
<
template
v-if=
"!udfFuncList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -64,7 +63,8 @@
...
@@ -64,7 +63,8 @@
pageSize
:
10
,
pageSize
:
10
,
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -110,6 +110,11 @@
...
@@ -110,6 +110,11 @@
this
.
_debounceGET
()
this
.
_debounceGET
()
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getUdfFuncListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getUdfFuncListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -137,6 +142,9 @@
...
@@ -137,6 +142,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mCreateUdf
,
mNoData
}
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mCreateUdf
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
浏览文件 @
02bccb99
...
@@ -37,8 +37,7 @@
...
@@ -37,8 +37,7 @@
<
template
v-if=
"!udfResourcesList.length && total<=0"
>
<
template
v-if=
"!udfResourcesList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -66,7 +65,8 @@
...
@@ -66,7 +65,8 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
,
searchVal
:
''
,
type
:
'
UDF
'
type
:
'
UDF
'
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -98,6 +98,11 @@
...
@@ -98,6 +98,11 @@
this
.
_debounceGET
()
this
.
_debounceGET
()
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -125,6 +130,9 @@
...
@@ -125,6 +130,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
浏览文件 @
02bccb99
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<
template
v-if=
"!udfResourcesList.length && total<=0"
>
<
template
v-if=
"!udfResourcesList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
>
</m-spin>
</m-spin>
</div>
</div>
</div>
</div>
...
@@ -72,6 +72,7 @@
...
@@ -72,6 +72,7 @@
searchVal
:
''
,
searchVal
:
''
,
type
:
'
UDF
'
type
:
'
UDF
'
},
},
isLeft
:
true
,
breadList
:
[]
breadList
:
[]
}
}
},
},
...
@@ -106,6 +107,11 @@
...
@@ -106,6 +107,11 @@
this
.
_debounceGET
()
this
.
_debounceGET
()
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getResourcesListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -160,6 +166,9 @@
...
@@ -160,6 +166,9 @@
this
.
breadList
=
dir
this
.
breadList
=
dir
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
...
...
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
浏览文件 @
02bccb99
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
<
template
v-if=
"!queueList.length && total<=0"
>
<
template
v-if=
"!queueList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -66,6 +66,7 @@
...
@@ -66,6 +66,7 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
},
},
isLeft
:
true
,
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
}
}
},
},
...
@@ -116,6 +117,11 @@
...
@@ -116,6 +117,11 @@
})
})
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getQueueListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getQueueListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -143,6 +149,9 @@
...
@@ -143,6 +149,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
浏览文件 @
02bccb99
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<
template
v-if=
"!tenementList.length && total<=0"
>
<
template
v-if=
"!tenementList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
},
},
isLeft
:
true
,
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
}
}
},
},
...
@@ -120,6 +121,11 @@
...
@@ -120,6 +121,11 @@
})
})
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getTenantListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getTenantListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -147,6 +153,9 @@
...
@@ -147,6 +153,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
浏览文件 @
02bccb99
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<
template
v-if=
"!userList.length && total<=0"
>
<
template
v-if=
"!userList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -65,7 +65,8 @@
...
@@ -65,7 +65,8 @@
pageSize
:
10
,
pageSize
:
10
,
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -118,6 +119,11 @@
...
@@ -118,6 +119,11 @@
})
})
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getUsersListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getUsersListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -145,6 +151,9 @@
...
@@ -145,6 +151,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
浏览文件 @
02bccb99
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
<
template
v-if=
"!alertgroupList.length && total<=0"
>
<
template
v-if=
"!alertgroupList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -67,6 +67,7 @@
...
@@ -67,6 +67,7 @@
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
},
},
isLeft
:
true
,
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
isADMIN
:
store
.
state
.
user
.
userInfo
.
userType
===
'
ADMIN_USER
'
}
}
},
},
...
@@ -120,6 +121,11 @@
...
@@ -120,6 +121,11 @@
})
})
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getAlertgroupP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getAlertgroupP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -147,6 +153,9 @@
...
@@ -147,6 +153,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
components
:
{
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
浏览文件 @
02bccb99
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
<
template
v-if=
"!tokenList.length && total<=0"
>
<
template
v-if=
"!tokenList.length && total<=0"
>
<m-no-data></m-no-data>
<m-no-data></m-no-data>
</
template
>
</
template
>
<m-spin
:is-spin=
"isLoading"
></m-spin>
<m-spin
:is-spin=
"isLoading"
:is-left=
"isLeft"
></m-spin>
</template>
</template>
</m-list-construction>
</m-list-construction>
</template>
</template>
...
@@ -67,7 +67,8 @@
...
@@ -67,7 +67,8 @@
pageSize
:
10
,
pageSize
:
10
,
pageNo
:
1
,
pageNo
:
1
,
searchVal
:
''
searchVal
:
''
}
},
isLeft
:
true
}
}
},
},
mixins
:
[
listUrlParamHandle
],
mixins
:
[
listUrlParamHandle
],
...
@@ -120,6 +121,11 @@
...
@@ -120,6 +121,11 @@
})
})
},
},
_getList
(
flag
)
{
_getList
(
flag
)
{
if
(
sessionStorage
.
getItem
(
'
isLeft
'
)
==
0
)
{
this
.
isLeft
=
false
}
else
{
this
.
isLeft
=
true
}
this
.
isLoading
=
!
flag
this
.
isLoading
=
!
flag
this
.
getTokenListP
(
this
.
searchParams
).
then
(
res
=>
{
this
.
getTokenListP
(
this
.
searchParams
).
then
(
res
=>
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
if
(
this
.
searchParams
.
pageNo
>
1
&&
res
.
totalList
.
length
==
0
)
{
...
@@ -147,6 +153,9 @@
...
@@ -147,6 +153,9 @@
mounted
()
{
mounted
()
{
this
.
$modal
.
destroy
()
this
.
$modal
.
destroy
()
},
},
beforeDestroy
()
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
},
components
:
{
mSecondaryMenu
,
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
components
:
{
mSecondaryMenu
,
mList
,
mListConstruction
,
mConditions
,
mSpin
,
mNoData
}
}
}
</
script
>
</
script
>
dolphinscheduler-ui/src/js/conf/login/App.vue
浏览文件 @
02bccb99
...
@@ -84,6 +84,7 @@
...
@@ -84,6 +84,7 @@
this
.
_gLogin
().
then
(
res
=>
{
this
.
_gLogin
().
then
(
res
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
this
.
spinnerLoading
=
false
this
.
spinnerLoading
=
false
sessionStorage
.
setItem
(
'
isLeft
'
,
1
);
if
(
res
.
data
.
hasOwnProperty
(
"
sessionId
"
))
{
if
(
res
.
data
.
hasOwnProperty
(
"
sessionId
"
))
{
let
sessionId
=
res
.
data
.
sessionId
let
sessionId
=
res
.
data
.
sessionId
sessionStorage
.
setItem
(
"
sessionId
"
,
sessionId
)
sessionStorage
.
setItem
(
"
sessionId
"
,
sessionId
)
...
...
dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
浏览文件 @
02bccb99
...
@@ -63,7 +63,8 @@
...
@@ -63,7 +63,8 @@
menuList
:
menu
(
this
.
type
),
menuList
:
menu
(
this
.
type
),
index
:
0
,
index
:
0
,
id
:
this
.
$route
.
params
.
id
,
id
:
this
.
$route
.
params
.
id
,
isTogHide
:
false
isTogHide
:
false
,
isLeft
:
true
}
}
},
},
props
:
{
props
:
{
...
@@ -82,6 +83,11 @@
...
@@ -82,6 +83,11 @@
},
},
_toggleMenu
()
{
_toggleMenu
()
{
this
.
isTogHide
=
!
this
.
isTogHide
this
.
isTogHide
=
!
this
.
isTogHide
if
(
this
.
isTogHide
)
{
sessionStorage
.
setItem
(
'
isLeft
'
,
0
)
}
else
{
sessionStorage
.
setItem
(
'
isLeft
'
,
1
)
}
}
}
},
},
mounted
()
{
mounted
()
{
...
...
dolphinscheduler-ui/src/js/module/components/spin/spin.vue
浏览文件 @
02bccb99
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
#spin-model
{
#spin-model
{
position
:
fixed
;
position
:
fixed
;
left
:
20px
;
left
:
20px
;
top
:
8
0px
;
top
:
6
0px
;
background
:
#fff
;
background
:
#fff
;
z-index
:
99
;
z-index
:
99
;
border-radius
:
3px
;
border-radius
:
3px
;
...
@@ -69,11 +69,11 @@
...
@@ -69,11 +69,11 @@
}
}
&
.spin-sp1
{
&
.spin-sp1
{
width
:
calc
(
100%
-
40px
);
width
:
calc
(
100%
-
40px
);
height
:
calc
(
100%
-
10
0px
);
height
:
calc
(
100%
-
6
0px
);
}
}
&
.spin-sp2
{
&
.spin-sp2
{
width
:
calc
(
100%
-
2
4
0px
);
width
:
calc
(
100%
-
2
2
0px
);
height
:
calc
(
100%
-
10
0px
);
height
:
calc
(
100%
-
6
0px
);
left
:
220px
;
left
:
220px
;
}
}
}
}
...
...
dolphinscheduler-ui/src/sass/conf/home/index.scss
浏览文件 @
02bccb99
...
@@ -24,8 +24,13 @@ body {
...
@@ -24,8 +24,13 @@ body {
.ans-message-box
,
.ans-message-wrapper
{
.ans-message-box
,
.ans-message-wrapper
{
z-index
:
121
!
important
;
z-index
:
121
!
important
;
}
}
&
::-webkit-scrollbar
{
width
:
0
;
height
:
0
;
}
}
}
@media
screen
and
(
max-width
:
960px
){
@media
screen
and
(
max-width
:
960px
){
.nav-model
{
.nav-model
{
.logo-box
,
.logo-box
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录