Skip to content

J
jfV5portal
Commit bafcb65c by 周添尉
Options

网盘的共享

parent 8e4486a4
Showing with 97 additions and 61 deletions
WebContent/jfcas04/css/common.css
...@@ -996,6 +996,7 @@ a{ ...@@ -996,6 +996,7 @@ a{
text-align: center; text-align: center;
padding-top:22px; padding-top:22px;
cursor: pointer; cursor: pointer;
padding-bottom: 25px;
} }
.disk_content_header>div:first-child span{ .disk_content_header>div:first-child span{
margin:0 15px 0 5px; margin:0 15px 0 5px;
...@@ -1162,6 +1163,35 @@ a{ ...@@ -1162,6 +1163,35 @@ a{
font-size:16px; font-size:16px;
margin-right:-1px; margin-right:-1px;
} }
.disk_move_search{
margin: 10px 5px 3px;
}
.disk_move_search>input{
outline:none;
border:1px solid #f2f2f2;
border-radius: 4px;
height: 30px;
line-height: 28px;
padding-left:6px;
color:#bbb;
width:70%;
}
.disk_move_search>span{
border:1px solid #f2f2f2;
height: 30px;
line-height: 28px;
color:#333;
display: inline-block;
width:25%;
margin-left:5%;
vertical-align: bottom;
text-align:center;
cursor: pointer;
border-radius: 4px;
}
.disk_move_search>span:hover{
background: #f3f3f3;
}
.disk_move_btn{ .disk_move_btn{
height:40px; height:40px;
line-height:40px; line-height:40px;
...@@ -1386,7 +1416,7 @@ a{ ...@@ -1386,7 +1416,7 @@ a{
color:#333; color:#333;
border-top: 1px solid #f3f0f0; border-top: 1px solid #f3f0f0;
} }
.disk_rubbishBtn,.disk_shareCodeBtn{ .disk_rubbishBtn,.disk_shareCodeBtn,.disk_enjoyBtn{
display: none; display: none;
} }
.disk_createShare{ .disk_createShare{
......
WebContent/jfcas04/disk.jsp
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
<jsp:include page="header.jsp"></jsp:include> <jsp:include page="header.jsp"></jsp:include>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/store/js/storeModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storeshare/js/storeShareModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/user/js/jwAppUserModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/disk.js"></script> <script src="${ctx}/jfcas04/js/disk.js"></script>
</head> </head>
<body> <body>
...@@ -16,13 +19,13 @@ ...@@ -16,13 +19,13 @@
<!-- 内容部分 --> <!-- 内容部分 -->
<div class="disk_container container-fluid"> <div class="disk_container container-fluid">
<div class="row disk_search"> <div class="row disk_search">
<div class="col-md-3"> <div class="col-md-2">
<div class="col-md-3" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div> <div class="col-md-6" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div> <%-- <div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div> <div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div> --%>
<div id="disk_rubbish" class="col-md-3" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div> <div id="disk_rubbish" class="col-md-6" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-7">
<div class="disk_search_center"> <div class="disk_search_center">
<a href="disk"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a> <a href="disk"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a>
<!-- <a onclick="disk_backFolder(this)"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a> --> <!-- <a onclick="disk_backFolder(this)"><span class="glyphicon glyphicon-folder-close"></span><span>我的网盘</span><span class="glyphicon glyphicon-triangle-right"></span></a> -->
...@@ -50,6 +53,7 @@ ...@@ -50,6 +53,7 @@
<a class="disk_rubbishBtn disk_document_default" href="javascript:disk_reductionFolder()"><img src="/jfV5portal/custom/images/disk_return.png" width="16" height="16"><span>还原文件</span></a> <a class="disk_rubbishBtn disk_document_default" href="javascript:disk_reductionFolder()"><img src="/jfV5portal/custom/images/disk_return.png" width="16" height="16"><span>还原文件</span></a>
<a class="disk_rubbishBtn disk_document_default" href="javascript:disk_thoroughDeleteFolder()"><img src="/jfV5portal/custom/images/disk_thoroughDelete.png" width="16" height="16"><span>彻底删除</span></a> <a class="disk_rubbishBtn disk_document_default" href="javascript:disk_thoroughDeleteFolder()"><img src="/jfV5portal/custom/images/disk_thoroughDelete.png" width="16" height="16"><span>彻底删除</span></a>
<a class="disk_shareCodeBtn disk_document_default" href="javascript:disk_cancelShareCode()"><img src="/jfV5portal/custom/images/disk_cancelShare.png" width="14" height="14"><span>取消分享</span></a> <a class="disk_shareCodeBtn disk_document_default" href="javascript:disk_cancelShareCode()"><img src="/jfV5portal/custom/images/disk_cancelShare.png" width="14" height="14"><span>取消分享</span></a>
<a class="disk_enjoyBtn disk_document_default" href="javascript:disk_cancelEnjoy()"><img src="/jfV5portal/custom/images/disk_cancelShare.png" width="14" height="14"><span>取消共享</span></a>
</div> </div>
<div class="col-md-1"><span onclick="disk_content_toggle(this)" class="disk_content_toggleBtn glyphicon glyphicon-th-large" title="切换到列表模式"></span></div> <div class="col-md-1"><span onclick="disk_content_toggle(this)" class="disk_content_toggleBtn glyphicon glyphicon-th-large" title="切换到列表模式"></span></div>
</div> </div>
...@@ -163,6 +167,7 @@ ...@@ -163,6 +167,7 @@
<li onclick="disk_downFolder(this)" class="disk_menu_clickBtn">下载</li> <li onclick="disk_downFolder(this)" class="disk_menu_clickBtn">下载</li>
<li onclick="disk_moveFolder(this)" class="disk_menu_clickBtn">移动到</li> <li onclick="disk_moveFolder(this)" class="disk_menu_clickBtn">移动到</li>
<li onclick="disk_enjoyFolder(this)" class="disk_menu_clickBtn">共享</li> <li onclick="disk_enjoyFolder(this)" class="disk_menu_clickBtn">共享</li>
<li onclick="disk_cancelEnjoy(this)" class="disk_menu_clickBtn" style="display:none;">取消共享</li>
</ul> </ul>
</div> </div>
......
WebContent/lib/plug/xcConfirm/css/xcConfirm.css
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
/* .xcConfirm .popBox .txtBox{margin: 40px 100px; height: 100px; overflow: hidden;} */ /* .xcConfirm .popBox .txtBox{margin: 40px 100px; height: 100px; overflow: hidden;} */
.xcConfirm .popBox .txtBox{ .xcConfirm .popBox .txtBox{
margin: 30px 100px; margin: 30px 100px;
height: 57px; height: 61px;
overflow: hidden; overflow: hidden;
margin-top: 40px; margin-top: 40px;
} }
......
WebContent/nav4.jsp
<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> <%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="/struts-tags" prefix="s" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/> <c:set var="ctx" value="${pageContext.request.contextPath}"/>
<div class="indedx_header"> <div class="indedx_header">
<div onclick="location.href='interim'"> <div onclick="location.href='interim'">
...@@ -9,10 +10,10 @@ ...@@ -9,10 +10,10 @@
<a href="javascript:void(0)" class="index_header_showMessage"> <a href="javascript:void(0)" class="index_header_showMessage">
<img src="${ctx}/custom/images/index4_loginmessage.png" width="12" height="12" />登录信息 <img src="${ctx}/custom/images/index4_loginmessage.png" width="12" height="12" />登录信息
<ul> <ul>
<li><span>登录账号</span><span>test001</span></li> <li><span>登录账号</span><span><s:property value="#session.userInfo['EMID']"/></span></li>
<li><span>姓名</span><span>小周</span></li> <li><span>姓名</span><span><s:property value="#session.userInfo['EMNAME']"/></span></li>
<li><span>登录时间</span><span>2018.02.22 12:24:38</span></li> <li><span>登录IP</span><span><s:property value="#session.userInfo['LOGINIP']"/></span></li>
<li><span>上次时间</span><span>2017.02.22 12:24:38</span></li> <li><span>上次时间</span><span><s:property value="#session.userInfo['BEFORETIME']"/></span></li>
</ul> </ul>
</a><span>|</span> </a><span>|</span>
<a href="#"> <a href="#">
......
src_jwapp/com/jw/app/store/action/personal/actAction.java
...@@ -72,27 +72,27 @@ public class actAction extends BasicAction { ...@@ -72,27 +72,27 @@ public class actAction extends BasicAction {
//去除不要更新的字段 //去除不要更新的字段
entity.remove("OPETYPE"); entity.remove("OPETYPE");
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字 //处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>(); // Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID")); // v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID")); // v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE"); // String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){ // if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME"); // String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf(".")); // fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname); // v_congfu_query.put("FILE_NAME",fname);
}else{ // }else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME")); // v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
} // }
int ret_count = business.listCount_storePersonal(v_congfu_query); // int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){ // if(ret_count>0){
String fname = (String) entity.get("FILE_NAME"); // String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){ // if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1); // fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{ // }else{
fname = fname + "("+ret_count+")"; // fname = fname + "("+ret_count+")";
} // }
entity.put("FILE_NAME",fname); // entity.put("FILE_NAME",fname);
} // }
//处理超限问题 //处理超限问题
StoreUserBusiness business_storeuser = BusinessManager.getBusiness(StoreUserBusiness.class); StoreUserBusiness business_storeuser = BusinessManager.getBusiness(StoreUserBusiness.class);
Map<String,Object> storeuserQuery = new HashMap<String,Object>(); Map<String,Object> storeuserQuery = new HashMap<String,Object>();
...@@ -227,7 +227,7 @@ public class actAction extends BasicAction { ...@@ -227,7 +227,7 @@ public class actAction extends BasicAction {
} }
} }
// //
jsonObject.putAll(Status.getStatusSuccessMessage("保存成功")); jsonObject.putAll(Status.getStatusSuccessMessage("保存成功,"+entity.get("FILE_NAME")));
} }
} catch (Exception e) { } catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("保存失败")); jsonObject.putAll(Status.getStatusErrorMessage("保存失败"));
...@@ -246,33 +246,33 @@ public class actAction extends BasicAction { ...@@ -246,33 +246,33 @@ public class actAction extends BasicAction {
StorePersonalBusiness business = BusinessManager.getBusiness(StorePersonalBusiness.class); StorePersonalBusiness business = BusinessManager.getBusiness(StorePersonalBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX); Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
String father_path = request.getParameter("FATHER_PATH"); String father_path = request.getParameter("FATHER_PATH");
String old_file_name = request.getParameter("OLD_FILE_NAME"); // String old_file_name = request.getParameter("OLD_FILE_NAME");
try { try {
String is_fname = (String) entity.get("FILE_NAME"); // String is_fname = (String) entity.get("FILE_NAME");
if(!StringUtils.equals(is_fname, old_file_name)){ // if(!StringUtils.equals(is_fname, old_file_name)){
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字 // //处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>(); // Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID")); // v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID")); // v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE"); // String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){ // if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME"); // String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf(".")); // fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname); // v_congfu_query.put("FILE_NAME",fname);
}else{ // }else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME")); // v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
} // }
int ret_count = business.listCount_storePersonal(v_congfu_query); // int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){ // if(ret_count>0){
String fname = (String) entity.get("FILE_NAME"); // String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){ // if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1); // fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{ // }else{
fname = fname + "("+ret_count+")"; // fname = fname + "("+ret_count+")";
} // }
entity.put("FILE_NAME",fname); // entity.put("FILE_NAME",fname);
} // }
} // }
//去除不要更新的字段 //去除不要更新的字段
entity.remove("OPETYPE"); entity.remove("OPETYPE");
boolean is_save2db = Boolean.parseBoolean(PropUtil.getValue("uploadfile_savetodb", "quartz_service", "true")); boolean is_save2db = Boolean.parseBoolean(PropUtil.getValue("uploadfile_savetodb", "quartz_service", "true"));
...@@ -372,7 +372,7 @@ public class actAction extends BasicAction { ...@@ -372,7 +372,7 @@ public class actAction extends BasicAction {
} }
} }
// //
jsonObject.putAll(Status.getStatusSuccessMessage("修改成功")); jsonObject.putAll(Status.getStatusSuccessMessage("修改成功,"+entity.get("FILE_NAME")));
} catch (Exception e) { } catch (Exception e) {
jsonObject.putAll(Status.getStatusErrorMessage("修改失败")); jsonObject.putAll(Status.getStatusErrorMessage("修改失败"));
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment