|
|
@@ -110,7 +110,7 @@ export default {
|
|
|
// 已选资源有变更，则可以直接保存，无变更，则需要至少选中一条
|
|
|
// 判断有无变更的标准：resourceInfos的funId 与getSetFunIdsByUser方法返回的已选资源id作匹配
|
|
|
if (applyKeys.length == 0 && cancelKeys.length == 0) {
|
|
|
- this.$message.warning('请至少选择一条功能资源！');
|
|
|
+ this.$message.warning('已选资源无变更，请至少变更一条');
|
|
|
} else {
|
|
|
this.$emit('success', approveContent, cancelContent, this.selectedValue, resourceInfos);
|
|
|
}
|
|
|
@@ -171,16 +171,16 @@ export default {
|
|
|
|
|
|
async created() {
|
|
|
this.data = await this.getAllTree();
|
|
|
- if (this.type == 'add') {
|
|
|
- // 已有资源，包含了父节点
|
|
|
- this.havefunIds = await this.getSetFunIdsByUser();
|
|
|
- // 已有资源，只是子节点
|
|
|
- this.havefunIdsOnlyChild = this.getChildKeys(this.data, this.havefunIds);
|
|
|
- }
|
|
|
-
|
|
|
+ // 已有资源，包含了父节点
|
|
|
+ this.havefunIds = await this.getSetFunIdsByUser();
|
|
|
+ // 已有资源，只是子节点
|
|
|
+ this.havefunIdsOnlyChild = this.getChildKeys(this.data, this.havefunIds);
|
|
|
const keys = this.selectKeys;
|
|
|
if (this.needFilter && this.havefunIds.length > 0) {
|
|
|
- this.selectedValue = [...this.getChildKeys(this.data, keys), ...this.havefunIdsOnlyChild];
|
|
|
+ this.selectedValue = [...this.getChildKeys(this.data, keys)];
|
|
|
+ if (this.type == 'add') {
|
|
|
+ this.selectedValue = [...this.selectedValue, ...this.havefunIdsOnlyChild];
|
|
|
+ }
|
|
|
} else {
|
|
|
this.selectedValue = keys;
|
|
|
}
|
林倩