Skip to content

Commit

Permalink
优化:导出当前筛选结果筛选提示
Browse files Browse the repository at this point in the history
  • Loading branch information
modstart committed Nov 3, 2024
1 parent 80beb8d commit 22a2672
Show file tree
Hide file tree
Showing 56 changed files with 941 additions and 479 deletions.
2 changes: 1 addition & 1 deletion module/Blog/Api/Controller/BlogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public function visitPasswordVerify()
if (!in_array($record['id'], $visitVerifiedIds)) {
$visitVerifiedIds[] = $record['id'];
}
Session::set('Blog_VisitVerifiedIds', $visitVerifiedIds);
Session::put('Blog_VisitVerifiedIds', $visitVerifiedIds);
return Response::generate(0, '验证成功', null, UrlUtil::blog($record));
}
}
2 changes: 1 addition & 1 deletion module/Vendor/Admin/Controller/SecurityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function secondVerify(AdminPage $page)
$password = $data['password'];
$passwordCorrectMd5 = modstart_config('Vendor_SecuritySecondVerifyPassword');
BizException::throwsIf('密码不正确', md5($password) != $passwordCorrectMd5);
Session::set('Vendor_SecuritySecondVerifyTime', time() + 3600);
Session::put('Vendor_SecuritySecondVerifyTime', time() + 3600);
return Response::send(0, null, null, $redirect);
});
}
Expand Down
2 changes: 1 addition & 1 deletion module/Vendor/QuickRun/ImageDesign/ImageDesignUtil.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static function configSaveCheck($imageConfig)
BizException::throwsIfEmpty('imageConfig 为空', $imageConfig);
BizException::throwsIfEmpty('宽度为空', $imageConfig['width']);
BizException::throwsIfEmpty('高度为空', $imageConfig['height']);
BizException::throwsIfEmpty('背景图和背景色同时为空', empty($imageConfig['backgroundImage']) && empty($imageConfig['backgroundColor']));
BizException::throwsIf('背景图和背景色同时为空', empty($imageConfig['backgroundImage']) && empty($imageConfig['backgroundColor']));
}

public static function render($imageConfig, $variables = [])
Expand Down
4 changes: 2 additions & 2 deletions module/Vendor/Tecmz/TecmzUtil.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

class TecmzUtil
{
public static function url()
public static function url($module = null)
{
return 'https://api.tecmz.com';
return 'https://api.tecmz.com' . ($module ? '/m/' . $module : '');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion module/Vendor/Traits/SecurityTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ private function checkSecuritySecondVerify()
]));
exit();
}
Session::set('Vendor_SecuritySecondVerifyTime', time() + 3600);
Session::put('Vendor_SecuritySecondVerifyTime', time() + 3600);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class VisitStatisticItemController extends Controller
use HasAdminQuickCRUD;

public static $PermitMethodMap = [
'index' => '\\Module\\VisitStatistic\\Admin\\Controller\\VisitStatisticReportController@index'
'*' => '\\Module\\VisitStatistic\\Admin\\Controller\\VisitStatisticReportController@index'
];

public function __construct()
Expand Down
3 changes: 0 additions & 3 deletions module/VisitStatistic/Docs/module/demo.md

This file was deleted.

6 changes: 6 additions & 0 deletions module/VisitStatistic/Docs/release.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 1.2.1 运营报表-网站访问-明细-删除提示无权限问题

- 修复:运营报表-网站访问-明细-删除提示无权限问题

---

## 1.2.0 运营报表页面,实时数据优化

- 新增:运营报表-网站访问页面,合并设置和详细页面
Expand Down
4 changes: 2 additions & 2 deletions module/VisitStatistic/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"Vendor:>=3.8.0"
],
"suggest": [],
"version": "1.2.0",
"version": "1.2.1",
"modstartVersion": ">=3.9.0",
"author": "ModStart",
"description": "提供内置的网站访问记录功能",
"providers": [],
"config": {}
}
}
2 changes: 1 addition & 1 deletion vendor/modstart/modstart/asset/common/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/modstart/modstart/asset/common/photoswipe.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/modstart/modstart/asset/common/share.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

</div>
</div>
<script type="text/javascript" src="attachment.js?b17a61b0"></script>
<script type="text/javascript" src="attachment.js?30c88b65"></script>

</body>
</html>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@
<link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css?0057c5c7">

<!-- audio -->
<script type="text/javascript" src="audio.js?a3aa9e68"></script>
<script type="text/javascript" src="audio.js?2d786af4"></script>
</body>
</html>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@

</div>
</div>
<script type="text/javascript" src="image.js?41835e90"></script>
<script type="text/javascript" src="image.js?6a7f39bf"></script>
</body>
</html>

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</div>
<div id="J_maskLayer" class="maskLayerNull"></div>

<script type="text/javascript" src="scrawl.js?ee947940"></script>
<script type="text/javascript" src="scrawl.js?e3d28a2b"></script>
<script type="text/javascript">
var settings = {
drawBrushSize: 3, //画笔初始大小
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@
<link rel="stylesheet" type="text/css" href="../../third-party/webuploader/webuploader.css?0057c5c7">

<!-- video -->
<script type="text/javascript" src="video.js?e86bdd50"></script>
<script type="text/javascript" src="video.js?101f4d14"></script>
</body>
</html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modstart/modstart/config/modstart.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

'name' => 'ModStart',

'trackMissingLang' => false,
'trackMissingLang' => env('TRACK_MISSING_LANG', false),
/**
* 开启性能追踪,开启后会在日志中记录必要的请求,如慢SQL执行、多查询请求
*/
Expand Down
Loading

0 comments on commit 22a2672

Please sign in to comment.