diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
index 36b9b45861..9081a436cf 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java
@@ -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;
}
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
index 45ff487f5e..76c7173f02 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java
@@ -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;
}
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
index c90d4da779..30d8f827aa 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java
@@ -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);
diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
index 291c59ea22..b59e43387b 100644
--- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
+++ b/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java
@@ -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;
}
diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
index 4a7df12a0f..363cd38f6a 100644
--- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
+++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
@@ -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}, '%') ");
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index 740846890c..9c1065870f 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -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',
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 37c4119676..2c0422c701 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -8,7 +8,7 @@
:id="v"
v-for="(item,v) in tasksTypeList"
@mousedown="_getDagId(v)">
-
@@ -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')}}
@@ -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
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 7f36417a3a..863a44abf5 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -165,7 +165,7 @@
{{$t('Cancel')}}
- {{spinnerLoading ? 'Loading...' : $t('Confirm add')}}
+ {{spinnerLoading ? 'Loading...' : $t('Confirm add')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index e2c0c677a9..440deb48fb 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -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
diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
index 8e11dca356..f7de034db5 100644
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@@ -62,7 +62,7 @@
{{$t('Cancel')}}
- {{$t('Add')}}
+ {{$t('Add')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index b32aeeb6bc..a08051bc35 100644
--- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -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')">
diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
index de94e0ee21..8d5012700f 100644
--- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@@ -3,7 +3,7 @@
- {{$t('Create Datasource')}}
+ {{$t('Create Datasource')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index aa2be8ef8e..f9e8dba231 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -58,12 +58,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+ :title="$t('delete')">
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index ddb6b0a156..c2e3c33728 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -137,7 +137,7 @@
{{$t('Cancel')}}
- {{spinnerLoading ? 'Loading...' : $t('Start')}}
+ {{spinnerLoading ? 'Loading...' : $t('Start')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
index bc63896c17..bf8612dd98 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@@ -3,7 +3,7 @@
- this.$router.push({name: 'definition-create'})">{{$t('Create process')}}
+ this.$router.push({name: 'definition-create'})">{{$t('Create process')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index f98383c558..2bc1cad066 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -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'">
+ :title="$t('delete')">
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
index 087b50032a..21a58fc1ea 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
@@ -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">
+ icon="iconfont icon-shanchu">
diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
index 6031b590e0..7b2f555192 100644
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
@@ -3,7 +3,7 @@
- {{$t('Create Project')}}
+ {{$t('Create Project')}}
@@ -113,4 +113,4 @@
},
components: { mListConstruction, mSpin, mConditions, mList, mCreateProject, mNoData }
}
-
\ No newline at end of file
+
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
index d08ed7f8dd..bf3ebe044d 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
@@ -49,7 +49,7 @@
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
$router.push({name: 'file'})"> {{$t('Cancel')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index 40c03ff7a0..89acc74dd6 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -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">
+ @click="_rename(item,$index)">
+ icon="iconfont icon-download">
+ :title="$t('delete')">
@@ -210,4 +206,4 @@
},
components: { }
}
-
\ No newline at end of file
+
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index 6555d7a6d4..7434772899 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -4,8 +4,8 @@
- $router.push({name: 'resource-file-create'})" v-ps="['GENERAL_USER']">{{$t('Create File')}}
- {{$t('Upload Files')}}
+ $router.push({name: 'resource-file-create'})">{{$t('Create File')}}
+ {{$t('Upload Files')}}
@@ -98,4 +98,4 @@
},
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
-
\ No newline at end of file
+
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index 8d96ede359..ad0c510c87 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -1,4 +1,4 @@
-
+v-ps
@@ -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">
+ :title="$t('delete')">
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index 84a79be603..9ce2373292 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -3,7 +3,7 @@
- {{$t('Create UDF Function')}}
+ {{$t('Create UDF Function')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index 672f8b5226..4077f13bc0 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -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)">
+ @click="_downloadFile(item)">
+ icon="iconfont icon-shanchu">
diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index ed9a81a705..228501dbed 100644
--- a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -3,7 +3,7 @@
- {{$t('Upload UDF Resources')}}
+ {{$t('Upload UDF Resources')}}
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index 9d3ab042d8..b02db7848e 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -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}
}
}
},
diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
index 125a3dfd93..e97886a61b 100644
--- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue
@@ -9,6 +9,9 @@
{{$t('User Name')}}
|
+
+ 用户类型
+ |
{{$t('Tenant')}}
|
@@ -21,6 +24,7 @@
{{$t('Phone')}}
|
+
{{$t('Create Time')}}
|
@@ -40,6 +44,9 @@
{{item.userName || '-'}}
+
+ {{item.userType === 'GENERAL_USER' ? `${$t('Ordinary users')}` : `${$t('Administrator')}`}}
+ |
{{item.tenantName || '-'}} |
{{item.queue || '-'}} |
@@ -62,7 +69,7 @@
{{$t('UDF Function')}}
-
+
@@ -84,6 +91,7 @@
size="xsmall"
data-toggle="tooltip"
:title="$t('delete')"
+ :disabled="item.userType === 'ADMIN_USER'"
icon="iconfont icon-shanchu">
diff --git a/escheduler-ui/src/js/module/mixin/disabledState.js b/escheduler-ui/src/js/module/mixin/disabledState.js
index 7c0b1f8e92..4b814a1908 100644
--- a/escheduler-ui/src/js/module/mixin/disabledState.js
+++ b/escheduler-ui/src/js/module/mixin/disabledState.js
@@ -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' : ''
}
}
}
| |