bug编号00000043,角色图搜索,或者打开目录导致系统繁忙(角色图按照创建时间维度进行树组建)
This commit is contained in:
parent
e984e2cf4d
commit
64080c927b
@ -16,7 +16,7 @@
|
|||||||
<span @click="initData">{{item.name}}</span>
|
<span @click="initData">{{item.name}}</span>
|
||||||
<!--面包屑 中文件,文件夹的操作-->
|
<!--面包屑 中文件,文件夹的操作-->
|
||||||
|
|
||||||
<div v-if="undefined != mainRepository" style="width: 16px; margin-left: 10px;" class="cur-title-operate">
|
<div v-if="undefined != mainRepository && (mainRepository.isVirtual == undefined || !mainRepository.isVirtual)" style="width: 16px; margin-left: 10px;" class="cur-title-operate">
|
||||||
<div class="operate-icon-display">
|
<div class="operate-icon-display">
|
||||||
<el-dropdown
|
<el-dropdown
|
||||||
:hide-on-click="true"
|
:hide-on-click="true"
|
||||||
@ -101,6 +101,7 @@
|
|||||||
class-name="rowDropFilter el-table-column--selection"
|
class-name="rowDropFilter el-table-column--selection"
|
||||||
type="selection"
|
type="selection"
|
||||||
width="40"
|
width="40"
|
||||||
|
:selectable="checkSelectable"
|
||||||
align="left">
|
align="left">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@ -118,7 +119,7 @@
|
|||||||
<div class="div-repository-title rowDropFilter">
|
<div class="div-repository-title rowDropFilter">
|
||||||
<p class="text-general-color" style="cursor: pointer;" @click="positionTableRoleRepository(scope.row.id, scope.row.versionId, scope.row.childSize, scope.row.folder)">
|
<p class="text-general-color" style="cursor: pointer;" @click="positionTableRoleRepository(scope.row.id, scope.row.versionId, scope.row.childSize, scope.row.folder)">
|
||||||
{{scope.row.name}}
|
{{scope.row.name}}
|
||||||
<span style="color: #909399;margin-left: 12px;">( {{ scope.row.versionStatus.versionNo }} )</span>
|
<span v-if="(scope.row.isVirtual == undefined || !scope.row.isVirtual)" style="color: #909399;margin-left: 12px;">( {{ scope.row.versionStatus.versionNo }} )</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -143,7 +144,7 @@
|
|||||||
align="right"
|
align="right"
|
||||||
width="135">
|
width="135">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div style="width: 16px;display: inline-block;">
|
<div v-if="(scope.row.isVirtual == undefined || !scope.row.isVirtual)" style="width: 16px;display: inline-block;">
|
||||||
<div class="operate-icon-display">
|
<div class="operate-icon-display">
|
||||||
<el-tooltip v-if="((crrentUserId == 'admin') || (crrentUserId != 'admin' && scope.row.methodId == 'default')) && scope.row.folder && (isOlderVersion ? havingWritePerm : scope.row.havingWritePerm) " placement="bottom" :hide-after=2000>
|
<el-tooltip v-if="((crrentUserId == 'admin') || (crrentUserId != 'admin' && scope.row.methodId == 'default')) && scope.row.folder && (isOlderVersion ? havingWritePerm : scope.row.havingWritePerm) " placement="bottom" :hide-after=2000>
|
||||||
<span slot="content">修改{{scope.row.methodName}}</span>
|
<span slot="content">修改{{scope.row.methodName}}</span>
|
||||||
@ -154,7 +155,7 @@
|
|||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 16px;margin: 0 15px;display: inline-block;">
|
<div v-if="(scope.row.isVirtual == undefined || !scope.row.isVirtual)" style="width: 16px;margin: 0 15px;display: inline-block;">
|
||||||
<div v-if="scope.row.isFavorite" style="display: inline-block;">
|
<div v-if="scope.row.isFavorite" style="display: inline-block;">
|
||||||
<el-tooltip content="取消收藏" placement="bottom" :hide-after=2000>
|
<el-tooltip content="取消收藏" placement="bottom" :hide-after=2000>
|
||||||
<i class="iconfont" style="cursor: pointer;color: #FFB800;" @click="setFavorite('0', scope.row.versionId, scope.row.id)"></i>
|
<i class="iconfont" style="cursor: pointer;color: #FFB800;" @click="setFavorite('0', scope.row.versionId, scope.row.id)"></i>
|
||||||
@ -166,7 +167,7 @@
|
|||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 16px;display: inline-block;margin-right: 5px;">
|
<div v-if="(scope.row.isVirtual == undefined || !scope.row.isVirtual)" style="width: 16px;display: inline-block;margin-right: 5px;">
|
||||||
<div class="operate-icon-display">
|
<div class="operate-icon-display">
|
||||||
<el-dropdown
|
<el-dropdown
|
||||||
:hide-on-click="true"
|
:hide-on-click="true"
|
||||||
@ -897,6 +898,9 @@
|
|||||||
that.setCurrentRow(that.tableData[0]);
|
that.setCurrentRow(that.tableData[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (ro.data.mainRepository.isVirtual != undefined && ro.data.mainRepository.isVirtual) {
|
||||||
|
that.isShow = false;
|
||||||
|
}
|
||||||
|
|
||||||
//默认收起操作
|
//默认收起操作
|
||||||
/*that.newwidth ='28px';
|
/*that.newwidth ='28px';
|
||||||
@ -935,6 +939,12 @@
|
|||||||
// 查询数据
|
// 查询数据
|
||||||
awsuiAxios.post(data).then(function (ro) {
|
awsuiAxios.post(data).then(function (ro) {
|
||||||
if(ro.result == 'ok') {
|
if(ro.result == 'ok') {
|
||||||
|
if (ro.data.isVirtual != undefined && ro.data.isVirtual) {// 虚拟节点,关闭模型详情
|
||||||
|
that.isShow = false;
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
that.isShow = true;
|
||||||
|
}
|
||||||
that.currRepositoryDetail.name = ro.data.name;
|
that.currRepositoryDetail.name = ro.data.name;
|
||||||
that.currRepositoryDetail.id = ro.data.id;
|
that.currRepositoryDetail.id = ro.data.id;
|
||||||
that.currRepositoryDetail.desc = ro.data.desc;
|
that.currRepositoryDetail.desc = ro.data.desc;
|
||||||
@ -2001,6 +2011,9 @@
|
|||||||
let tag = {value: data.versionId, label: data.name};
|
let tag = {value: data.versionId, label: data.name};
|
||||||
this.subProcess.tags.push(tag);
|
this.subProcess.tags.push(tag);
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
checkSelectable(row) {
|
||||||
|
return row.isVirtual == undefined || !row.isVirtual;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user