Browse Source

更新

pull/331/head
小胡 2 months ago
parent
commit
93e688568f
  1. 8
      dzz/comment/scripts/lyear_comment.js
  2. 2
      dzz/comment/template/lyear/lyear_reply_item.htm
  3. 2
      dzz/comment/template/lyear/lyear_thread_item.htm
  4. 67
      dzz/explorer/dynamic.php
  5. 6
      dzz/explorer/js/filemanage.js
  6. 35
      dzz/explorer/template/index.htm
  7. 3
      dzz/shares/scripts/filemanage.js

8
dzz/comment/scripts/lyear_comment.js

@ -4,8 +4,8 @@ var html=''
html+='<li id="comment_'+arr['cid']+'" class="itemfeed" feed-id="'+arr['cid']+'" style="display:none">';
html+=' <div class="d-flex lyear-message-item"> <a href="user.php?uid='+arr['authorid']+'" class="img-avatar-48" title="'+arr['author']+'" hidefocus="true" target="_blank">'+arr['avatar']+'</a>';
html+=' <div class="flex-grow-1 ms-2">';
html+=' <a href="user.php?uid='+arr['authorid']+'" title="'+arr['author']+'" hidefocus="true" target="_blank"><strong>'+arr['author']+'</strong></a>';
html+=' <div class="text-muted">'+arr['dateline']+' '+arr['xtllq']+' '+arr['ip']+'<span class="float-end"><a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="feed_delete(\''+arr['cid']+'\',\'comment_'+arr['cid']+'\')"><i class="mdi mdi-delete"></i>&nbsp;'+__lang.delete+'</a>'+' '+'<a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="getReplyForm(\''+arr['cid']+'\',\'0\',\''+arr['allowattach']+'\',\''+arr['allowat']+'\',\''+arr['allowsmiley']+'\');"><i class="mdi mdi-reply"></i>&nbsp;'+__lang.reply+'</a></span></div><p>'+arr['message']+'</p>';
html+=' <a href="user.php?uid='+arr['authorid']+'" title="'+arr['author']+'" class="text-break" hidefocus="true" target="_blank"><strong>'+arr['author']+'</strong></a>';
html+=' <div class="text-muted">'+arr['dateline']+' '+arr['xtllq']+' '+arr['ip']+'<span class="float-end"><a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="feed_delete(\''+arr['cid']+'\',\'comment_'+arr['cid']+'\')"><i class="mdi mdi-delete"></i>&nbsp;'+__lang.delete+'</a>'+' '+'<a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="getReplyForm(\''+arr['cid']+'\',\'0\',\''+arr['allowattach']+'\',\''+arr['allowat']+'\',\''+arr['allowsmiley']+'\');"><i class="mdi mdi-reply"></i>&nbsp;'+__lang.reply+'</a></span></div><p class="text-break">'+arr['message']+'</p>';
html+='<div class="row">';
for(var i in arr['attachs']){
var attach=arr['attachs'][i];
@ -64,7 +64,7 @@ function feed_reply(arr){
html+=' <div class="d-flex lyear-message-item">';
html+=' <a href="user.php?uid='+arr['authorid']+'" class="img-avatar-48" title="" hidefocus="true" target="_blank"> '+arr['avatar']+' </a>';
html+=' <div class="flex-grow-1 ms-2">';
html+=' <a href="user.php?uid='+arr['authorid']+'" title="" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>'+arr['author']+'</strong></a>';
html+=' <a href="user.php?uid='+arr['authorid']+'" title="" class="avatar_mcfed text-break" hidefocus="true" target="_blank"><strong>'+arr['author']+'</strong></a>';
if(arr['rpost']){
html+='<span class="text-muted m-1">'+__lang.reply+'</span><a href="user.php?uid='+arr['rpost']['authorid']+'" title="" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>'+arr['rpost']['author']+'</strong></a>';
}
@ -74,7 +74,7 @@ function feed_reply(arr){
html+='<a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="feed_delete(\''+arr['cid']+'\',\'comment_'+arr['cid']+'\',\''+arr['pcid']+'\')"><i class="mdi mdi-delete"></i>&nbsp;'+__lang.delete+'</a>'+' ';
}
html+='<a class="dcolor" hidefocus="true" class="dcolor" href="javascript:void(0);" onclick="getReplyForm(\''+arr['pcid']+'\',\''+arr['cid']+'\',\''+arr['allowattach']+'\',\''+arr['allowat']+'\',\''+arr['allowsmiley']+'\');"><i class="mdi mdi-reply"></i>&nbsp;'+__lang.reply+'</a>';
html+='</span></div><p>'+arr['message']+'</p>';
html+='</span></div><p class="text-break">'+arr['message']+'</p>';
if(arr['attachs']){
html+='<div class="row">';
for(var i in arr['attachs']){

2
dzz/comment/template/lyear/lyear_reply_item.htm

@ -3,7 +3,7 @@
<div class="d-flex lyear-message-item">
<a href="user.php?uid=$value1[authorid]" class="img-avatar-48" title="$value1[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value1['authorid'],'','img-avatar img-avatar-48');}</a>
<div class="flex-grow-1 ms-2">
<a href="user.php?uid=$value1[authorid]" title="$value1[author]" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>$value1[author]</strong></a>
<a href="user.php?uid=$value1[authorid]" title="$value1[author]" class="avatar_mcfed text-break" hidefocus="true" target="_blank"><strong>$value1[author]</strong></a>
<!--{if $value1['rpost']}-->
<span class="text-muted m-1">{lang reply}</span>
<a href="user.php?uid=$value1[rpost][authorid]" title="$value1[rpost][author]" class="avatar_mcfed" hidefocus="true" target="_blank"><strong>$value1[rpost][author]</strong></a>

2
dzz/comment/template/lyear/lyear_thread_item.htm

@ -3,7 +3,7 @@
<div class="d-flex lyear-message-item">
<a href="user.php?uid=$value['authorid']" class="img-avatar-48" title="$value[author]" hidefocus="true" target="_blank">{eval echo avatar_block($value['authorid'],'','img-avatar img-avatar-48');}</a>
<div class="flex-grow-1 ms-2">
<a href="user.php?uid=$value['authorid']" title="$value[author]" hidefocus="true" target="_blank"><strong>$value[author]</strong></a>
<a href="user.php?uid=$value['authorid']" title="$value[author]" class="text-break" hidefocus="true" target="_blank"><strong>$value[author]</strong></a>
<div class="text-muted">$value['dateline'] $value[xtllq] <!--{if $_G[adminid]==1}-->$value[ip]<!--{/if}-->
<span class="float-end">
<!--{if $_G['uid']==$value['authorid'] || $_G[adminid]==1}-->

67
dzz/explorer/dynamic.php

@ -54,14 +54,16 @@ if ($do == 'getfolderdynamic') {
//文件夹属性信息
$fileinfo = C::t('resources')->get_property_by_rid($rid);
//权限信息
$userperm = perm_check::getPerm($fileinfo['pfid']);//获取用户权限
$perm = C::t('folder')->fetch_perm_by_fid($fileinfo['pfid']);//获取文件夹权限
$total = C::t('resources_event')->fetch_by_rid($rid, $start, $limit, true);
//动态信息
if (C::t('resources_event')->fetch_by_rid($rid, $start, $limit, true) > $nextstart) {
if ($total > $nextstart) {
$next = $nextstart;
}
if ($total) {
$events = C::t('resources_event')->fetch_by_rid($rid, $start, $limit);
}
$gid = $fileinfo['gid'];
$events = C::t('resources_event')->fetch_by_rid($rid, $start, $limit);
} elseif ($fid) {//如果获取到文件夹id
//文件夹信息
$fileinfo = C::t('resources')->get_folderinfo_by_fid($fid);
@ -105,13 +107,15 @@ if ($do == 'getfolderdynamic') {
$fileinfo['fdateline'] = ($foldeinfo['dateline']) ? dgmdate($foldeinfo['dateline'], 'Y-m-d H:i:s') : '';
$fileinfo['fid'] = $fid;
//权限数据
$userperm = perm_check::getPerm($fid);//获取用户权限
$perm = C::t('folder')->fetch_perm_by_fid($fid);//获取文件夹权限
$total = C::t('resources_event')->fetch_by_pfid_rid($fid, true);
//动态信息
if (C::t('resources_event')->fetch_by_pfid_rid($fid, true) > $nextstart) {
if ($total > $nextstart) {
$next = $nextstart;
}
$events = C::t('resources_event')->fetch_by_pfid_rid($fid, '', $start, $limit, '');
if($total) {
$events = C::t('resources_event')->fetch_by_pfid_rid($fid, '', $start, $limit, '');
}
}
$usergroupperm = C::t('organization_admin')->chk_memberperm($gid, $uid);
$fileinfo['type'] = '文件夹';
@ -130,10 +134,13 @@ if ($do == 'getfolderdynamic') {
$limit = 3;
$next = false;
$nextstart = $start + $limit;
if (C::t('resources_event')->fetch_by_rid($rids, $start, $limit, true) > $nextstart) {
$total = C::t('resources_event')->fetch_by_rid($rids, $start, $limit, true);
if ($total > $nextstart) {
$next = $nextstart;
}
$events = C::t('resources_event')->fetch_by_rid($rids, $start, $limit);
if($total) {
$events = C::t('resources_event')->fetch_by_rid($rids, $start, $limit);
}
//文件信息数据请求
if ($ridnum == 1) {//如果只有一个选中项,判断是否是文件夹
$rid = $rids[0];
@ -177,7 +184,8 @@ if ($do == 'getfolderdynamic') {
$vlimit = 3;
$vnext = false;
$vnextstart = $vstart + $vlimit;
if (C::t('resources_version')->fetch_all_by_rid($rid, $vlimit, true) > $vnextstart) {
$total = C::t('resources_version')->fetch_all_by_rid($rid, $vlimit, true);
if ($total > $vnextstart) {
$vnext = $vnextstart;
}
$versions = C::t('resources_version')->fetch_all_by_rid($rid, $vlimit, false);
@ -228,15 +236,21 @@ if ($do == 'getfolderdynamic') {
$nextstart = $start + $limit;
if ($pfid) {
//查询文件夹所有下级
if (C::t('resources_event')->fetch_by_pfid_rid($pfid, true, $start, $limit) > $nextstart) {
$total = C::t('resources_event')->fetch_by_pfid_rid($pfid, true, $start, $limit);
if ($total) {
$events = C::t('resources_event')->fetch_by_pfid_rid($pfid, false, $start, $limit);
}
if ($total > $nextstart) {
$next = $nextstart;
}
$events = C::t('resources_event')->fetch_by_pfid_rid($pfid, false, $start, $limit);
} else {
if (C::t('resources_event')->fetch_by_rid($rids, $start, $limit, true) > $nextstart) {
$total = C::t('resources_event')->fetch_by_rid($rids, $start, $limit, true);
if ($total) {
$events = C::t('resources_event')->fetch_by_rid($rids, $start, $limit);
}
if ($total > $nextstart) {
$next = $nextstart;
}
$events = C::t('resources_event')->fetch_by_rid($rids, $start, $limit);
}
if ($tplmore) {//加载多条动态
include template('template_dynamic_list');
@ -261,6 +275,9 @@ if ($do == 'getfolderdynamic') {
if ($total > $vnextstart) {
$vnext = $vnextstart;
}
if (!$total) {
$total =1;
}
$versions = C::t('resources_version')->fetch_all_by_rid($rid, $limit, false);
if ($vstart) {//加载多条历史版本
include template('template_historyversion_list');
@ -316,22 +333,22 @@ if ($do == 'getfolderdynamic') {
$uids = $_GET['uids'];
$condition['uidval'] = array($uids, 'nowhere');
}
$events = array();
$events = $list = array();
$count = C::t('resources_event')->fetch_all_event($start, $limit, $condition, $order, true);
if ($count) {
$events = C::t('resources_event')->fetch_all_event($start, $limit, $condition, $order);
foreach ($events as $data) {
$list[] = [
"username" => '<a href="user.php?uid=' . $data['uid'] . '" target="_blank">' . $data['username'] . '</a>',
"do_lang" => $data['do_lang'],
"do_obj" => $data['do_obj'],
"body_data" => $data['details'],
"do" => $data['do'],
"dateline" => dgmdate($data['dateline'], 'Y-m-d H:i:s'),
];
}
}
$list = array();
foreach ($events as $data) {
$list[] = [
"username" => '<a href="user.php?uid=' . $data['uid'] . '" target="_blank">' . $data['username'] . '</a>',
"do_lang" => $data['do_lang'],
"do_obj" => $data['do_obj'],
"body_data" => $data['details'],
"do" => $data['do'],
"dateline" => dgmdate($data['dateline'], 'Y-m-d H:i:s'),
];
}
header('Content-Type: application/json');
$return = [
"code" => 0,

6
dzz/explorer/js/filemanage.js

@ -460,8 +460,9 @@ _filemanage.prototype.CreateIcos = function (data, flag) {
//if(!_filemanage.fid || _explorer.Permission_Container('multiselect',this.fid)){
el.find('.icoblank_rightbottom').on('click', function () {
var flag = true;
var ell = jQuery(this).parent();
var rid = el.attr('rid');
if (el.hasClass('Icoselected')) {
if (ell.hasClass('Icoselected')) {
flag = false;
}
_select.SelectedStyle('filemanage-' + self.id, rid, flag, true);
@ -631,7 +632,6 @@ _filemanage.prototype.setToolButton = function () { //设置工具栏
}
//判断粘贴权限及是否有粘贴项
if (!_explorer.Permission('upload', data) || _explorer.cut.icos.length < 1 || _filemanage.fid < 1) {
el.find('.paste').remove();
}
if (data.collect) {
@ -1916,8 +1916,6 @@ _filemanage.share = function (rid, rids) {
showWindow('share', _explorer.appUrl + '&op=ajax&operation=share&paths=' + path+bz, 'get', 0);
}
};
_filemanage.downAttach = function (id) {
//if(_explorer.Permission('download','',id)) {
if (!id) {

35
dzz/explorer/template/index.htm

@ -1,8 +1,6 @@
<!--{template lyear:header_simple_start}-->
<link href="static/lyear/js/jstree/style.min.css?{VERHASH}" rel="stylesheet" media="all">
<link rel="stylesheet" href="static/css/smilies.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/lyear/js/bootstrap-datepicker/bootstrap-datepicker3.min.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/lyear/js/jquery-tagsinput/jquery.tagsinput.min.css?{VERHASH}">
<link rel="stylesheet" href="static/lyear/js/select2/select2.min.css?{VERHASH}">
<link rel="stylesheet" href="static/dzzthumb/jquery.dzzthumb.css?{VERHASH}">
<link rel="stylesheet" href="{MOD_PATH}/images/index.css?{VERHASH}">
@ -56,6 +54,36 @@
});
});
_explorer.getConfig(MOD_URL+'&op=json');
jcLoader().load({
type:'css',
ids:'css_lyear_comment.css',
url:'dzz/comment/images/lyear_comment.css?{VERHASH}'
},function(){
jcLoader().load({
type:'js',
ids:'js_lyear_comment',
url:'dzz/comment/scripts/lyear_comment.js?{VERHASH}'
},function(){
});
});
jcLoader().load({
type:'css',
ids:'css_smilies.css',
url:'static/css/smilies.css?{VERHASH}'
},function(){
jcLoader().load({
type:'js',
ids:'js_smilies',
url:'static/js/smilies.js?{VERHASH}'
},function(){
});
});
jcLoader().load({
type:'css',
ids:'css_tagsinput.css',
url:'static/lyear/js/jquery-tagsinput/jquery.tagsinput.min.css?{VERHASH}'
},function(){
});
});
function adduser_group(ids,data){
var formdata={};
@ -82,9 +110,8 @@
<script type="text/javascript" src="{MOD_PATH}/js/_select.js?{VERHASH}"></script>
<script type="text/javascript" src="{MOD_PATH}/js/_hotkey.js?{VERHASH}"></script>
<script type="text/javascript" src="static/js/imgReady.js?{VERHASH}"></script>
<script type="text/javascript" src="static/js/smilies.js?{VERHASH}"></script>
<script type="text/javascript" src="static/lyear/js/bootstrap-datepicker/bootstrap-datepicker.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/lyear/js/select2/select2.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/lyear/js/bootstrap-datepicker/bootstrap-datepicker.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/lyear/js/jstree/jstree.min.js?{VERHASH}"></script>
<script type="text/javascript" src="static/dzzthumb/jquery.dzzthumb.js?{VERHASH}"></script>
<script src="static/tagsinput/jquery.tagsinput.js?{VERHASH}"></script>

3
dzz/shares/scripts/filemanage.js

@ -345,8 +345,9 @@ _filemanage.prototype.CreateIcos = function (data, flag) {
});
el.find('.icoblank_rightbottom').on('click', function () {
var flag = true;
var ell = jQuery(this).parent();
var rid = el.attr('rid');
if (el.hasClass('Icoselected')) {
if (ell.hasClass('Icoselected')) {
flag = false;
}
_select.SelectedStyle('filemanage-' + self.id, rid, flag, true);

Loading…
Cancel
Save