From ab083686a812f0b3fdc215e24206e450dac58416 Mon Sep 17 00:00:00 2001 From: Karson Date: Tue, 6 Apr 2021 12:03:25 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=92=8C=E4=BD=99=E9=A2=9D=E5=B9=B6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/model/User.php | 61 +++++++++++++++++++------------ 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/application/common/model/User.php b/application/common/model/User.php index c32598c92..097ed4aed 100644 --- a/application/common/model/User.php +++ b/application/common/model/User.php @@ -2,6 +2,7 @@ namespace app\common\model; +use think\Db; use think\Model; /** @@ -22,8 +23,8 @@ class User extends Model /** * 获取个人URL - * @param string $value - * @param array $data + * @param string $value + * @param array $data * @return string */ public function getUrlAttr($value, $data) @@ -33,8 +34,8 @@ class User extends Model /** * 获取头像 - * @param string $value - * @param array $data + * @param string $value + * @param array $data * @return string */ public function getAvatarAttr($value, $data) @@ -57,8 +58,8 @@ class User extends Model /** * 获取验证字段数组值 - * @param string $value - * @param array $data + * @param string $value + * @param array $data * @return object */ public function getVerificationAttr($value, $data) @@ -87,15 +88,21 @@ class User extends Model */ public static function money($money, $user_id, $memo) { - $user = self::get($user_id); - if ($user && $money != 0) { - $before = $user->money; - //$after = $user->money + $money; - $after = function_exists('bcadd') ? bcadd($user->money, $money, 2) : $user->money + $money; - //更新会员信息 - $user->save(['money' => $after]); - //写入日志 - MoneyLog::create(['user_id' => $user_id, 'money' => $money, 'before' => $before, 'after' => $after, 'memo' => $memo]); + Db::startTrans(); + try { + $user = self::lock(true)->find($user_id); + if ($user && $money != 0) { + $before = $user->money; + //$after = $user->money + $money; + $after = function_exists('bcadd') ? bcadd($user->money, $money, 2) : $user->money + $money; + //更新会员信息 + $user->save(['money' => $after]); + //写入日志 + MoneyLog::create(['user_id' => $user_id, 'money' => $money, 'before' => $before, 'after' => $after, 'memo' => $memo]); + } + Db::commit(); + } catch (\Exception $e) { + Db::rollback(); } } @@ -107,15 +114,21 @@ class User extends Model */ public static function score($score, $user_id, $memo) { - $user = self::get($user_id); - if ($user && $score != 0) { - $before = $user->score; - $after = $user->score + $score; - $level = self::nextlevel($after); - //更新会员信息 - $user->save(['score' => $after, 'level' => $level]); - //写入日志 - ScoreLog::create(['user_id' => $user_id, 'score' => $score, 'before' => $before, 'after' => $after, 'memo' => $memo]); + Db::startTrans(); + try { + $user = self::lock(true)->find($user_id); + if ($user && $score != 0) { + $before = $user->score; + $after = $user->score + $score; + $level = self::nextlevel($after); + //更新会员信息 + $user->save(['score' => $after, 'level' => $level]); + //写入日志 + ScoreLog::create(['user_id' => $user_id, 'score' => $score, 'before' => $before, 'after' => $after, 'memo' => $memo]); + } + Db::commit(); + } catch (\Exception $e) { + Db::rollback(); } } -- Gitee From 1c62049989f8ec5aeeb91e2eb1673513fde4f2ad Mon Sep 17 00:00:00 2001 From: YouKnow <2900928498@qq.com> Date: Fri, 9 Apr 2021 15:56:03 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BC=98=E5=8C=96user=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/validate/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php index ab0622055..252f4cf5c 100644 --- a/application/admin/validate/User.php +++ b/application/admin/validate/User.php @@ -32,7 +32,7 @@ class User extends Validate */ protected $scene = [ 'add' => [], - 'edit' => ['username', 'email', 'nickname', 'password', 'email', 'mobile'], + 'edit' => ['username', 'nickname', 'password', 'email', 'mobile'], ]; public function __construct(array $rules = [], $message = [], $field = []) -- Gitee From 6b9e5ba379b682ea7069217e797bb69f35e3ec48 Mon Sep 17 00:00:00 2001 From: T2cc <5152438+gtguizhou@user.noreply.gitee.com> Date: Sun, 11 Apr 2021 22:36:53 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=20ap?= =?UTF-8?q?i=20=E6=96=87=E6=A1=A3=E6=8A=A5=E9=94=99=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Api/library/Extractor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/command/Api/library/Extractor.php b/application/admin/command/Api/library/Extractor.php index 401153657..fdd52de18 100644 --- a/application/admin/command/Api/library/Extractor.php +++ b/application/admin/command/Api/library/Extractor.php @@ -297,7 +297,7 @@ class Extractor } } $methodAnnotations['ApiPermissionLogin'] = [!in_array('*', $noNeedLogin) && !in_array($methodName, $noNeedLogin)]; - $methodAnnotations['ApiPermissionRight'] = !$methodAnnotations['ApiPermissionLogin'][0] ? false : [!in_array('*', $noNeedRight) && !in_array($methodName, $noNeedRight)]; + $methodAnnotations['ApiPermissionRight'] = !$methodAnnotations['ApiPermissionLogin'][0] ? [false] : [!in_array('*', $noNeedRight) && !in_array($methodName, $noNeedRight)]; return $methodAnnotations; } -- Gitee From d59ff78fd89ecda4db2fd41a3fbbc62d566414af Mon Sep 17 00:00:00 2001 From: F4NNIU Date: Thu, 13 May 2021 22:31:12 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20framework=20type=20?= =?UTF-8?q?=E4=B8=BA=20git?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e20ce7460..90e0ea86d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台开发框架。 +FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。 ## 主要特性 diff --git a/composer.json b/composer.json index b3b118b4d..b059b41ab 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "repositories": [ { - "type": "vcs", + "type": "git", "url": "https://gitee.com/karson/framework" } ] -- Gitee From cdebb284c33b8a9eee54745b4934a83fd3849355 Mon Sep 17 00:00:00 2001 From: Karson Date: Wed, 19 May 2021 17:52:34 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E8=A7=84=E5=88=99=E4=B8=AD=E7=9A=84=E6=9D=A1=E4=BB=B6=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/fast/Auth.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/extend/fast/Auth.php b/extend/fast/Auth.php index 396c4cfc9..81429ef30 100644 --- a/extend/fast/Auth.php +++ b/extend/fast/Auth.php @@ -140,7 +140,7 @@ class Auth /** * 根据用户id获取用户组,返回值为数组 - * @param int $uid 用户id + * @param int $uid 用户id * @return array 用户所属的用户组 array( * array('uid'=>'用户id','group_id'=>'用户组id','name'=>'用户组名称','rules'=>'用户组拥有的规则id,多个,号隔开'), * ...) @@ -205,9 +205,17 @@ class Auth if (!empty($rule['condition']) && !in_array('*', $ids)) { //根据condition进行验证 $user = $this->getUserInfo($uid); //获取用户信息,一维数组 - $command = preg_replace('/\{(\w*?)\}/', '$user[\'\\1\']', $rule['condition']); - @(eval('$condition=(' . $command . ');')); - if ($condition) { + $nums = 0; + $condition = str_replace(['&&', '||'], "\r\n", $rule['condition']); + $condition = preg_replace('/\{(\w*?)\}/', '\\1', $condition); + $conditionArr = explode("\r\n", $condition); + foreach ($conditionArr as $index => $item) { + preg_match("/^(\w+)\s?([\>\<\=]+)\s?(.*)$/", trim($item), $matches); + if ($matches && isset($user[$matches[1]]) && version_compare($user[$matches[1]], $matches[3], $matches[2])) { + $nums++; + } + } + if ($conditionArr && ((stripos($rule['condition'], "||") !== false && $nums > 0) || count($conditionArr) == $nums)) { $rulelist[$rule['id']] = strtolower($rule['name']); } } else { @@ -254,4 +262,4 @@ class Auth return $user_info[$uid]; } -} \ No newline at end of file +} -- Gitee From bf720c176ebe8ec3d2ffb011a4b68f8e18d07979 Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 4 Jun 2021 14:33:44 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=8A=9F=E8=83=BD=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E8=AE=BE=E5=AE=9A=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E5=8A=9F=E8=83=BD=20=E4=BC=98=E5=8C=96=E5=88=86?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E8=BF=9B=E8=A1=8C=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94=E8=AE=A1=E7=AE=97=20=E4=BC=98=E5=8C=96=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=AD=97=E5=85=B8=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/command/Install/fastadmin.sql | 4 +- .../admin/controller/general/Attachment.php | 39 ++++++++++++++++-- .../admin/controller/general/Config.php | 8 ++++ .../admin/lang/zh-cn/general/attachment.php | 8 ++++ .../admin/lang/zh-cn/general/config.php | 3 ++ .../admin/view/general/attachment/edit.html | 13 ++++++ .../admin/view/general/attachment/index.html | 18 +++++++- .../admin/view/general/attachment/select.html | 6 +-- application/common/library/Upload.php | 3 ++ application/common/model/Attachment.php | 24 +++++++++++ application/extra/site.php | 5 +++ .../assets/js/backend/general/attachment.js | 41 +++++++++++++++---- public/assets/js/require-upload.js | 14 +++++-- 13 files changed, 163 insertions(+), 23 deletions(-) diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 8df72f5f3..9fa3529ed 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -80,6 +80,7 @@ CREATE TABLE `fa_area` ( DROP TABLE IF EXISTS `fa_attachment`; CREATE TABLE `fa_attachment` ( `id` int(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID', + `category` varchar(50) DEFAULT '' COMMENT '类别', `admin_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '管理员ID', `user_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '会员ID', `url` varchar(255) DEFAULT '' COMMENT '物理路径', @@ -103,7 +104,7 @@ CREATE TABLE `fa_attachment` ( -- Records of fa_attachment -- ---------------------------- BEGIN; -INSERT INTO `fa_attachment` VALUES (1, 1, 0, '/assets/img/qrcode.png', '150', '150', 'png', 0, 'qrcode.png', 21859, 'image/png', '', 1491635035, 1491635035, 1491635035, 'local', '17163603d0263e4838b9387ff2cd4877e8b018f6'); +INSERT INTO `fa_attachment` VALUES (1, '', 1, 0, '/assets/img/qrcode.png', '150', '150', 'png', 0, 'qrcode.png', 21859, 'image/png', '', 1491635035, 1491635035, 1491635035, 'local', '17163603d0263e4838b9387ff2cd4877e8b018f6'); COMMIT; -- ---------------------------- @@ -350,6 +351,7 @@ INSERT INTO `fa_config` VALUES (14, 'mail_smtp_user', 'email', 'Mail smtp user', INSERT INTO `fa_config` VALUES (15, 'mail_smtp_pass', 'email', 'Mail smtp password', '（填写您的密码或授权码）', 'string', 'password', '', '', '', ''); INSERT INTO `fa_config` VALUES (16, 'mail_verify_type', 'email', 'Mail vertify type', '（SMTP验证方式[推荐SSL]）', 'select', '2', '[\"无\",\"TLS\",\"SSL\"]', '', '', ''); INSERT INTO `fa_config` VALUES (17, 'mail_from', 'email', 'Mail from', '', 'string', '10000@qq.com', '', '', '', ''); +INSERT INTO `fa_config` VALUES (18, 'attachmentcategory', 'dictionary', 'Attachment category', '', 'array', '{\"category1\":\"Category1\",\"category2\":\"Category2\",\"custom\":\"Custom\"}', '', '', '', ''); COMMIT; -- ---------------------------- diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index d73c25cef..57296f2f9 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -8,7 +8,7 @@ use app\common\controller\Backend; * 附件管理 * * @icon fa fa-circle-o - * @remark 主要用于管理上传到又拍云的数据或上传至本服务的上传数据 + * @remark 主要用于管理上传到服务器或第三方存储的数据 */ class Attachment extends Backend { @@ -18,11 +18,15 @@ class Attachment extends Backend */ protected $model = null; + protected $searchFields = 'id,filename,url'; + public function _initialize() { parent::_initialize(); $this->model = model('Attachment'); $this->view->assign("mimetypeList", \app\common\model\Attachment::getMimetypeList()); + $this->view->assign("categoryList", \app\common\model\Attachment::getCategoryList()); + $this->assignconfig("categoryList", \app\common\model\Attachment::getCategoryList()); } /** @@ -36,10 +40,15 @@ class Attachment extends Backend $mimetypeQuery = []; $filter = $this->request->request('filter'); $filterArr = (array)json_decode($filter, true); + if (isset($filterArr['category']) && $filterArr['category'] == 'unclassed') { + $filterArr['category'] = ''; + $this->request->get(['filter' => json_encode(array_diff_key($filterArr, ['category' => '']))]); + } if (isset($filterArr['mimetype']) && preg_match("/[]\,|\*]/", $filterArr['mimetype'])) { - $this->request->get(['filter' => json_encode(array_diff_key($filterArr, ['mimetype' => '']))]); - $mimetypeQuery = function ($query) use ($filterArr) { - $mimetypeArr = explode(',', $filterArr['mimetype']); + $mimetype = $filterArr['mimetype']; + $filterArr = array_diff_key($filterArr, ['mimetype' => '']); + $mimetypeQuery = function ($query) use ($mimetype) { + $mimetypeArr = explode(',', $mimetype); foreach ($mimetypeArr as $index => $item) { if (stripos($item, "/*") !== false) { $query->whereOr('mimetype', 'like', str_replace("/*", "/", $item) . '%'); @@ -49,6 +58,7 @@ class Attachment extends Backend } }; } + $this->request->get(['filter' => json_encode($filterArr)]); list($where, $sort, $order, $offset, $limit) = $this->buildparams(); @@ -121,4 +131,25 @@ class Attachment extends Backend $this->error(__('Parameter %s can not be empty', 'ids')); } + /** + * 移动 + */ + public function move($ids = "") + { + if (!$this->request->isPost()) { + $this->error(__("Invalid parameters")); + } + $category = $this->request->post('category', ''); + $ids = $this->request->post('ids'); + if (!$ids) { + $this->error(__('Parameter %s can not be empty', 'ids')); + } + $categoryList = \app\common\model\Attachment::getCategoryList(); + if ($category && !isset($categoryList[$category])) { + $this->error(__('Category not found')); + } + \app\common\model\Attachment::where('id', 'in', $ids)->update(['category' => $category]); + $this->success(); + } + } diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php index f4b93e2a1..bab69e841 100644 --- a/application/admin/controller/general/Config.php +++ b/application/admin/controller/general/Config.php @@ -60,6 +60,14 @@ class Config extends Backend $value['value'] = explode(',', $value['value']); } $value['content'] = json_decode($value['content'], true); + if (in_array($value['name'], ['categorytype', 'configgroup', 'attachmentcategory'])) { + $dictValue = (array)json_decode($value['value'], true); + foreach ($dictValue as $index => &$item) { + $item = __($item); + } + unset($item); + $value['value'] = json_encode($dictValue, JSON_UNESCAPED_UNICODE); + } $value['tip'] = htmlspecialchars($value['tip']); $siteList[$v['group']]['list'][] = $value; } diff --git a/application/admin/lang/zh-cn/general/attachment.php b/application/admin/lang/zh-cn/general/attachment.php index 90fe66d72..86690e2a2 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -23,9 +23,17 @@ return [ 'Createtime' => '创建日期', 'Uploadtime' => '上传时间', 'Storage' => '存储引擎', + 'Category1' => '分类一', + 'Category2' => '分类二', + 'Custom' => '自定义', + 'Unclassed' => '未归类', + 'Category' => '类别', 'Upload to third' => '上传到第三方', 'Upload to local' => '上传到本地', 'Upload to third by chunk' => '上传到第三方(分片模式)', 'Upload to local by chunk' => '上传到本地(分片模式)', + 'Please enter a new name' => '请输入新的类别名称', + 'Please select category' => '请选择一个类别', + 'Category not found' => '指定的类别未找到', 'Upload from editor' => '从编辑器上传' ]; diff --git a/application/admin/lang/zh-cn/general/config.php b/application/admin/lang/zh-cn/general/config.php index 021384f3b..6a2b95d6a 100644 --- a/application/admin/lang/zh-cn/general/config.php +++ b/application/admin/lang/zh-cn/general/config.php @@ -57,6 +57,9 @@ return [ 'Fixed page' => '后台固定页', 'Category type' => '分类类型', 'Config group' => '配置分组', + 'Attachment category' => '附件类别', + 'Category1' => '分类一', + 'Category2' => '分类二', 'Rule tips' => '校验规则使用请参考Nice-validator文档', 'Extend tips' => '扩展属性支持{id}、{name}、{group}、{title}、{value}、{content}、{rule}替换', 'Mail type' => '邮件发送方式', diff --git a/application/admin/view/general/attachment/edit.html b/application/admin/view/general/attachment/edit.html index 8caa393ec..85898b573 100644 --- a/application/admin/view/general/attachment/edit.html +++ b/application/admin/view/general/attachment/edit.html @@ -1,5 +1,18 @@ + +
+
+ +
+ +
+
diff --git a/application/admin/view/general/attachment/index.html b/application/admin/view/general/attachment/index.html index 53cb2b8f5..8aaf0435b 100644 --- a/application/admin/view/general/attachment/index.html +++ b/application/admin/view/general/attachment/index.html @@ -2,9 +2,9 @@
{:build_heading(null,FALSE)} -
    +
    • {:__('All')}
      • - {foreach name="mimetypeList" item="vo"} + {foreach name="categoryList" item="vo"}
    • {$vo}
      • {/foreach}
    @@ -16,6 +16,7 @@
    {:build_toolbar('refresh,add,edit,del')} + {:__('Move')}
    + + diff --git a/application/admin/view/general/attachment/select.html b/application/admin/view/general/attachment/select.html index 4f09469eb..69e31b208 100644 --- a/application/admin/view/general/attachment/select.html +++ b/application/admin/view/general/attachment/select.html @@ -6,17 +6,15 @@ {/if}
    - {if !$Think.get.mimetype}
    {:build_heading(null,FALSE)} -
      +
      • {:__('All')}
        • - {foreach name="mimetypeList" item="vo"} + {foreach name="categoryList" item="vo"}
      • {$vo}
        • {/foreach}
    - {/if}
    diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php index 5f1424e18..daccab86a 100644 --- a/application/common/library/Upload.php +++ b/application/common/library/Upload.php @@ -352,10 +352,13 @@ class Upload } } $this->file = $file; + $category = request()->post('category'); + $category = array_key_exists($category, config('site.attachmentcategory') ?? []) ? $category : ''; $params = array( 'admin_id' => (int)session('admin.id'), 'user_id' => (int)cookie('uid'), 'filename' => substr(htmlspecialchars(strip_tags($this->fileInfo['name'])), 0, 100), + 'category' => $category, 'filesize' => $this->fileInfo['size'], 'imagewidth' => $this->fileInfo['imagewidth'], 'imageheight' => $this->fileInfo['imageheight'], diff --git a/application/common/model/Attachment.php b/application/common/model/Attachment.php index b76495302..c4540bc0d 100644 --- a/application/common/model/Attachment.php +++ b/application/common/model/Attachment.php @@ -24,6 +24,16 @@ class Attachment extends Model return is_numeric($value) ? $value : strtotime($value); } + public function getCategoryAttr($value) + { + return $value == '' ? 'unclassed' : $value; + } + + public function setCategoryAttr($value) + { + return $value == 'unclassed' ? '' : $value; + } + /** * 获取云储存的缩略图样式字符 */ @@ -53,6 +63,20 @@ class Attachment extends Model return $data; } + /** + * 获取定义的附件类别列表 + * @return array + */ + public static function getCategoryList() + { + $data = config('site.attachmentcategory')??[]; + foreach ($data as $index => &$datum) { + $datum = __($datum); + } + $data['unclassed'] = __('Unclassed'); + return $data; + } + protected static function init() { // 如果已经上传该资源，则不再记录 diff --git a/application/extra/site.php b/application/extra/site.php index 0cee877ba..2f05103f8 100644 --- a/application/extra/site.php +++ b/application/extra/site.php @@ -25,6 +25,11 @@ return [ 'user' => 'User', 'example' => 'Example', ], + 'attachmentcategory' => [ + 'category1' => 'Category1', + 'category2' => 'Category2', + 'custom' => 'Custom', + ], 'mail_type' => '1', 'mail_smtp_host' => 'smtp.qq.com', 'mail_smtp_port' => '465', diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js index 0196c3e96..79db1d1f5 100644 --- a/public/assets/js/backend/general/attachment.js +++ b/public/assets/js/backend/general/attachment.js @@ -24,11 +24,12 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin [ {field: 'state', checkbox: true}, {field: 'id', title: __('Id')}, + {field: 'category', title: __('Category'), formatter: Table.api.formatter.label, searchList: Config.categoryList}, {field: 'admin_id', title: __('Admin_id'), visible: false, addClass: "selectpage", extend: "data-source='auth/admin/index' data-field='nickname'"}, {field: 'user_id', title: __('User_id'), visible: false, addClass: "selectpage", extend: "data-source='user/user/index' data-field='nickname'"}, {field: 'preview', title: __('Preview'), formatter: Controller.api.formatter.thumb, operate: false}, {field: 'url', title: __('Url'), formatter: Controller.api.formatter.url, visible: false}, - {field: 'filename', title: __('Filename'), formatter: Controller.api.formatter.filename, operate: 'like'}, + {field: 'filename', title: __('Filename'), sortable: true, formatter: Controller.api.formatter.filename, operate: 'like'}, { field: 'filesize', title: __('Filesize'), operate: 'BETWEEN', sortable: true, formatter: function (value, row, index) { var size = parseFloat(value); @@ -38,7 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin }, {field: 'imagewidth', title: __('Imagewidth'), sortable: true}, {field: 'imageheight', title: __('Imageheight'), sortable: true}, - {field: 'imagetype', title: __('Imagetype'), formatter: Table.api.formatter.search, operate: 'like'}, + {field: 'imagetype', title: __('Imagetype'), sortable: true, formatter: Table.api.formatter.search, operate: 'like'}, {field: 'storage', title: __('Storage'), formatter: Table.api.formatter.search, operate: 'like'}, {field: 'mimetype', title: __('Mimetype'), formatter: Table.api.formatter.search}, { @@ -47,7 +48,8 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', - sortable: true + sortable: true, + width: 150 }, { field: 'operate', @@ -63,6 +65,28 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin // 为表格绑定事件 Table.api.bindevent(table); + $(document).on('click', '.btn-move', function () { + var ids = Table.api.selectedids(table); + Layer.open({ + title: __('Move'), + content: Template("typetpl", {}), + btn: [__('Move')], + yes: function (index, layero) { + var category = $("select[name='category']", layero).val(); + Fast.api.ajax({ + url: "general/attachment/move", + type: "post", + data: {category: category, ids: ids.join(',')}, + }, function () { + table.bootstrapTable('refresh', {}); + Layer.close(index); + }); + }, + success: function (layero, index) { + } + }); + }); + }, select: function () { // 初始化表格参数配置 @@ -106,14 +130,15 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin [ {field: 'state', checkbox: multiple, visible: multiple, operate: false}, {field: 'id', title: __('Id')}, + {field: 'category', title: __('Category'), formatter: Table.api.formatter.label, searchList: Config.categoryList}, {field: 'admin_id', title: __('Admin_id'), formatter: Table.api.formatter.search, visible: false}, {field: 'user_id', title: __('User_id'), formatter: Table.api.formatter.search, visible: false}, {field: 'url', title: __('Preview'), formatter: Controller.api.formatter.thumb, operate: false}, - {field: 'filename', title: __('Filename'), formatter: Controller.api.formatter.filename, operate: 'like'}, - {field: 'imagewidth', title: __('Imagewidth'), operate: false}, - {field: 'imageheight', title: __('Imageheight'), operate: false}, + {field: 'filename', title: __('Filename'), sortable: true, formatter: Controller.api.formatter.filename, operate: 'like'}, + {field: 'imagewidth', title: __('Imagewidth'), operate: false, sortable: true}, + {field: 'imageheight', title: __('Imageheight'), operate: false, sortable: true}, { - field: 'mimetype', title: __('Mimetype'), operate: 'LIKE %...%', + field: 'mimetype', title: __('Mimetype'), sortable: true, operate: 'LIKE %...%', process: function (value, arg) { return value.replace(/\*/g, '%'); } @@ -162,7 +187,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin formatter: { thumb: function (value, row, index) { if (row.mimetype.indexOf("image") > -1) { - return ''; + return ''; } else { return ''; } diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js index ff6ad40ff..650c593c4 100755 --- a/public/assets/js/require-upload.js +++ b/public/assets/js/require-upload.js @@ -251,10 +251,16 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, Upload.events.onUploadError(this, ret, file); }, uploadprogress: function (file, progress, bytesSent) { - + if (file.upload.chunked) { + var totalBytesSent = 0; + file.upload.chunks.forEach(function (item) { + totalBytesSent += item.bytesSent; + }); + $(this.element).prop("disabled", true).html(" " + __('Upload') + Math.floor((totalBytesSent / file.size) * 100) + "%"); + } }, totaluploadprogress: function (progress, bytesSent) { - if (this.getActiveFiles().length > 0) { + if (this.getActiveFiles().length > 0 && !this.options.chunking) { $(this.element).prop("disabled", true).html(" " + __('Upload') + Math.floor(progress) + "%"); } }, @@ -269,13 +275,13 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, var that = this; Fast.api.ajax({ url: this.options.url, - data: { + data: $.extend({}, multipart, { action: 'merge', filesize: file.size, filename: file.name, chunkid: file.upload.uuid, chunkcount: file.upload.totalChunkCount, - } + }) }, function (data, ret) { done(JSON.stringify(ret)); return false; -- Gitee From ed0da37370d2209cadd2a00a676573838eedcf88 Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 4 Jun 2021 14:49:23 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=BD=92=E7=B1=BB=E6=96=87=E5=AD=97=E5=92=8C=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/general/Attachment.php | 9 +++++++-- application/admin/lang/zh-cn/general/attachment.php | 1 + application/admin/view/general/attachment/index.html | 2 +- public/assets/js/backend/general/attachment.js | 9 +++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/application/admin/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index 57296f2f9..2963a0993 100644 --- a/application/admin/controller/general/Attachment.php +++ b/application/admin/controller/general/Attachment.php @@ -19,6 +19,7 @@ class Attachment extends Backend protected $model = null; protected $searchFields = 'id,filename,url'; + protected $noNeedRight = ['classify']; public function _initialize() { @@ -132,10 +133,14 @@ class Attachment extends Backend } /** - * 移动 + * 归类 */ - public function move($ids = "") + public function classify() { + if (!$this->auth->check('general/attachment/edit')) { + \think\Hook::listen('admin_nopermission', $this); + $this->error(__('You have no permission'), ''); + } if (!$this->request->isPost()) { $this->error(__("Invalid parameters")); } diff --git a/application/admin/lang/zh-cn/general/attachment.php b/application/admin/lang/zh-cn/general/attachment.php index 86690e2a2..afcf06f38 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -28,6 +28,7 @@ return [ 'Custom' => '自定义', 'Unclassed' => '未归类', 'Category' => '类别', + 'Classify' => '归类', 'Upload to third' => '上传到第三方', 'Upload to local' => '上传到本地', 'Upload to third by chunk' => '上传到第三方(分片模式)', diff --git a/application/admin/view/general/attachment/index.html b/application/admin/view/general/attachment/index.html index 8aaf0435b..7272d7581 100644 --- a/application/admin/view/general/attachment/index.html +++ b/application/admin/view/general/attachment/index.html @@ -16,7 +16,7 @@
    {:build_toolbar('refresh,add,edit,del')} - {:__('Move')} + {:__('Classify')}
    Date: Fri, 4 Jun 2021 14:53:42 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=83=E9=87=8D?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=20=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=86=99=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Ajax.php | 2 +- application/admin/model/AuthRule.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index a1cc8a716..bd0b5d005 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -158,7 +158,7 @@ class Ajax extends Backend $weighdata[$v[$prikey]] = $v[$field]; } $position = array_search($changeid, $ids); - $desc_id = $sour[$position]; //移动到目标的ID值,取出所处改变前位置的值 + $desc_id = isset($sour[$position]) ? $sour[$position] : end($sour); //移动到目标的ID值,取出所处改变前位置的值 $sour_id = $changeid; $weighids = array(); $temp = array_values(array_diff_assoc($ids, $sour)); diff --git a/application/admin/model/AuthRule.php b/application/admin/model/AuthRule.php index 236cb6383..526b6b591 100644 --- a/application/admin/model/AuthRule.php +++ b/application/admin/model/AuthRule.php @@ -16,6 +16,12 @@ class AuthRule extends Model protected static function init() { + self::beforeWrite(function ($row) { + if (isset($_POST['row']) && is_array($_POST['row']) && isset($_POST['row']['condition'])) { + $originRow = $_POST['row']; + $row['condition'] = $originRow['condition'] ?? ''; + } + }); self::afterWrite(function ($row) { Cache::rm('__menu__'); }); -- Gitee From 8130a49fab328cfc90b1757cfbfdddc7a78fc884 Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 4 Jun 2021 14:57:03 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=87=E7=AD=BE=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/js/bootstrap-table-commonsearch.js | 13 +++++++++--- public/assets/js/require-table.js | 20 ++++++++++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js index ea22a1f56..fd674e88c 100644 --- a/public/assets/js/bootstrap-table-commonsearch.js +++ b/public/assets/js/bootstrap-table-commonsearch.js @@ -40,6 +40,7 @@ // 重置搜索 form.on("click", "button[type=reset]", function (event) { form[0].reset(); + setTimeout(function () { that.onCommonSearch(); }, 0); @@ -329,13 +330,19 @@ }); that.$container.on("click", "." + that.options.searchClass, function () { - var obj = $("form [name='" + $(this).data("field") + "']", that.$commonsearch); + var value = $(this).data("value"); + var field = $(this).data("field"); + var ul = that.$container.closest(".panel-intro").find("ul[data-field='" + field + "']"); + if (ul.length > 0) { + $('li a[data-value="' + value + '"][data-toggle="tab"]', ul).trigger('click'); + return; + } + var obj = $("form [name='" + field + "']", that.$commonsearch); if (obj.size() > 0) { - var value = $(this).data("value"); if (obj.is("select")) { $("option[value='" + value + "']", obj).prop("selected", true); } else if (obj.size() > 1) { - $("form [name='" + $(this).data("field") + "'][value='" + value + "']", that.$commonsearch).prop("checked", true); + $("form [name='" + field + "'][value='" + value + "']", that.$commonsearch).prop("checked", true); } else { obj.val(value + ""); } diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 98244086f..88da21a36 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -285,7 +285,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table $(Table.config.disabledbtn, toolbar).toggleClass('disabled', !options.selectedIds.length); }); // 绑定TAB事件 - $('.panel-heading [data-field] a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + $('.panel-heading [data-field] a[data-toggle="tab"]', table.closest(".panel-intro")).on('shown.bs.tab', function (e) { var field = $(this).closest("[data-field]").data("field"); var value = $(this).data("value"); var object = $("[name='" + field + "']", table.closest(".bootstrap-table").find(".commonsearch-table")); @@ -298,6 +298,14 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table table.bootstrapTable('refresh', {pageNumber: 1}); return false; }); + // 修复重置事件 + $("form", table.closest(".bootstrap-table").find(".commonsearch-table")).on('reset', function () { + setTimeout(function () { + // $('.panel-heading [data-field] li.active a[data-toggle="tab"]').trigger('shown.bs.tab'); + }, 0); + $('.panel-heading [data-field] li', table.closest(".panel-intro")).removeClass('active'); + $('.panel-heading [data-field] li:first', table.closest(".panel-intro")).addClass('active'); + }); // 刷新按钮事件 toolbar.on('click', Table.config.refreshbtn, function () { table.bootstrapTable('refresh'); @@ -734,6 +742,16 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table value = row[this.customField]; field = this.customField; } + if (typeof that.searchList === 'object' && typeof that.custom === 'undefined') { + var i = 0; + var searchValues = Object.values(colorArr); + $.each(that.searchList, function (key, val) { + if (typeof colorArr[key] == 'undefined') { + colorArr[key] = searchValues[i]; + i = typeof searchValues[i + 1] === 'undefined' ? 0 : i + 1; + } + }); + } //渲染Flag var html = []; -- Gitee From bba702bd188f985c1d7b34f6cffa909cef91f39a Mon Sep 17 00:00:00 2001 From: Karson Date: Fri, 4 Jun 2021 15:21:28 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-upload.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js index 650c593c4..7dd26b29c 100755 --- a/public/assets/js/require-upload.js +++ b/public/assets/js/require-upload.js @@ -252,11 +252,7 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, }, uploadprogress: function (file, progress, bytesSent) { if (file.upload.chunked) { - var totalBytesSent = 0; - file.upload.chunks.forEach(function (item) { - totalBytesSent += item.bytesSent; - }); - $(this.element).prop("disabled", true).html(" " + __('Upload') + Math.floor((totalBytesSent / file.size) * 100) + "%"); + $(this.element).prop("disabled", true).html(" " + __('Upload') + Math.floor((file.upload.bytesSent / file.size) * 100) + "%"); } }, totaluploadprogress: function (progress, bytesSent) { -- Gitee From e0b008097a035afd39bef68de0501880e368d7f7 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 9 Jun 2021 14:08:50 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=97=B6=EF=BC=8C=E8=85=BE=E8=AE=AF=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E9=82=AE=E7=AE=B1=E8=BF=94=E5=9B=9E=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF=E7=BC=96=E7=A0=81=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/library/Email.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/common/library/Email.php b/application/common/library/Email.php index 7636d761d..4ddb0b651 100644 --- a/application/common/library/Email.php +++ b/application/common/library/Email.php @@ -219,6 +219,7 @@ class Email preg_match_all("/Expected: (\d+)\, Got: (\d+)( \| (.*))?\$/i", $e->getMessage(), $matches); $code = isset($matches[2][3]) ? $matches[2][3] : 0; $message = isset($matches[2][0]) ? $matches[4][0] : $e->getMessage(); + $message = mb_convert_encoding($message, 'UTF-8', 'GBK,GB2312,BIG5'); $this->setError($message); } catch (\Exception $e) { $this->setError($e->getMessage()); -- Gitee