Merge branch 'master-V32-LH' into 'master'
修改文档管理 节点删除刷新,添加子节点 See merge request !146
Showing
2 changed files
with
13 additions
and
4 deletions
@@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
20 | <a @click="editType(data)" style="margin-right: 10px;"> | 20 | <a @click="editType(data)" style="margin-right: 10px;"> |
21 | <i class="el-icon-edit"></i> | 21 | <i class="el-icon-edit"></i> |
22 | </a> | 22 | </a> |
23 | - <a @click="showFolder(true,false)" style="margin-right: 10px;"> | 23 | + <a @click="showFolder(true,false,node) " style="margin-right: 10px;"> |
24 | <i class="el-icon-plus"></i> | 24 | <i class="el-icon-plus"></i> |
25 | </a> | 25 | </a> |
26 | <a @click="deleteDocument(data.id,'folder')"> | 26 | <a @click="deleteDocument(data.id,'folder')"> |
@@ -289,7 +289,7 @@ export default { | @@ -289,7 +289,7 @@ export default { | ||
289 | */ | 289 | */ |
290 | let nodeClick = (node, data) => { | 290 | let nodeClick = (node, data) => { |
291 | let id = data.id; | 291 | let id = data.id; |
292 | - //currentNodeData.value = data; | 292 | + currentNodeData.value = node.data; |
293 | 293 | ||
294 | let arr = []; | 294 | let arr = []; |
295 | arr.push(id); | 295 | arr.push(id); |
@@ -367,6 +367,8 @@ export default { | @@ -367,6 +367,8 @@ export default { | ||
367 | proxy.$global.showMsg(res.msg, 'warning'); | 367 | proxy.$global.showMsg(res.msg, 'warning'); |
368 | } else { | 368 | } else { |
369 | proxy.$global.showMsg('放入回收站成功!'); | 369 | proxy.$global.showMsg('放入回收站成功!'); |
370 | + let isUser = !isUserFolder.value; | ||
371 | + reload(isUser); | ||
370 | } | 372 | } |
371 | 373 | ||
372 | if (props.isRecycle) { | 374 | if (props.isRecycle) { |
@@ -378,6 +380,7 @@ export default { | @@ -378,6 +380,7 @@ export default { | ||
378 | reload(isUser); | 380 | reload(isUser); |
379 | } | 381 | } |
380 | 382 | ||
383 | + | ||
381 | } | 384 | } |
382 | }) | 385 | }) |
383 | 386 | ||
@@ -440,7 +443,13 @@ export default { | @@ -440,7 +443,13 @@ export default { | ||
440 | type: '', | 443 | type: '', |
441 | sort: 100 | 444 | sort: 100 |
442 | }); | 445 | }); |
443 | - let showFolder = (flg, isUser) => { | 446 | + let showFolder = (flg, isUser,node) => { |
447 | + let title=""; | ||
448 | + if(node){ | ||
449 | + currentNodeData.value = node.data; | ||
450 | + title =`修改树节点“${currentNodeData.value.name}“子文件夹`; | ||
451 | + } | ||
452 | + | ||
444 | docForm.value = { | 453 | docForm.value = { |
445 | id:'', | 454 | id:'', |
446 | name: '', | 455 | name: '', |
@@ -450,7 +459,7 @@ export default { | @@ -450,7 +459,7 @@ export default { | ||
450 | }; | 459 | }; |
451 | isUserFolder.value = isUser; | 460 | isUserFolder.value = isUser; |
452 | addDialogVisible.value = flg; | 461 | addDialogVisible.value = flg; |
453 | - let title = `修改树节点“${currentNodeData.value.name}“子文件夹`; | 462 | + |
454 | if (addDialogVisible.value) { | 463 | if (addDialogVisible.value) { |
455 | title = `新建自定义文件夹`; | 464 | title = `新建自定义文件夹`; |
456 | } | 465 | } |
-
Please register or login to post a comment