WindyMadman/dzzoffice
1
0
Fork 0
mirror of https://github.com/zyx0814/dzzoffice.git synced 2025-04-03 23:31:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新内容： (#289)

Browse Source 
1.條复网盘应用移动端部分情况下目录权限不正确问题
2.修复一些已知问题
3. 优化btn按钮交互效果
4.升级1avui至v2.9.23版本
This commit is contained in:
小胡 2025-02-24 16:07:34 +08:00 committed by GitHub
parent 9ac7d1f70b
commit 6b55b26eb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
31 changed files with 435 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/appmarket/cloudappmarket.php
View File

@ -50,20 +50,20 @@ if( $list ){
}
include template('cloudappmarket');
exit;
function curlcloudappmarket( $url="",$post_data="", $token="" ){
function curlcloudappmarket( $url="",$post_data="", $token="" ){
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_HEADER, 0);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($curl, CURLOPT_POST, 1);
curl_setopt($curl, CURLOPT_POSTFIELDS, $post_data);
$response = curl_exec($curl);
$response = curl_exec($curl);
$httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
$errorno = curl_errno($curl);
if ($errorno) {
return($errorno);
}
return($response);
return($response);
}

9
admin/appmarket/images/market1.css
View File

@ -85,10 +85,9 @@
border:1px solid #dee2e6;
border-radius:.3rem;
}
.price-container .label-success{
.price-container .label{
font-weight:300;
border-radius:var(--radius);
background-color:rgba(var(--bs-primary-rgb), 1);
display: inline-block;
padding: 0.35em 0.65em;
font-size: .75em;
@ -100,6 +99,12 @@
vertical-align: baseline;
border-radius: 0.25rem;
}
.price-container .label-success{
background-color:rgba(var(--bs-primary-rgb), 1);
}
.price-container .label-danger{
background-color:rgba(var(--bs-danger-rgb), 1);
}
.document-header .img-container{
border-radius:2px 0 0 0;
position:absolute;

12
admin/appmarket/template/lyear/appdefault.htm
View File

@ -41,10 +41,8 @@
</thead>
<!--{loop $list $value}-->
<tr>
<td width="40"><input type="text" class="form-control" name="disp[{$value[appid]}]" value="$value[disp]" /></td>
<td>
<a href="$value[appurl]" class="dcolor"><img src="$value[appico]" />$value[appname]</a>
</td>
<td><input type="text" class="form-control" name="disp[{$value[appid]}]" value="$value[disp]" style="width: 60px;" /></td>
<td><a href="$value[appurl]" class="dcolor"><img src="$value[appico]" />$value[appname]</a></td>
<td>
<select name="position[{$value[appid]}]" class="form-select">
<!--{loop $positionarr $key $value1}-->
@ -72,11 +70,9 @@
</td>
</tr>
<!--{/loop}-->
<tr>
<th valign="middle" style="border-bottom:none"><input type="submit" class="btn btn-primary btn-round bodyloading" value="{lang save_set}" /></th>
<th colspan="5" style="border-bottom:none"> $multi</th>
</tr>
</table>
<input type="submit" class="btn btn-primary btn-round bodyloading" value="{lang save_set}" />
$multi
</div>
</form>
<div class="alert alert-warning alert-dismissible fade show" role="alert">

2
admin/appmarket/template/lyear/cloudappmarket.htm
View File

@ -65,7 +65,7 @@
<td>{eval echo formatsize($value['packagesize']);}</td>
<td>
<!--{if $value[price]>0}-->
<button class="btn btn-outline-secondary" onclick="showBuyInfo(this,'$value[mid]')" data-href="$cloudurl?mod=dzzmarket&op=ajax&do=getBuyInfo&mid=$value[mid]" title="{lang buy_contract}">{lang buy}</button>
<button class="btn btn-round btn btn-danger btn-sm" onclick="showBuyInfo(this,'$value[mid]')" data-href="$cloudurl?mod=dzzmarket&op=ajax&do=getBuyInfo&mid=$value[mid]" title="{lang buy_contract}">{lang buy}</button>
<!--{else}-->
<!--{if $value[package]}-->
<!--{if $value["local_appinfo"]}-->

1
core/class/table/table_resources_path.php
View File

@ -204,7 +204,6 @@ class table_resources_path extends dzz_table
return false;
}
}
//转义查询语句当中的path
public function path_transferred_meaning($path){

2
dzz/appmanagement/template/lyear/main.htm
View File

@ -38,7 +38,7 @@
<div class="card bg-primary text-white">
<div class="card-body">
<div class="d-flex justify-content-between">
<span class="fs-4 scroll-numbers">{$_G['username']}，{$greeting}</span>
<span class="fs-4">{$_G['username']}，{$greeting}</span>
</div>
<div>登录时间：<!--{eval echo dgmdate($userstatus['lastvisit'])}-->，当前时间：{$dateInfo}</div>
</div>

8
dzz/comment/template/list.htm
View File

@ -34,10 +34,10 @@
</div>
</script>
<script type="text/html" id="barDemo">
<a class="btn btn-sm btn-default me-1" title="{lang view}当前评论" lay-event="view"><i class="mdi mdi-magnify-expand"></i></a>
<a class="btn btn-sm btn-default me-1 " title="{lang view}所有评论" lay-event="viewid"><i class="mdi mdi-comment-text-multiple"></i></a>
<a class="btn btn-sm btn-default me-1" title="{lang edit}" lay-event="edit"><i class="mdi mdi-pencil"></i></a>
<a class="btn btn-sm btn-default" title="{lang delete}" lay-event="del"><i class="mdi mdi-delete"></i></a>
<a class="btn btn-sm btn-primary me-1" title="{lang view}当前评论" lay-event="view"><i class="mdi mdi-magnify-expand"></i></a>
<a class="btn btn-sm btn-outline-info me-1 " title="{lang view}所有评论" lay-event="viewid"><i class="mdi mdi-comment-text-multiple"></i></a>
<a class="btn btn-sm btn-outline-primary me-1" title="{lang edit}" lay-event="edit"><i class="mdi mdi-pencil"></i></a>
<a class="btn btn-sm btn-outline-danger" title="{lang delete}" lay-event="del"><i class="mdi mdi-delete"></i></a>
</script>
</div>
</div>

3
dzz/explorer/dzzcp.php
View File

@ -140,7 +140,7 @@ if($do == 'deleteIco'){//删除文件到回收站
}elseif($do == 'recoverFile'){//恢复文件
$arr=array();
$i=0;
$icoids=$_GET['rids'];
$icoids = $_GET['rids'];
$ridarr = array();
$bz= isset($_GET['bz']) ? trim($_GET['bz']):'';
foreach($icoids as $icoid){
@ -154,7 +154,6 @@ if($do == 'deleteIco'){//删除文件到回收站
}else{
$return=IO::Recover($icoid);
}
if(!$return['error']){
//处理数据
$arr['sucessicoids'][$return['rid']]=$return['rid'];

1
dzz/explorer/mobile/file.php
View File

@ -168,6 +168,7 @@ if ($operation == 'filelist') {
$folder = C::t('folder')->fetch_folderinfo_by_fid($fid);
$folder['gid'] = ($gid) ? $gid : 0;
$folder['ismoderator'] = $perm;
$folder['perm'] = perm_check::getPerm($folder['fid']);//获取文件权限
$folderjson = json_encode(array($fid=>$folder));
$folderpath = array_filter(explode('/',preg_replace('/dzz:(.+?):/','',$folder['path'])));
$navtitle = $folderpath[0];

2
dzz/share/template/lyear/share.htm
View File

@ -39,7 +39,7 @@
<button type="button" class="layui-btn layui-btn-normal" lay-event="getCheckData">获取选中行数据</button>
<button type="button" class="layui-btn layui-btn-danger" lay-event="delete">{lang del_share}</button>
<!--{if $_G['adminid']}--><button type="button" class="layui-btn layui-bg-orange" lay-event="forbidden">{lang screen_share}</button>
<button type="button" class="layui-btn layui-bg-blue" lay-event="allow">{lang cancel_shielding}</button><!--{/if}-->
<button type="button" class="layui-btn" lay-event="allow">{lang cancel_shielding}</button><!--{/if}-->
<button type="button" class="layui-btn layui-btn-normal" lay-event="get">刷新</button>
</div>
</script>

2
static/lyear/css/bootstrap.min.css vendored
View File

@ -559,7 +559,7 @@ textarea.form-control-lg{min-height:calc(1.5em + 1rem + 2px)}
.form-check-inline .form-check-input~.invalid-feedback{margin-left:.5em}
.input-group .form-control.is-invalid,.input-group .form-select.is-invalid,.was-validated .input-group .form-control:invalid,.was-validated .input-group .form-select:invalid{z-index:2}
.input-group .form-control.is-invalid:focus,.input-group .form-select.is-invalid:focus,.was-validated .input-group .form-control:invalid:focus,.was-validated .input-group .form-select:invalid:focus{z-index:3}
.btn{display:inline-block;font-weight:400;line-height:1.5;color:#212529;text-align:center;text-decoration:none;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}
.btn{display:inline-block;font-weight:400;line-height:1.5;color:#212529;text-align:center;text-decoration:none;vertical-align:middle;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1rem;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;position: relative;}
@media (prefers-reduced-motion:reduce){.btn{transition:none}
}.btn:hover{color:#212529}
.btn-check:focus+.btn,.btn:focus{outline:0;box-shadow:0 0 0 .25rem rgba(13,110,253,.25)}

2
static/lyear/js/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

1
static/lyear/js/layui/css/modules/code.css
View File

@ -1 +0,0 @@
html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-view{display:block;position:relative;margin:10px 0;padding:0;border:1px solid #eee;border-left-width:6px;background-color:#fafafa;color:#333;font-family:Courier New;font-size:13px}.layui-code-title{position:relative;padding:0 10px;height:40px;line-height:40px;border-bottom:1px solid #eee;font-size:12px}.layui-code-title>.layui-code-about{position:absolute;right:10px;top:0;color:#b7b7b7}.layui-code-about>a{padding-left:10px}.layui-code-view>.layui-code-ol,.layui-code-view>.layui-code-ul{position:relative;overflow:auto}.layui-code-view>.layui-code-ol>li{position:relative;margin-left:45px;line-height:20px;padding:0 10px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view>.layui-code-ol>li:first-child,.layui-code-view>.layui-code-ul>li:first-child{padding-top:10px}.layui-code-view>.layui-code-ol>li:last-child,.layui-code-view>.layui-code-ul>li:last-child{padding-bottom:10px}.layui-code-view>.layui-code-ul>li{position:relative;line-height:20px;padding:0 10px;list-style-type:none;*list-style-type:none;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-dark{border:1px solid #0c0c0c;border-left-color:#3f3f3f;background-color:#0c0c0c;color:#c2be9e}.layui-code-dark>.layui-code-title{border-bottom:none}.layui-code-dark>.layui-code-ol>li,.layui-code-dark>.layui-code-ul>li{background-color:#3f3f3f;border-left:none}.layui-code-dark>.layui-code-ul>li{margin-left:6px}.layui-code-demo .layui-code{visibility:visible!important;margin:-15px;border-top:none;border-right:none;border-bottom:none}.layui-code-demo .layui-tab-content{padding:15px;border-top:none}

1
static/lyear/js/layui/css/modules/laydate/default/laydate.css
View File

File diff suppressed because one or more lines are too long

BIN
static/lyear/js/layui/css/modules/layer/default/icon-ext.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
static/lyear/js/layui/css/modules/layer/default/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

1
static/lyear/js/layui/css/modules/layer/default/layer.css
View File

File diff suppressed because one or more lines are too long

BIN
static/lyear/js/layui/css/modules/layer/default/loading-0.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

BIN
static/lyear/js/layui/css/modules/layer/default/loading-1.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 701 B

BIN
static/lyear/js/layui/css/modules/layer/default/loading-2.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
static/lyear/js/layui/css/modules/layer/lightyear/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

17
static/lyear/js/layui/css/modules/layer/lightyear/loading.svg
View File

@ -1,17 +0,0 @@
<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
<svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg" stroke="#fff">
<g fill="none" fill-rule="evenodd">
<g transform="translate(1 1)" stroke-width="2">
<circle stroke-opacity=".5" cx="18" cy="18" r="18"/>
<path d="M36 18c0-9.94-8.06-18-18-18">
<animateTransform
attributeName="transform"
type="rotate"
from="0 18 18"
to="360 18 18"
dur="1s"
repeatCount="indefinite"/>
</path>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 694 B

1
static/lyear/js/layui/css/modules/layer/lightyear/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
static/lyear/js/layui/font/iconfont.eot
View File

Binary file not shown.

959
static/lyear/js/layui/font/iconfont.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 299 KiB

After

Width:  |  Height:  |  Size: 326 KiB

BIN
static/lyear/js/layui/font/iconfont.ttf
View File

Binary file not shown.

BIN
static/lyear/js/layui/font/iconfont.woff
View File

Binary file not shown.

BIN
static/lyear/js/layui/font/iconfont.woff2
View File

Binary file not shown.

2
static/lyear/js/layui/layui.js
View File

File diff suppressed because one or more lines are too long

2
static/lyear/js/lyear-loading.js
View File

@ -12,7 +12,7 @@
spinnerColorClass : '', // 定义加载动画的颜色，当不使用图片时
spinnerSize : 'normal', // 定义加载动画的大小，当不使用图片时
spinnerText : '', // 显示的文字
zindex : 9999, // 遮罩层的z-index值
zindex : 999, // 遮罩层的z-index值
};
// 融合配置项

2
static/lyear/js/main.min.js vendored
View File

@ -12,7 +12,7 @@ jQuery(document).ready( function() {
$(this).closest('.modal-dialog').toggleClass('modal-fullscreen');
});
$("button:submit,input:submit,.nav-stacked a,.nav-pills .nav-link,.lyearloading").click(function(){
$("button:submit,input:submit,.nav-stacked a,.nav-pills .nav-link,.lyearloading,.btn").click(function(){
$(this).attr('disable', 'true');
var l = $(this).lyearloading({
opacity: 0.2,