yili/vue-apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/yilidev/yilipalkaifa/vue-apps

Browse Source
This commit is contained in:
446052889@qq.com 2022-07-12 08:51:06 +08:00
commit d9f165b8f0
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.actionsoft.apps.coe.pal.cooperation/src/views/manage/ManageList.vue
View File

@ -136,7 +136,7 @@
<div style="width: 30px;display: inline-block;">
<div class="operate-icon-display">
<el-tooltip content="用户权限" placement="bottom" :hide-after=2000>
<i class="iconfont icon-jiaoseguanli" style="cursor: pointer;padding-right: 10px;" @click="updateUser(scope.row.userId)"></i>
<i class="awsui-iconfont" style="cursor: pointer;padding-right: 10px;" @click="updateUser(scope.row.userId)">&#xe615;</i>
</el-tooltip>
<el-tooltip content="修改角色" placement="bottom" :hide-after=2000>
<i class="iconfont icon-jiaoseguanli" style="cursor: pointer;padding-right: 10px;" @click="updateRole(scope.row.userId)"></i>

18
com.actionsoft.apps.coe.pal/src/views/repository/RepositoryInfoVersion.vue
View File

@ -73,7 +73,7 @@
</template>
</template>
<el-table-column
v-if="havingVersionManagePerm && tableData.length > 1"
v-if="(isOlderVersion ? havingVersionManagePerm : filePerm.havingVersionManagePerm ) && tableData.length > 1"
prop="name"
label="使用"
align="center"
@ -94,9 +94,9 @@
label="操作">
<template slot-scope="scope">
<!-- <el-tooltip content="以当前版本为模版创建新版本文件" placement="bottom" hide-after="3000">-->
<i v-if="havingWritePerm" class="iconfont icon-fuzhi operate-icon-display" style="cursor: pointer;" @click="createNewVersion(scope.row.id, scope.row.versionNo)"></i>
<i v-if="isOlderVersion ? havingWritePerm : filePerm.havingWritePerm" class="iconfont icon-fuzhi operate-icon-display" style="cursor: pointer;" @click="createNewVersion(scope.row.id, scope.row.versionNo)"></i>
<!-- </el-tooltip>-->
<i v-if="havingRemovePerm && !isCorrelatebpms && !scope.row.isUse && !scope.row.isPublish && !scope.row.isApproval" class="iconfont icon-lajitong1 operate-icon-display" style="cursor: pointer;padding-left: 5px;" @click="deleteRepository(scope.row.id, scope.row.versionNo)"></i>
<i v-if="(isOlderVersion ? havingRemovePerm : filePerm.havingRemovePerm )&& !isCorrelatebpms && !scope.row.isUse && !scope.row.isPublish && !scope.row.isApproval" class="iconfont icon-lajitong1 operate-icon-display" style="cursor: pointer;padding-left: 5px;" @click="deleteRepository(scope.row.id, scope.row.versionNo)"></i>
</template>
</el-table-column>
</el-table>
@ -157,7 +157,13 @@
addNewVersionVisible: false,
currentVersion: '',
currentId: '',
isLargeIteration: true
isLargeIteration: true,
isOlderVersion: true,
filePerm:{
havingRemovePerm:false,
havingVersionManagePerm: false,
havingWritePerm: false
}
}
},
created() {
@ -209,6 +215,10 @@
}
}
that.tableData = ro.data.tableData;
that.isOlderVersion = ro.data.isOlderVersion;
that.filePerm.havingWritePerm = ro.data.havingWritePerm;
that.filePerm.havingRemovePerm = ro.data.havingRemovePerm;
that.filePerm.havingVersionManagePerm = ro.data.havingVersionManagePerm;
} else {
that.$message.error(ro.msg);
}

13
com.actionsoft.apps.coe.pal/src/views/repository/RepositoryList.vue
View File

@ -51,7 +51,7 @@
<el-dropdown-item class="el-dropdown-row" @click.native="exportFiles(mainRepository.id)">
<div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">导出</span></div>
</el-dropdown-item>
<el-dropdown-item v-if="havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(mainRepository.id)">
<el-dropdown-item v-if="isOlderVersion ? havingRemovePerm : filePerm.havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(mainRepository.id)">
<div class="text-important-color" style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont icon-lajitong1" style="font-size: 12px;"></i></span><span style="font-size: 12px;">删除模型</span></div>
</el-dropdown-item>
@ -64,7 +64,7 @@
</template>
</div>
<!-- 流程库批处理，应用安装且当前为流程分类下显示 -->
<div v-if="isOlderVersion ? batchAppVisible && uuid == 'process' : havingBatchPerm && uuid == 'process' " style="float:right;position:relative;right: 10px;display:inline-block;">
<div v-if="batchAppVisible && uuid == 'process'" style="float:right;position:relative;right: 10px;display:inline-block;">
<!-- 小组模式下不能进行批量创建 -->
<awsui-button v-if="$store.getters.getTeamIdFn != null" id="batchCreateButton" visit-type="" style="width: 100px;margin: 0;border-bottom-right-radius: 0px;border-top-right-radius: 0px;" class="button-general-color-reverse" @click="batchCreateFn">批量创建</awsui-button>
<!-- 批量替换 -->
@ -189,7 +189,7 @@
<el-dropdown-item class="el-dropdown-row" @click.native="exportFiles(scope.row.id)">
<div style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"></span><span style="font-size: 12px;">导出</span></div>
</el-dropdown-item>
<el-dropdown-item v-if="havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(scope.row.id)">
<el-dropdown-item v-if="isOlderVersion ? havingRemovePerm : filePerm.havingRemovePerm" divided style="height: 30px;line-height: 30px;" @click.native="removeFiles(scope.row.id)">
<div class="text-important-color" style="height: 100%;width: 100%;font-size: 14px;"><span style="display: inline-block;width: 20px;"><i class="iconfont icon-lajitong1" style="font-size: 12px;"></i></span><span style="font-size: 12px;">删除模型</span></div>
</el-dropdown-item>
</el-dropdown-menu>
@ -274,10 +274,10 @@
<div style="border-top: 1px solid #F2F2F2;height: 44px;">
<div style="padding: 8px 8px 8px 34px;">
<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"></el-checkbox>
<awsui-button v-if="havingWritePerm" style="width: 100px;margin-left: 15px;" class="button-general-color" type="primary" @click="moveFiles">移动至</awsui-button>
<awsui-button v-if="havingWritePerm" style="width: 100px;" class="button-general-color-reverse" plain @click="copyFiles()">创建副本</awsui-button>
<awsui-button v-if="isOlderVersion ? havingWritePerm : true " style="width: 100px;margin-left: 15px;" class="button-general-color" type="primary" @click="moveFiles">移动至</awsui-button>
<awsui-button v-if="isOlderVersion ? havingWritePerm : true" style="width: 100px;" class="button-general-color-reverse" plain @click="copyFiles()">创建副本</awsui-button>
<awsui-button style="width: 100px;" class="button-general-color-reverse" plain @click="exportFiles()">导出</awsui-button>
<awsui-button v-if="havingRemovePerm" style="width: 100px;" class="button-general-color-reverse2" plain @click="removeFiles()">删除</awsui-button>
<awsui-button v-if="isOlderVersion ? havingRemovePerm : true" style="width: 100px;" class="button-general-color-reverse2" plain @click="removeFiles()">删除</awsui-button>
<awsui-button style="width: 100px;" class="button-general-color-reverse3" plain @click="closeFooter">取消</awsui-button>
</div>
</div>
@ -882,6 +882,7 @@
url:'jd',
data:{
cmd: 'com.actionsoft.apps.coe.pal_processlevel_move_save',
teamId: that.$store.getters.getTeamIdFn,
sourceData: sourceData,
targetData: JSON.stringify(data)
}