github
/
EasyImages2.0
mirror of https://github.com/icret/EasyImages2.0
1
0
Fork 0
Code Issues Releases Wiki Activity

* 修复显示错误

pull/141/head
icret 2023-01-31 01:27:41 +08:00
parent 4dd2c30455
commit 6777850e41
6 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -232,7 +232,6 @@ $HTTP["url"] =~ "^/(i|public)/" {
<details><summary>点击查看2.0版更新日志</summary> <details><summary>点击查看2.0版更新日志</summary>
* 2023-01-31 v2.7.0 dev * 2023-01-31 v2.7.0 dev
- 增加上传历史记录 - 增加上传历史记录
- 增加粘贴上传状态 - 增加粘贴上传状态
- 增加广场非图片图标 - 增加广场非图片图标
@ -242,6 +241,7 @@ $HTTP["url"] =~ "^/(i|public)/" {
- 修复图片详细信息中随机图片排版混乱 - 修复图片详细信息中随机图片排版混乱
- 替换访问生成缩略图代码 - 替换访问生成缩略图代码
- 更新一些组件 - 更新一些组件
- 调整前端显示
- 优化代码 - 优化代码
* 2023-01-21 v2.6.9 Happy New Year * 2023-01-21 v2.6.9 Happy New Year

18
admin/admin.inc.php
View File

@ -1210,12 +1210,12 @@ if (isset($_GET['recycle_reimg'])) {
</div> </div>
</div> </div>
</div> </div>
<link href="<?php static_cdn(); ?>/public/static/zui/lib/datagrid/zui.datagrid.min.css" rel="stylesheet"> <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/zui/lib/datagrid/zui.datagrid.min.css">
<link href="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.css" rel="stylesheet"> <link rel="stylesheet" href="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.css">
<script src="<?php static_cdn(); ?>/public/static/md5/md5.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/md5/md5.min.js"></script>
<script src="<?php static_cdn(); ?>/public/static/jscolor/jscolor.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/jscolor/jscolor.min.js"></script>
<script src="<?php static_cdn(); ?>/public/static/zui/lib/datagrid/zui.datagrid.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/datagrid/zui.datagrid.min.js"></script>
<script src="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/datetimepicker/datetimepicker.min.js"></script>
<script> <script>
// 水印字体颜色 // 水印字体颜色
jscolor.presets.myPreset = { jscolor.presets.myPreset = {
@ -1234,6 +1234,12 @@ if (isset($_GET['recycle_reimg'])) {
} }
// 使用本地存储记录当前tab页面 // 使用本地存储记录当前tab页面
if ($.zui.store.enable == false) {
new $.zui.Messager("localStorage 错误,无法存储上传历史记录", {
type: "special", // 定义颜色主题
time: 9000
}).show();
}
$('[data-tab]').on('shown.zui.tab', function(e) { $('[data-tab]').on('shown.zui.tab', function(e) {
var cookie_value = e.delegateTarget.attributes[1].value; var cookie_value = e.delegateTarget.attributes[1].value;
$.zui.store.pageSet('data-tab-now', cookie_value); $.zui.store.pageSet('data-tab-now', cookie_value);

4
admin/chart.php
View File

@ -19,8 +19,8 @@ if (isset($_POST['del_total'])) {
}).show(); }).show();
</script> </script>
'; ';
// 延时1s刷新 // 延时2s刷新
Header("refresh:1;url=chart.php"); Header("refresh:2;url=chart.php");
} }
// 统计图表 // 统计图表
// array_reverse($arr,true) 倒叙数组并保持键值关系 // array_reverse($arr,true) 倒叙数组并保持键值关系

26
application/class.version.php
View File

@ -6,7 +6,7 @@
* 简单图床 EasyImage2.0 2021-5-10 14:17:25 * 简单图床 EasyImage2.0 2021-5-10 14:17:25
*/ */
class getVerson class getVersion
{ {
private $url; private $url;
public function __construct($url) public function __construct($url)
@ -16,11 +16,11 @@ class getVerson
public function readJson($name = 'tag_name') public function readJson($name = 'tag_name')
{ {
if (file_exists(__DIR__ . '/../admin/logs/verson/verson.json')) { if (file_exists(__DIR__ . '/../admin/logs/version/version.json')) {
$file = fopen(__DIR__ . '/../admin/logs/verson/verson.json', 'r'); $file = fopen(__DIR__ . '/../admin/logs/version/version.json', 'r');
$test = fread($file, filesize(__DIR__ . '/../admin/logs/verson/verson.json')); $test = fread($file, filesize(__DIR__ . '/../admin/logs/version/version.json'));
$verson = json_decode($test, true); $version = json_decode($test, true);
return $verson[$name]; return $version[$name];
fclose($file); fclose($file);
} else { } else {
$this->downJson(); $this->downJson();
@ -30,14 +30,14 @@ class getVerson
public function downJson() public function downJson()
{ {
if (!is_dir(__DIR__ . '/../admin/logs/verson/')) { if (!is_dir(__DIR__ . '/../admin/logs/version/')) {
mkdir(__DIR__ . '/../admin/logs/verson/', 0755, true); mkdir(__DIR__ . '/../admin/logs/version/', 0755, true);
} }
$verson = $this->geturl($this->url); $version = $this->geturl($this->url);
$verson = json_decode($verson, true); $version = json_decode($version, true);
$file = fopen(__DIR__ . '/../admin/logs/verson/verson.json', 'w+'); $file = fopen(__DIR__ . '/../admin/logs/version/version.json', 'w+');
fwrite($file, $verson); fwrite($file, $version);
fclose($file); fclose($file);
} }
@ -61,6 +61,6 @@ class getVerson
/////////// TEST ///////// /////////// TEST /////////
/* /*
$url = "https://api.github.com/repositories/188228357/releases/latest"; $url = "https://api.github.com/repositories/188228357/releases/latest";
$test = new getVerson($url); $test = new getVersion($url);
echo $test->readJson(); echo $test->readJson();
*/ */

4
application/function.php
View File

@ -855,7 +855,7 @@ function getVersion($name = 'tag_name')
require_once APP_ROOT . '/application/class.version.php'; require_once APP_ROOT . '/application/class.version.php';
// 获取版本地址 // 获取版本地址
$url = "https://api.github.com/repositories/188228357/releases/latest"; $url = "https://api.github.com/repositories/188228357/releases/latest";
$getVersion = new getVerson($url); $getVersion = new getVersion($url);
$now = date('dH'); // 当前日期时间 $now = date('dH'); // 当前日期时间
$get_ver_day = array('1006', '2501'); // 检测日期的时间 $get_ver_day = array('1006', '2501'); // 检测日期的时间
@ -1513,5 +1513,5 @@ function get_current_version($file = '/admin/version.php')
return file_get_contents($file); return file_get_contents($file);
} }
return 'No Verson File'; return 'No Version File';
} }

9
application/history.php
View File

@ -19,12 +19,10 @@ include_once __DIR__ . "/header.php";
<script type="application/javascript" src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/viewjs/viewer.min.js"></script>
<script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script> <script type="application/javascript" src="<?php static_cdn(); ?>/public/static/zui/lib/clipboard/clipboard.min.js"></script>
<script> <script>
if ($.zui.store.length() > 0) { if ($.zui.store.length() > 1) {
console.log('saved: ' + $.zui.store.length()) // 获取总数
$.zui.store.forEach(function(key, value) { // 遍历所有本地存储的条目 $.zui.store.forEach(function(key, value) { // 遍历所有本地存储的条目
console.log('url list: ' + value['url']) // 获取所有链接
console.log('saved: ' + $.zui.store.length())
console.log('url list: ' + value['url'])
if (value['url'] !== undefined) { if (value['url'] !== undefined) {
let v_url = parseURL(value['url']); // 获取链接路径 console.log(parseURL(value['url']).path); let v_url = parseURL(value['url']); // 获取链接路径 console.log(parseURL(value['url']).path);
$('.listNum').append('<div class="col-md-4 col-sm-6 col-lg-3"><div class="card"><li><img src="../public/images/loading.svg" data-image="' + value['thumb'] + '" data-original="" alt="简单图床-EasyImage"></li><div class="bottom-bar"><a href="' + value['url'] + '" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="打开" style="margin-left:10px;"></i></a><a href="#" class="copy" data-clipboard-text="' + value['url'] + '" data-toggle="tooltip" title="复制" style="margin-left:10px;"><i class="icon icon-copy"></i></a><a href="info.php?img=' + v_url.path + '" data-toggle="tooltip" title="信息" target="_blank" style="margin-left:10px;"><i class="icon icon-info-sign"></i></a><a href="down.php?dw=' + v_url.path + '" data-toggle="tooltip" title="下载" target="_blank" style="margin-left:10px;"><i class="icon icon-cloud-download"></i></a><a href="' + value['del'] + '" target="_blank"><i class="icon icon-trash" data-toggle="tooltip" title="删除" style="margin-left:10px;"></i></a><a href="#" data-toggle="tooltip" title="文件名" class="copy text-ellipsis" data-clipboard-text="' + value['srcName'] + '" style="margin-left:10px;">' + value['srcName'] + '</a></div></div></div>') $('.listNum').append('<div class="col-md-4 col-sm-6 col-lg-3"><div class="card"><li><img src="../public/images/loading.svg" data-image="' + value['thumb'] + '" data-original="" alt="简单图床-EasyImage"></li><div class="bottom-bar"><a href="' + value['url'] + '" target="_blank"><i class="icon icon-picture" data-toggle="tooltip" title="打开" style="margin-left:10px;"></i></a><a href="#" class="copy" data-clipboard-text="' + value['url'] + '" data-toggle="tooltip" title="复制" style="margin-left:10px;"><i class="icon icon-copy"></i></a><a href="info.php?img=' + v_url.path + '" data-toggle="tooltip" title="信息" target="_blank" style="margin-left:10px;"><i class="icon icon-info-sign"></i></a><a href="down.php?dw=' + v_url.path + '" data-toggle="tooltip" title="下载" target="_blank" style="margin-left:10px;"><i class="icon icon-cloud-download"></i></a><a href="' + value['del'] + '" target="_blank"><i class="icon icon-trash" data-toggle="tooltip" title="删除" style="margin-left:10px;"></i></a><a href="#" data-toggle="tooltip" title="文件名" class="copy text-ellipsis" data-clipboard-text="' + value['srcName'] + '" style="margin-left:10px;">' + value['srcName'] + '</a></div></div></div>')
@ -34,7 +32,6 @@ include_once __DIR__ . "/header.php";
} else { } else {
$('.listNum').append('<h2 class="alert alert-danger">上传历史记录不存在~~ <br /><small>非上传记录 | 清空缓存 | 浏览器版本低不显示~!</small></h2>'); $('.listNum').append('<h2 class="alert alert-danger">上传历史记录不存在~~ <br /><small>非上传记录 | 清空缓存 | 浏览器版本低不显示~!</small></h2>');
}; };
// 清空所有本地存储的条目 // 清空所有本地存储的条目
$('button').on('click', function() { $('button').on('click', function() {
new $.zui.Messager('已清空' + $.zui.store.length() + "条历史记录", { new $.zui.Messager('已清空' + $.zui.store.length() + "条历史记录", {