he/DzzOffice
1
0
Fork 0
mirror of https://github.com/DzzXH/DzzOffice.git synced 2026-01-18 18:05:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复部分已知问题

Browse Source
This commit is contained in:
小胡
2024-04-22 14:29:57 +08:00
Unverified
parent 84159542ba
commit ed894eef22
6 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin/setting/template/smileyedit.htm
View File

@@ -63,15 +63,15 @@
<td></td>
<td colspan="8" style="">
{lang batch_code_set_expression}
<input type="text" style="margin-right:0;width:40px;height:30px;padding:2px 4px" value="{:" title="{lang prefix}" id="prefix" onclick="clearinput(this, '{lang prefix}')"> +
<select id="middle" style="width:100px;height:30px;padding:2px 4px">
<input type="text" class="form-control" style="display: inline-block;margin-right:0;width:40px;height:30px;padding:2px 4px" value="{:" title="{lang prefix}" id="prefix" onclick="clearinput(this, '{lang prefix}')"> +
<select id="middle" class="form-control" style="display: inline-block;width:100px;height:30px;padding:2px 4px">
<option value="1">{lang filename}</option>
<option value="2">{lang natural_order}</option>
<option value="3">{lang expression} ID</option>
<option value="4">{lang expression_describing}</option>
</select>
+
<input type="text" style="margin-right:0;width:40px;height:30px;padding:2px 4px" value=":}" title="{lang suffix}" id="suffix" onclick="clearinput(this, '{lang suffix}')">
<input type="text" class="form-control" style="display: inline-block;margin-right:0;width:40px;height:30px;padding:2px 4px" value=":}" title="{lang suffix}" id="suffix" onclick="clearinput(this, '{lang suffix}')">
<input type="button" class="btn btn-outline-info" onclick="addsmileycodes('{$smileynum}', '');" value="{lang type_app}"> &nbsp;&nbsp; <input type="button" class="btn btn-outline-info" onclick="autoaddsmileycodes('{$smileynum}');" value="{lang automatic_set}">
</td>
</tr>

9
core/class/table/table_resources_event.php
View File

@@ -365,14 +365,12 @@ class table_resources_event extends dzz_table
foreach ($condition as $k => $v) {
if (!is_array($v)) {
$connect = 'and';
$wheresql .= $connect . ' e.' . $k . " = %s ";
$params[] = $v;
$wheresql .= $connect . ' e.' . $k . " = '" . $v . "' ";
} else {
$relative = isset($v[1]) ? $v[1] : '=';
$connect = isset($v[2]) ? $v[2] : 'and';
if ($relative == 'in') {
$wheresql .= $connect . " e." . $k . " in (%n) ";
$params[]=$v[0];
$wheresql .= $connect . " e." . $k . " " . $relative . " (" . $v[0] . ") ";
} elseif ($relative == 'nowhere') {
continue;
} elseif ($relative == 'stringsql') {
@@ -381,8 +379,7 @@ class table_resources_event extends dzz_table
$wheresql .= $connect . " e." . $k . " like %s ";
$params[] = '%' . $v[0] . '%';
} else {
$wheresql .= $connect . ' e.' . $k . ' = %s ';
$params[]=$v[0] ;
$wheresql .= $connect . ' e.' . $k . ' ' . $relative . ' ' . $v[0] . ' ';
}
}

19
core/template/default/common/header_simple_start.htm
View File

@@ -10,28 +10,29 @@
<meta name="generator" content="$_G[setting][sitename]" />
<meta name="author" content="$_G[setting][sitename]" />
<meta name="copyright" content="<!--{eval echo replacesitevar($_G['setting']['sitecopyright'])}-->" />
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="default">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="MSSmartTagsPreventParsing" content="True" />
<meta http-equiv="MSThemeCompatible" content="Yes" />
<meta name="apple-touch-fullscreen" content="yes">
<meta name="renderer" content="webkit">
<base href="{$_G['siteurl']}" />
<link rel="stylesheet" type="text/css" href="static/css/barber-shop.css">
<link rel="stylesheet" type="text/css" href="static/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="static/css/common.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/css/app_manage.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/dzzicon/icon.css?{VERHASH}"/>
<link rel="stylesheet" href="static/popbox/popbox.css">
<link rel="stylesheet" type="text/css" href="static/css/common.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/dzzicon/materialdesignicons.min.css">
<link rel="stylesheet" type="text/css" href="static/css/animate.min.css">
<link rel="stylesheet" type="text/css" href="static/css/style.min.css">
<link rel="stylesheet" type="text/css" href="static/css/app_manage.css?{VERHASH}">
<link rel="stylesheet" type="text/css" href="static/css/barber-shop.css">
<link rel="stylesheet" type="text/css" href="static/dzzicon/icon.css?{VERHASH}"/>
<link rel="stylesheet" href="static/popbox/popbox.css">
<script type="text/javascript" src="static/js/pace.min.js"></script>
<script type="text/javascript" src="static/js/pace.min.js"></script>
<script type="text/javascript" src="static/jquery/jquery.min.js"></script>
<script type="text/javascript" src="static/jquery/jquery.json-2.4.min.js?{VERHASH}"></script>
<script type="text/javascript">var DZZSCRIPT='{DZZSCRIPT}',LANG='{$_G[language]}', STATICURL = 'static/', IMGDIR = '{$_G[setting][imgdir]}', VERHASH = '{VERHASH}', charset = '{CHARSET}', dzz_uid = '$_G[uid]', cookiepre = '{$_G[config][cookie][cookiepre]}', cookiedomain = '{$_G[config][cookie][cookiedomain]}', cookiepath = '{$_G[config][cookie][cookiepath]}',attackevasive = '{$_G[config][security][attackevasive]}', disallowfloat = '{$_G[setting][disallowfloat]}', REPORTURL = '$_G[currenturl_encode]', SITEURL = '$_G[siteurl]', JSPATH = '$_G[setting][jspath]',MOD_PATH='{MOD_PATH}',APP_URL='{MOD_URL}',MOD_URL='{MOD_URL}';</script>
<script type="text/javascript" src="static/popbox/jquery.popbox.js?{VERHASH}"></script>
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<script type="text/javascript" src="static/js/jquery.leftDrager.js?{VERHASH}"></script>
<!--{hook header_tpl}-->
<script type="text/javascript">
if(!!window.ActiveXObject || "ActiveXObject" in window){
try{$.ajaxSetup({ cache: false });}catch(e){}

8
dzz/comment/index.php
View File

@@ -45,15 +45,15 @@ if ($_GET['do'] == 'delete') {
'type' => $_GET['type']
);
$theurl = BASESCRIPT . "?" . url_implode($gets);
if ($_GET['dateline'] == 'desc') {
$order = 'ORDER BY dateline DESC';
if ($_GET['dateline'] == 'asc') {
$order = 'ORDER BY dateline ASC';
} elseif ($_GET['author'] == 'asc') {
$order = 'ORDER BY author ASC';
} elseif ($_GET['author'] == 'desc') {
$order = 'ORDER BY author DESC';
} else {
$_GET['dateline'] = 'asc';
$order = 'ORDER BY dateline ASC';
$_GET['dateline'] = 'desc';
$order = 'ORDER BY dateline DESC';
}
$sql = "cid!='app'";
$param = array();

4
static/css/common.css
View File

@@ -408,9 +408,9 @@ select {
z-index: 1050;
-webkit-overflow-scrolling: touch;
box-shadow: 0 0 2px rgba(var(--bs-dark-rgb), 0.375);
border-radius: var(--radius);
border-radius: var(--radius);
background: #fbfbfb;
overflow: auto;
overflow: auto;
}
.bs-left-container .bs-left-title{
font-size: 20px;

4
static/js/main.min.js vendored
View File

@@ -1,5 +1,5 @@
$(document).ready( function() {
$("button:submit,input:submit, .main-header .nav-link").click(function(){
$("button:submit,input:submit, .nav-link, .btn,.nav-item a").click(function(){
$(this).attr('disable', 'true');
var l = $(this).lyearloading({
opacity: 0.2,
@@ -8,7 +8,7 @@ $(document).ready( function() {
setTimeout(function() {
$(this).prop('disable', 'false');
l.destroy(); // 可以使用hide，页面中如果有多个loading，最好用destroy，避免后面的loading设置不生效
}, 1e3)
}, 1e3);
});
// 停止
$("body").on('click','[data-stopPropagation]',function (e) {