From b6b3b77e1a6178e6c0504ce44f6e8e3943a6e968 Mon Sep 17 00:00:00 2001 From: devezhao Date: Fri, 15 Nov 2019 15:21:59 +0800 Subject: [PATCH] done --- .eslintrc.json | 3 +- .../service/base/AttachmentFolderService.java | 13 +++++ .../rebuild/web/files/FileListControll.java | 1 - .../web/files/FileManagerControll.java | 51 ++++++++++++++++--- src/main/webapp/assets/css/files.css | 20 ++++++++ .../webapp/assets/js/files/files-docs.jsx | 18 ++++++- src/main/webapp/assets/js/files/files.jsx | 8 +++ src/main/webapp/assets/js/rb-base.js | 10 ++++ src/main/webapp/files/attachment.jsp | 7 ++- src/main/webapp/files/docs.jsp | 7 ++- 10 files changed, 121 insertions(+), 17 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 5fe8887f9..009f44806 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -84,7 +84,8 @@ "$countdownButton": true, "ChartSelect": true, "Share2": true, - "$pgt": true + "$pgt": true, + "$stopEvent": true }, "rules": { "strict": 0, diff --git a/src/main/java/com/rebuild/server/service/base/AttachmentFolderService.java b/src/main/java/com/rebuild/server/service/base/AttachmentFolderService.java index f7d8ab613..af059ef80 100644 --- a/src/main/java/com/rebuild/server/service/base/AttachmentFolderService.java +++ b/src/main/java/com/rebuild/server/service/base/AttachmentFolderService.java @@ -24,6 +24,7 @@ import com.rebuild.server.Application; import com.rebuild.server.metadata.EntityHelper; import com.rebuild.server.service.DataSpecificationException; import com.rebuild.server.service.SystemEntityService; +import com.rebuild.server.service.bizz.UserHelper; /** * 文件目录 @@ -51,6 +52,7 @@ public class AttachmentFolderService extends SystemEntityService { if (inFolder != null) { throw new DataSpecificationException("目录内有文件不能删除"); } + Object parent = Application.createQueryNoFilter( "select parent from AttachmentFolder where parent = ?") .setParameter(1, recordId) @@ -59,6 +61,17 @@ public class AttachmentFolderService extends SystemEntityService { throw new DataSpecificationException("目录内有子目录不能删除"); } + ID user = Application.getCurrentUser(); + if (!UserHelper.isAdmin(user)) { + Object[] createdBy = Application.createQueryNoFilter( + "select createdBy from AttachmentFolder where folderId = ?") + .setParameter(1, recordId) + .unique(); + if (!user.equals(createdBy[0])) { + throw new DataSpecificationException("无权删除他人目录"); + } + } + return super.delete(recordId); } } diff --git a/src/main/java/com/rebuild/web/files/FileListControll.java b/src/main/java/com/rebuild/web/files/FileListControll.java index 3f4a9861d..bc96a1320 100644 --- a/src/main/java/com/rebuild/web/files/FileListControll.java +++ b/src/main/java/com/rebuild/web/files/FileListControll.java @@ -136,7 +136,6 @@ public class FileListControll extends BasePageControll { } else { sql += " order by modifiedOn desc"; } - System.out.println(sql); Object[][] array = Application.createQueryNoFilter(sql) .setLimit(pageSize, pageNo * pageSize - pageSize) .array(); diff --git a/src/main/java/com/rebuild/web/files/FileManagerControll.java b/src/main/java/com/rebuild/web/files/FileManagerControll.java index cd727b16c..ff4b8f77e 100644 --- a/src/main/java/com/rebuild/web/files/FileManagerControll.java +++ b/src/main/java/com/rebuild/web/files/FileManagerControll.java @@ -25,6 +25,7 @@ import com.alibaba.fastjson.JSONArray; import com.rebuild.server.Application; import com.rebuild.server.business.files.FilesHelper; import com.rebuild.server.metadata.EntityHelper; +import com.rebuild.server.service.bizz.UserHelper; import com.rebuild.web.BaseControll; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,7 +34,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; /** * @author devezhao @@ -63,6 +66,27 @@ public class FileManagerControll extends BaseControll { writeSuccess(response); } + @RequestMapping("delete-files") + public void deleteFiles(HttpServletRequest request, HttpServletResponse response) + throws IOException { + ID user = getRequestUser(request); + String[] files = getParameter(request, "ids", "").split(","); + + Set willDeletes = new HashSet<>(); + for (String file : files) { + if (!ID.isId(file)) continue; + ID fileId = ID.valueOf(file); + if (!checkAllow(user, fileId)) { + writeFailure(response, "无权删除他人文件"); + return; + } + + willDeletes.add(fileId); + } + Application.getCommonService().delete(willDeletes.toArray(new ID[0])); + writeSuccess(response); + } + @RequestMapping("move-files") public void moveFiles(HttpServletRequest request, HttpServletResponse response) throws IOException { @@ -73,16 +97,18 @@ public class FileManagerControll extends BaseControll { List fileRecords = new ArrayList<>(); for (String file : files) { if (!ID.isId(file)) continue; - Record r = EntityHelper.forUpdate(ID.valueOf(file), user); - if (inFolder == null) { - r.setNull("inFolder"); - } else { - r.setID("inFolder", inFolder); + ID fileId = ID.valueOf(file); + if (!checkAllow(user, fileId)) { + writeFailure(response, "无权更改他人文件"); + return; } + + Record r = EntityHelper.forUpdate(fileId, user); + if (inFolder == null) r.setNull("inFolder"); + else r.setID("inFolder", inFolder); fileRecords.add(r); } Application.getCommonService().createOrUpdate(fileRecords.toArray(new Record[0]), false); - writeSuccess(response); } @@ -94,4 +120,17 @@ public class FileManagerControll extends BaseControll { boolean OK = Application.getSecurityManager().allowedR(user, record); writeSuccess(response, OK); } + + // 是否允许操作指定文件（管理员总是允许） + private boolean checkAllow(ID user, ID file) { + if (UserHelper.isAdmin(user)) { + return true; + } + + Object[] o = Application.createQueryNoFilter( + "select createdBy from Attachment where attachmentId = ?") + .setParameter(1, file) + .unique(); + return o != null && o[0].equals(user); + } } diff --git a/src/main/webapp/assets/css/files.css b/src/main/webapp/assets/css/files.css index 1f6e318bd..fc7e38633 100644 --- a/src/main/webapp/assets/css/files.css +++ b/src/main/webapp/assets/css/files.css @@ -79,6 +79,7 @@ border-right-color: #fff; } +.file-list-item.active>div.type .file-icon::before, .file-list-item:hover>div.type .file-icon::before { border-top-color: #f5f5f5; border-right-color: #f5f5f5; @@ -90,6 +91,7 @@ .file-list-item>div.detail>.extras { margin-top: 1px; + overflow: hidden; } .file-list-item>div.detail>.extras>span { @@ -98,6 +100,24 @@ line-height: 1; } +.file-list-item>div.detail>.extras>span.op { + display: none; +} + +.file-list-item:hover>div.detail>.extras>span.op { + display: inline-block; +} + +.file-list-item>div.detail>.extras>span.op>a { + color: #999; + display: inline-block; + padding: 0 8px; +} + +.file-list-item>div.detail>.extras>span.op>a:hover { + color: #555; +} + .file-list-item>div.detail .extras>span, .file-list-item>div.detail .extras>span>a { color: #777; diff --git a/src/main/webapp/assets/js/files/files-docs.jsx b/src/main/webapp/assets/js/files/files-docs.jsx index e5ac31468..3292302a8 100644 --- a/src/main/webapp/assets/js/files/files-docs.jsx +++ b/src/main/webapp/assets/js/files/files-docs.jsx @@ -1,3 +1,4 @@ +/* eslint-disable react/jsx-no-target-blank */ /* eslint-disable react/prop-types */ /* global filesList */ // 文档 @@ -258,6 +259,21 @@ class FolderTree extends React.Component { class FilesList2 extends FilesList { state = { ...this.props } __lastEntry = __DEFAULT_ALL + + renderExtras(item) { + return + {super.renderExtras(item)} + + $stopEvent(e)} href={`${rb.baseUrl}/filex/download/${item.filePath}?attname=${$fileCutName(item.filePath)}`} target="_blank"> + this._share(item, e)}> + + + } + _share(item, e) { + $stopEvent(e) + // eslint-disable-next-line react/jsx-no-undef + renderRbcomp() + } } const __findPaths = function (active, push) { @@ -300,7 +316,7 @@ $(document).ready(() => { confirmText: '删除', confirm: function () { this.disabled(true) - $.post(`${rb.baseUrl}/app/entity/record-delete?id=${s}`, (res) => { + $.post(`${rb.baseUrl}/files/delete-files?ids=${s}`, (res) => { if (res.error_code > 0) RbHighbar.error(res.error_msg) this.hide() filesList.loadData() diff --git a/src/main/webapp/assets/js/files/files.jsx b/src/main/webapp/assets/js/files/files.jsx index 917edeb2a..d789e38be 100644 --- a/src/main/webapp/assets/js/files/files.jsx +++ b/src/main/webapp/assets/js/files/files.jsx @@ -78,6 +78,14 @@ var filesList $(document).ready(() => { $('.side-toggle').click(() => $('.rb-aside').toggleClass('rb-aside-collapsed')) + let $content = $('.page-aside .tab-content') + let hold = window.resize_handler + window.resize_handler = function () { + typeof hold === 'function' && hold() + $content.height($(window).height() - 147) + $content.perfectScrollbar('update') + } + window.resize_handler() $('.J_sort .dropdown-item').click(function () { let $this = $(this) diff --git a/src/main/webapp/assets/js/rb-base.js b/src/main/webapp/assets/js/rb-base.js index 477ebf811..ad2f32d4a 100644 --- a/src/main/webapp/assets/js/rb-base.js +++ b/src/main/webapp/assets/js/rb-base.js @@ -303,4 +303,14 @@ var $same = function (a, b) { } // eslint-disable-next-line eqeqeq return a == b +} + +/** + * 停止事件传播 + * @param {Event} e + */ +var $stopEvent = function (e) { + if (e && e.stopPropagation) e.stopPropagation() + if (e && e.nativeEvent) e.nativeEvent.stopImmediatePropagation() + return false } \ No newline at end of file diff --git a/src/main/webapp/files/attachment.jsp b/src/main/webapp/files/attachment.jsp index 502eddc8d..68cbcb8aa 100644 --- a/src/main/webapp/files/attachment.jsp +++ b/src/main/webapp/files/attachment.jsp @@ -43,14 +43,14 @@
  • 全部附件
    • -
    -
    +
    +
    -
    +
    @@ -59,7 +59,6 @@
    -
    diff --git a/src/main/webapp/files/docs.jsp b/src/main/webapp/files/docs.jsp index 1ddb1ae0d..1cdad8e1e 100644 --- a/src/main/webapp/files/docs.jsp +++ b/src/main/webapp/files/docs.jsp @@ -43,14 +43,14 @@
  • 全部文档
    • -
    -
    +
    +
    -
    +
    @@ -69,7 +69,6 @@
    -