Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
DolphinScheduler
提交
bad78b2f
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,发现更多精彩内容 >>
未验证
提交
bad78b2f
编写于
6月 24, 2019
作者:
journey2018
提交者:
GitHub
6月 24, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #475 from qiaozhanwei/dev-1.1.0
update admin has all permissions
上级
08cabc8f
947f3ade
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
73 addition
and
88 deletion
+73
-88
escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
...ain/java/cn/escheduler/api/service/DataSourceService.java
+2
-1
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
...a/cn/escheduler/api/service/ProcessDefinitionService.java
+2
-1
escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
...c/main/java/cn/escheduler/api/service/ProjectService.java
+0
-9
escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
...main/java/cn/escheduler/api/service/ResourcesService.java
+2
-1
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
...ain/java/cn/escheduler/dao/mapper/UserMapperProvider.java
+0
-2
escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+11
-11
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
...rc/js/conf/home/pages/dag/_source/formModel/formModel.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+1
-1
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
...js/conf/home/pages/datasource/pages/list/_source/list.vue
+1
-3
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
...ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+7
-8
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
...es/projects/pages/definition/pages/list/_source/start.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
...home/pages/projects/pages/definition/pages/list/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
...pages/projects/pages/instance/pages/list/_source/list.vue
+1
-7
escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
...c/js/conf/home/pages/projects/pages/list/_source/list.vue
+2
-4
escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
...r-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+2
-2
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
...onf/home/pages/resource/pages/file/pages/create/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
...ome/pages/resource/pages/file/pages/list/_source/list.vue
+5
-9
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
.../conf/home/pages/resource/pages/file/pages/list/index.vue
+3
-3
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
.../pages/resource/pages/udf/pages/function/_source/list.vue
+3
-5
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
...nf/home/pages/resource/pages/udf/pages/function/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
.../pages/resource/pages/udf/pages/resource/_source/list.vue
+3
-6
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
...nf/home/pages/resource/pages/udf/pages/resource/index.vue
+1
-1
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
...nf/home/pages/security/pages/users/_source/createUser.vue
+8
-3
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
.../js/conf/home/pages/security/pages/users/_source/list.vue
+9
-1
escheduler-ui/src/js/module/mixin/disabledState.js
escheduler-ui/src/js/module/mixin/disabledState.js
+2
-2
未找到文件。
escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
浏览文件 @
bad78b2f
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.PageInfo
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.DbType
;
import
cn.escheduler.common.enums.UserType
;
import
cn.escheduler.common.job.db.*
;
import
cn.escheduler.dao.mapper.DataSourceMapper
;
import
cn.escheduler.dao.mapper.DatasourceUserMapper
;
...
...
@@ -537,7 +538,7 @@ public class DataSourceService extends BaseService{
putMsg
(
result
,
Status
.
RESOURCE_NOT_EXIST
);
return
result
;
}
if
(
loginUser
.
getId
()
!=
dataSource
.
getUserId
()){
if
(
loginUser
.
getId
()
!=
dataSource
.
getUserId
()
&&
loginUser
.
getUserType
()
!=
UserType
.
ADMIN_USER
){
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PERM
);
return
result
;
}
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
浏览文件 @
bad78b2f
...
...
@@ -24,6 +24,7 @@ import cn.escheduler.api.utils.PageInfo;
import
cn.escheduler.common.enums.Flag
;
import
cn.escheduler.common.enums.ReleaseState
;
import
cn.escheduler.common.enums.TaskType
;
import
cn.escheduler.common.enums.UserType
;
import
cn.escheduler.common.graph.DAG
;
import
cn.escheduler.common.model.TaskNode
;
import
cn.escheduler.common.model.TaskNodeRelation
;
...
...
@@ -365,7 +366,7 @@ public class ProcessDefinitionService extends BaseDAGService {
}
// Determine if the login user is the owner of the process definition
if
(
loginUser
.
getId
()
!=
processDefinition
.
getUserId
())
{
if
(
loginUser
.
getId
()
!=
processDefinition
.
getUserId
()
&&
loginUser
.
getUserType
()
!=
UserType
.
ADMIN_USER
)
{
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PERM
);
return
result
;
}
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
浏览文件 @
bad78b2f
...
...
@@ -76,15 +76,6 @@ public class ProjectService extends BaseService{
return
descCheck
;
}
/**
* only general users can create projects. administrators have no corresponding tenants and can only view
* 管理员没有对应的租户,只能查看,只有普通用户才可以创建项目
*/
if
(!
userService
.
isGeneral
(
loginUser
))
{
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PERM
);
return
result
;
}
Project
project
=
projectMapper
.
queryByName
(
name
);
if
(
project
!=
null
)
{
putMsg
(
result
,
Status
.
PROJECT_ALREADY_EXISTS
,
name
);
...
...
escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
浏览文件 @
bad78b2f
...
...
@@ -21,6 +21,7 @@ import cn.escheduler.api.utils.Constants;
import
cn.escheduler.api.utils.PageInfo
;
import
cn.escheduler.api.utils.Result
;
import
cn.escheduler.common.enums.ResourceType
;
import
cn.escheduler.common.enums.UserType
;
import
cn.escheduler.common.utils.FileUtils
;
import
cn.escheduler.common.utils.HadoopUtils
;
import
cn.escheduler.common.utils.PropertyUtils
;
...
...
@@ -399,7 +400,7 @@ public class ResourcesService extends BaseService {
putMsg
(
result
,
Status
.
RESOURCE_NOT_EXIST
);
return
result
;
}
if
(
loginUser
.
getId
()
!=
resource
.
getUserId
())
{
if
(
loginUser
.
getId
()
!=
resource
.
getUserId
()
&&
loginUser
.
getUserType
()
!=
UserType
.
ADMIN_USER
)
{
putMsg
(
result
,
Status
.
USER_NO_OPERATION_PERM
);
return
result
;
}
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
浏览文件 @
bad78b2f
...
...
@@ -187,7 +187,6 @@ public class UserMapperProvider {
return
new
SQL
()
{{
SELECT
(
"count(0)"
);
FROM
(
TABLE_NAME
);
WHERE
(
"user_type = 1"
);
Object
searchVal
=
parameter
.
get
(
"searchVal"
);
if
(
searchVal
!=
null
&&
StringUtils
.
isNotEmpty
(
searchVal
.
toString
())){
WHERE
(
" user_name like concat('%', #{searchVal}, '%') "
);
...
...
@@ -209,7 +208,6 @@ public class UserMapperProvider {
FROM
(
TABLE_NAME
+
" u "
);
LEFT_OUTER_JOIN
(
"t_escheduler_tenant t on u.tenant_id = t.id"
);
LEFT_OUTER_JOIN
(
"t_escheduler_queue q on t.queue_id = q.id"
);
WHERE
(
"u.user_type = 1"
);
Object
searchVal
=
parameter
.
get
(
"searchVal"
);
if
(
searchVal
!=
null
&&
StringUtils
.
isNotEmpty
(
searchVal
.
toString
())){
WHERE
(
" u.user_name like concat('%', #{searchVal}, '%') "
);
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
浏览文件 @
bad78b2f
...
...
@@ -26,7 +26,7 @@ import Permissions from '@/module/permissions'
* @desc tooltip
*/
const
toolOper
=
(
dagThis
)
=>
{
let
disabled
=
Permissions
.
getAuth
()
===
false
?
false
:
!
dagThis
.
$store
.
state
.
dag
.
isDetails
let
disabled
=
!
dagThis
.
$store
.
state
.
dag
.
isDetails
//
Permissions.getAuth() === false ? false : !dagThis.$store.state.dag.isDetails
return
[
{
code
:
'
pointer
'
,
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
浏览文件 @
bad78b2f
...
...
@@ -8,7 +8,7 @@
:id=
"v"
v-for=
"(item,v) in tasksTypeList"
@
mousedown=
"_getDagId(v)"
>
<div
data-toggle=
"tooltip"
:title=
"item.desc"
:class=
"_isDetails"
>
<div
data-toggle=
"tooltip"
:title=
"item.desc"
>
<div
class=
"icos"
:class=
"'icos-' + v"
></div>
</div>
</div>
...
...
@@ -68,10 +68,9 @@
type=
"primary"
size=
"xsmall"
:loading=
"spinnerLoading"
v-ps=
"['GENERAL_USER']"
@
click=
"_saveChart"
icon=
"fa fa-save"
:disabled=
"isDetails"
>
>
{{
spinnerLoading
?
'
Loading...
'
:
$t
(
'
Save
'
)
}}
</x-button>
</div>
...
...
@@ -205,9 +204,9 @@
* @param item
*/
_getDagId
(
v
)
{
if
(
this
.
isDetails
)
{
return
}
//
if (this.isDetails) {
//
return
//
}
this
.
dagBarId
=
v
},
/**
...
...
@@ -239,11 +238,12 @@
})
},
_operationClass
(
item
)
{
if
(
item
.
disable
)
{
return
this
.
toolOperCode
===
item
.
code
?
'
active
'
:
''
}
else
{
return
'
disable
'
}
return
this
.
toolOperCode
===
item
.
code
?
'
active
'
:
''
// if (item.disable) {
// return this.toolOperCode === item.code ? 'active' : ''
// } else {
// return 'disable'
// }
},
/**
* Storage interface
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
浏览文件 @
bad78b2f
...
...
@@ -165,7 +165,7 @@
<div
class=
"bottom-box"
>
<div
class=
"submit"
style=
"background: #fff;"
>
<x-button
type=
"text"
@
click=
"close()"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
:disabled=
"isDetails"
v-ps=
"['GENERAL_USER']"
>
{{spinnerLoading ? 'Loading...' : $t('Confirm add')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
:disabled=
"isDetails"
>
{{spinnerLoading ? 'Loading...' : $t('Confirm add')}}
</x-button>
</div>
</div>
</div>
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
bad78b2f
...
...
@@ -71,7 +71,7 @@ JSP.prototype.init = function ({ dag, instance }) {
this
.
setConfig
({
isDrag
:
!
store
.
state
.
dag
.
isDetails
,
isAttachment
:
false
,
isNewNodes
:
Permissions
.
getAuth
()
===
false
?
false
:
!
store
.
state
.
dag
.
isDetails
,
isNewNodes
:
!
store
.
state
.
dag
.
isDetails
,
//
Permissions.getAuth() === false ? false : !store.state.dag.isDetails,
isDblclick
:
true
,
isContextmenu
:
true
,
isClick
:
false
...
...
escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
浏览文件 @
bad78b2f
...
...
@@ -62,7 +62,7 @@
</div>
</
template
>
<x-button
type=
"text"
@
click=
"close()"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
@
click=
"ok()"
v-ps=
"['GENERAL_USER']"
>
{{$t('Add')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
@
click=
"ok()"
>
{{$t('Add')}}
</x-button>
</div>
</div>
</div>
...
...
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -56,7 +56,6 @@
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
v-ps=
"['GENERAL_USER']"
:title=
"$t('Edit')"
icon=
"iconfont icon-bianjixiugai"
@
click=
"_edit(item)"
>
...
...
@@ -77,8 +76,7 @@
size=
"xsmall"
icon=
"iconfont icon-shanchu"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
浏览文件 @
bad78b2f
...
...
@@ -3,7 +3,7 @@
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_create('')"
v-ps=
"['GENERAL_USER']"
>
{{
$t
(
'
Create Datasource
'
)
}}
</x-button>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_create('')"
>
{{
$t
(
'
Create Datasource
'
)
}}
</x-button>
</
template
>
</m-conditions>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -58,12 +58,12 @@
<span
v-if=
"!item.scheduleReleaseState"
>
-
</span>
</td>
<td>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
:disabled=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-bianji"
>
<!--
{{
$t
(
'
编辑
'
)
}}
-->
</x-button>
<x-button
type=
"success"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Start')"
@
click=
"_start(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-qidong"
>
<!--
{{
$t
(
'
启动
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu-copy"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-erji-xiaxianjilu"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-paibanguanli"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
:disabled=
"item.releaseState === 'ONLINE'"
icon=
"iconfont icon-bianji"
>
<!--
{{
$t
(
'
编辑
'
)
}}
-->
</x-button>
<x-button
type=
"success"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Start')"
@
click=
"_start(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
icon=
"iconfont icon-qidong"
>
<!--
{{
$t
(
'
启动
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
icon=
"iconfont icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
icon=
"iconfont icon-erji-xiaxianjilu-copy"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
icon=
"iconfont icon-erji-xiaxianjilu"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
icon=
"iconfont icon-paibanguanli"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-poptip
:ref=
"'poptip-delete-' + $index"
placement=
"bottom-end"
...
...
@@ -81,8 +81,7 @@
size=
"xsmall"
:disabled=
"item.releaseState === 'ONLINE'"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
浏览文件 @
bad78b2f
...
...
@@ -137,7 +137,7 @@
</
template
>
<div
class=
"submit"
>
<x-button
type=
"text"
@
click=
"close()"
>
{{$t('Cancel')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
v-ps=
"['GENERAL_USER']"
>
{{spinnerLoading ? 'Loading...' : $t('Start')}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
>
{{spinnerLoading ? 'Loading...' : $t('Start')}}
</x-button>
</div>
</div>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
浏览文件 @
bad78b2f
...
...
@@ -3,7 +3,7 @@
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button
type=
"ghost"
size=
"small"
v-ps=
"['GENERAL_USER']"
@
click=
"() => this.$router.push(
{name: 'definition-create'})">
{{
$t
(
'
Create process
'
)
}}
</x-button>
<x-button
type=
"ghost"
size=
"small"
@
click=
"() => this.$router.push(
{name: 'definition-create'})">
{{
$t
(
'
Create process
'
)
}}
</x-button>
</
template
>
</m-conditions>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -73,7 +73,6 @@
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_reEdit(item)"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-bianjixiugai"
:disabled=
"item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"
></x-button>
<x-button
type=
"info"
...
...
@@ -82,7 +81,6 @@
data-toggle=
"tooltip"
:title=
"$t('Rerun')"
@
click=
"_reRun(item,$index)"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-shuaxin"
:disabled=
"item.state !== 'SUCCESS' && item.state !== 'PAUSE' && item.state !== 'FAILURE' && item.state !== 'STOP'"
></x-button>
<x-button
type=
"success"
...
...
@@ -91,7 +89,6 @@
data-toggle=
"tooltip"
:title=
"$t('Recovery Failed')"
@
click=
"_restore(item,$index)"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-cuowuguanbishibai"
:disabled=
"item.state !== 'FAILURE'"
></x-button>
<x-button
type=
"error"
...
...
@@ -100,7 +97,6 @@
data-toggle=
"tooltip"
:title=
"$t('Stop')"
@
click=
"_stop(item)"
v-ps=
"['GENERAL_USER']"
icon=
"iconfont icon-zanting1"
:disabled=
"item.state !== 'RUNNING_EXEUTION'"
></x-button>
<x-button
type=
"warning"
...
...
@@ -109,7 +105,6 @@
data-toggle=
"tooltip"
:title=
"item.state === 'PAUSE' ? $t('Recovery Suspend') : $t('Pause')"
@
click=
"_suspend(item,$index)"
v-ps=
"['GENERAL_USER']"
:icon=
"item.state === 'PAUSE' ? 'iconfont icon-ai06' : 'iconfont icon-zanting'"
:disabled=
"item.state !== 'RUNNING_EXEUTION' && item.state !== 'PAUSE'"
></x-button>
<x-poptip
...
...
@@ -128,8 +123,7 @@
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -63,8 +63,7 @@
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
icon=
"iconfont icon-bianjixiugai"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-bianjixiugai"
>
</x-button>
<x-poptip
:ref=
"'poptip-' + $index"
...
...
@@ -82,8 +81,7 @@
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('delete')"
icon=
"iconfont icon-shanchu"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-shanchu"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
浏览文件 @
bad78b2f
...
...
@@ -3,7 +3,7 @@
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_create('')"
v-ps=
"['GENERAL_USER']"
>
{{
$t
(
'
Create Project
'
)
}}
</x-button>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_create('')"
>
{{
$t
(
'
Create Project
'
)
}}
</x-button>
</
template
>
</m-conditions>
</template>
...
...
@@ -113,4 +113,4 @@
},
components
:
{
mListConstruction
,
mSpin
,
mConditions
,
mList
,
mCreateProject
,
mNoData
}
}
</
script
>
\ No newline at end of file
</
script
>
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
浏览文件 @
bad78b2f
...
...
@@ -49,7 +49,7 @@
<
template
slot=
"name"
>
</
template
>
<
template
slot=
"content"
>
<div
class=
"submit"
>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
v-ps=
"['GENERAL_USER']"
>
{{
spinnerLoading
?
'
Loading...
'
:
$t
(
'
Create
'
)
}}
</x-button>
<x-button
type=
"primary"
shape=
"circle"
:loading=
"spinnerLoading"
@
click=
"ok()"
>
{{
spinnerLoading
?
'
Loading...
'
:
$t
(
'
Create
'
)
}}
</x-button>
<x-button
type=
"text"
@
click=
"() => $router.push(
{name: 'file'})">
{{
$t
(
'
Cancel
'
)
}}
</x-button>
</div>
</
template
>
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -51,8 +51,7 @@
:title=
"$t('Edit')"
:disabled=
"_rtDisb(item)"
@
click=
"_edit(item,$index)"
icon=
"iconfont icon-bianjixiugai"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-bianjixiugai"
>
</x-button>
<x-button
type=
"info"
...
...
@@ -61,8 +60,7 @@
icon=
"iconfont icon-wendangxiugai"
data-toggle=
"tooltip"
:title=
"$t('Rename')"
@
click=
"_rename(item,$index)"
v-ps=
"['GENERAL_USER']"
>
@
click=
"_rename(item,$index)"
>
</x-button>
<x-button
...
...
@@ -72,8 +70,7 @@
data-toggle=
"tooltip"
:title=
"$t('Download')"
@
click=
"_downloadFile(item)"
icon=
"iconfont icon-download"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-download"
>
</x-button>
<x-poptip
...
...
@@ -92,8 +89,7 @@
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
...
...
@@ -210,4 +206,4 @@
},
components
:
{
}
}
</
script
>
\ No newline at end of file
</
script
>
escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
浏览文件 @
bad78b2f
...
...
@@ -4,8 +4,8 @@
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button-group
size=
"small"
>
<x-button
type=
"ghost"
@
click=
"() => $router.push(
{name: 'resource-file-create'})"
v-ps="['GENERAL_USER']"
>
{{
$t
(
'
Create File
'
)
}}
</x-button>
<x-button
type=
"ghost"
@
click=
"_uploading"
v-ps=
"['GENERAL_USER']"
>
{{
$t
(
'
Upload Files
'
)
}}
</x-button>
<x-button
type=
"ghost"
@
click=
"() => $router.push(
{name: 'resource-file-create'})">
{{
$t
(
'
Create File
'
)
}}
</x-button>
<x-button
type=
"ghost"
@
click=
"_uploading"
>
{{
$t
(
'
Upload Files
'
)
}}
</x-button>
</x-button-group>
</
template
>
</m-conditions>
...
...
@@ -98,4 +98,4 @@
},
components
:
{
mListConstruction
,
mConditions
,
mList
,
mSpin
,
mNoData
}
}
</
script
>
\ No newline at end of file
</
script
>
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
浏览文件 @
bad78b2f
<
template
>
v-ps
<
template
>
<div
class=
"list-model"
>
<div
class=
"table-box"
>
<table
class=
"fixed"
>
...
...
@@ -70,8 +70,7 @@
data-toggle=
"tooltip"
:title=
"$t('Edit')"
@
click=
"_edit(item)"
icon=
"iconfont icon-bianjixiugai"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-bianjixiugai"
>
</x-button>
<x-poptip
:ref=
"'poptip-' + $index"
...
...
@@ -89,8 +88,7 @@
size=
"xsmall"
icon=
"iconfont icon-shanchu"
data-toggle=
"tooltip"
:title=
"$t('delete')"
v-ps=
"['GENERAL_USER']"
>
:title=
"$t('delete')"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
浏览文件 @
bad78b2f
...
...
@@ -3,7 +3,7 @@
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button
type=
"ghost"
@
click=
"_create"
v-ps=
"['GENERAL_USER']"
size=
"small"
>
{{
$t
(
'
Create UDF Function
'
)
}}
</x-button>
<x-button
type=
"ghost"
@
click=
"_create"
size=
"small"
>
{{
$t
(
'
Create UDF Function
'
)
}}
</x-button>
</
template
>
</m-conditions>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -58,8 +58,7 @@
icon=
"iconfont icon-wendangxiugai"
data-toggle=
"tooltip"
:title=
"$t('Rename')"
@
click=
"_rename(item,$index)"
v-ps=
"['GENERAL_USER']"
>
@
click=
"_rename(item,$index)"
>
</x-button>
<x-button
type=
"info"
...
...
@@ -68,8 +67,7 @@
data-toggle=
"tooltip"
:title=
"$t('Download')"
icon=
"iconfont icon-download"
@
click=
"_downloadFile(item)"
v-ps=
"['GENERAL_USER']"
>
@
click=
"_downloadFile(item)"
>
</x-button>
<x-poptip
:ref=
"'poptip-' + $index"
...
...
@@ -87,8 +85,7 @@
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('delete')"
icon=
"iconfont icon-shanchu"
v-ps=
"['GENERAL_USER']"
>
icon=
"iconfont icon-shanchu"
>
</x-button>
</
template
>
</x-poptip>
...
...
escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
浏览文件 @
bad78b2f
...
...
@@ -3,7 +3,7 @@
<template
slot=
"conditions"
>
<m-conditions
@
on-conditions=
"_onConditions"
>
<template
slot=
"button-group"
>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_uploading"
v-ps=
"['GENERAL_USER']"
>
{{
$t
(
'
Upload UDF Resources
'
)
}}
</x-button>
<x-button
type=
"ghost"
size=
"small"
@
click=
"_uploading"
>
{{
$t
(
'
Upload UDF Resources
'
)
}}
</x-button>
</
template
>
</m-conditions>
</template>
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
浏览文件 @
bad78b2f
...
...
@@ -98,7 +98,9 @@
userName
:
''
,
userPassword
:
''
,
tenantId
:
{},
queueName
:
{},
queueName
:
{
id
:
''
},
email
:
''
,
phone
:
''
,
tenantList
:
[],
...
...
@@ -197,6 +199,7 @@
},
_submit
()
{
this
.
$refs
[
'
popup
'
].
spinnerLoading
=
true
console
.
log
(
this
.
tenantId
.
id
)
let
param
=
{
userName
:
this
.
userName
,
userPassword
:
this
.
userPassword
,
...
...
@@ -205,9 +208,11 @@
queue
:
this
.
queueName
.
code
,
phone
:
this
.
phone
}
if
(
this
.
item
)
{
param
.
id
=
this
.
item
.
id
}
this
.
store
.
dispatch
(
`security/
${
this
.
item
?
'
updateUser
'
:
'
createUser
'
}
`
,
param
).
then
(
res
=>
{
setTimeout
(()
=>
{
this
.
$refs
[
'
popup
'
].
spinnerLoading
=
false
...
...
@@ -232,7 +237,7 @@
this
.
phone
=
this
.
item
.
phone
this
.
tenantId
=
_
.
find
(
this
.
tenantList
,
[
'
id
'
,
this
.
item
.
tenantId
])
this
.
$nextTick
(()
=>
{
this
.
queueName
=
_
.
find
(
this
.
queueList
,
[
'
code
'
,
this
.
item
.
queue
])
this
.
queueName
=
_
.
find
(
this
.
queueList
,
[
'
code
'
,
this
.
item
.
queue
])
||
{
id
:
''
}
})
}
})
...
...
@@ -243,7 +248,7 @@
this
.
email
=
this
.
item
.
email
this
.
phone
=
this
.
item
.
phone
this
.
tenantId
.
id
=
this
.
item
.
tenantId
this
.
queueName
=
{
queue
:
this
.
item
.
queue
}
this
.
queueName
=
{
queue
:
this
.
item
.
queue
}
}
}
},
...
...
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
浏览文件 @
bad78b2f
...
...
@@ -9,6 +9,9 @@
<th>
<span>
{{
$t
(
'
User Name
'
)
}}
</span>
</th>
<th>
<span>
用户类型
</span>
</th>
<th>
<span>
{{
$t
(
'
Tenant
'
)
}}
</span>
</th>
...
...
@@ -21,6 +24,7 @@
<th>
<span>
{{
$t
(
'
Phone
'
)
}}
</span>
</th>
<th>
<span>
{{
$t
(
'
Create Time
'
)
}}
</span>
</th>
...
...
@@ -40,6 +44,9 @@
<a
href=
"javascript:"
class=
"links"
>
{{
item
.
userName
||
'
-
'
}}
</a>
</span>
</td>
<td>
<span>
{{
item
.
userType
===
'
GENERAL_USER
'
?
`${$t('Ordinary users')
}
`
:
`${$t('Administrator')
}
`
}}
<
/span
>
<
/td
>
<
td
><
span
>
{{
item
.
tenantName
||
'
-
'
}}
<
/span></
td
>
<
td
><
span
>
{{
item
.
queue
||
'
-
'
}}
<
/span></
td
>
<
td
>
...
...
@@ -62,7 +69,7 @@
<
a
href
=
"
javascript:
"
@
click
=
"
_authUdfFunc(item,$index)
"
>
{{
$t
(
'
UDF Function
'
)
}}
<
/a
>
<
/div
>
<
template
slot
=
"
reference
"
>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Authorize')"
icon=
"iconfont icon-yonghu1"
></x-button>
<
x
-
button
type
=
"
warning
"
shape
=
"
circle
"
size
=
"
xsmall
"
data
-
toggle
=
"
tooltip
"
:
title
=
"
$t('Authorize')
"
icon
=
"
iconfont icon-yonghu1
"
:
disabled
=
"
item.userType === 'ADMIN_USER'
"
><
/x-button
>
<
/template
>
<
/x-poptip
>
...
...
@@ -84,6 +91,7 @@
size
=
"
xsmall
"
data
-
toggle
=
"
tooltip
"
:
title
=
"
$t('delete')
"
:
disabled
=
"
item.userType === 'ADMIN_USER'
"
icon
=
"
iconfont icon-shanchu
"
>
<
/x-button
>
<
/template
>
...
...
escheduler-ui/src/js/module/mixin/disabledState.js
浏览文件 @
bad78b2f
...
...
@@ -28,11 +28,11 @@ export default {
}
},
created
()
{
this
.
isDetails
=
Permissions
.
getAuth
()
?
this
.
store
.
state
.
dag
.
isDetails
:
true
this
.
isDetails
=
this
.
store
.
state
.
dag
.
isDetails
//
Permissions.getAuth() ? this.store.state.dag.isDetails : true
},
computed
:
{
_isDetails
()
{
return
this
.
isDetails
?
'
icon-disabled
'
:
''
return
''
//
this.isDetails ? 'icon-disabled' : ''
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录