diff --git a/README.md b/README.md index e20ce74600d2b0b4ec95bac6db5fd75c0a6841b2..90e0ea86dd5d0fc81c2991245a466b4112b1a008 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台开发框架。 +FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。 ## 主要特性 diff --git a/application/admin/command/Api/library/Extractor.php b/application/admin/command/Api/library/Extractor.php index 401153657efd42fbb605ee7210595db778455568..fdd52de18734d88309db2f8e9f1c864cd8dbe2f3 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; } diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 8df72f5f35bcf1baed936af02bf223a56917d87e..9fa3529ed7b3a8171cc6e28231ec772c72781b9e 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/Ajax.php b/application/admin/controller/Ajax.php index a1cc8a7169b0bb124b175562a2a3b453e9fcd633..bd0b5d005f6ebd13deb0e9bf8fa9e7bcaefd0b7f 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/controller/general/Attachment.php b/application/admin/controller/general/Attachment.php index d73c25ceff590d390c6b725d1ce69f5db44a727d..2963a0993ddfd3af59d724ace2e69f83dcdd7740 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,16 @@ class Attachment extends Backend */ protected $model = null; + protected $searchFields = 'id,filename,url'; + protected $noNeedRight = ['classify']; + 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 +41,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 +59,7 @@ class Attachment extends Backend } }; } + $this->request->get(['filter' => json_encode($filterArr)]); list($where, $sort, $order, $offset, $limit) = $this->buildparams(); @@ -121,4 +132,29 @@ class Attachment extends Backend $this->error(__('Parameter %s can not be empty', '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")); + } + $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 f4b93e2a1719d0cbfdf749049ba211f3cd33fda8..bab69e8412de09b871955e2e52ea4b42e46196de 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 90fe66d72bdfe3e7f3438f3d69d3ca177b2d79da..afcf06f3871920baf37e1054e773e7477fbedb63 100644 --- a/application/admin/lang/zh-cn/general/attachment.php +++ b/application/admin/lang/zh-cn/general/attachment.php @@ -23,9 +23,18 @@ return [ 'Createtime' => '创建日期', 'Uploadtime' => '上传时间', 'Storage' => '存储引擎', + 'Category1' => '分类一', + 'Category2' => '分类二', + 'Custom' => '自定义', + 'Unclassed' => '未归类', + 'Category' => '类别', + 'Classify' => '归类', '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 021384f3b6603d890bda3f0242c4eecf4d7da1f1..6a2b95d6a6e53e2ad27bfdb536ec091a3b0176aa 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/model/AuthRule.php b/application/admin/model/AuthRule.php index 236cb638302d808e98f5ae613a53ad76ab89c337..526b6b59178aecfd6f48abd74c5f166487872100 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__'); }); diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php index ab0622055382f8be139babe25489ee3604b32919..252f4cf5c3053554907b8def64b06bb8a9a6aae9 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 = []) diff --git a/application/admin/view/general/attachment/edit.html b/application/admin/view/general/attachment/edit.html index 8caa393eca063809295c8f46b944e22475f19c9b..85898b57303b3e06c655cf922caeaf2259734fbb 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 53cb2b8f599e2e35365a0d29e675760d4cc450ad..7272d758123546547c4a1235fa754a8802d70cbd 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')} + {:__('Classify')}
    + + diff --git a/application/admin/view/general/attachment/select.html b/application/admin/view/general/attachment/select.html index 4f09469eb7393925de1e48b86110109ac7372a96..69e31b20834bdd02057d5c4fc063a1e222229204 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/Email.php b/application/common/library/Email.php index 7636d761db6d51b92dadf63c3c0e8f4ce779b40e..4ddb0b651083caad6a2ecc9ec65bb5efb4a342e6 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()); diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php index 5f1424e182591028f5cff8eb55d6393307d2ec53..daccab86a34ce667c89ad320a821bb0213ea7d67 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 b7649530246cd8b1b7259a0500f108d0e343fb91..c4540bc0df6175bf511a98dd2b468617cb990e64 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/common/model/User.php b/application/common/model/User.php index c32598c92e34a2ccd63b59ccde7cfc84c4581452..097ed4aedf959801ea0a327a59137222f9494b64 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(); } } diff --git a/application/extra/site.php b/application/extra/site.php index 0cee877ba7441477c0c144718ae1e34609707b68..2f05103f8a864f92eb6533a2fd22bc3d1b01294e 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/composer.json b/composer.json index b3b118b4d60a12ca086e15cb8f14ec8a1e112c14..b059b41abe4a0b0a0869f4e1294efce1ccd50bc0 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "repositories": [ { - "type": "vcs", + "type": "git", "url": "https://gitee.com/karson/framework" } ] diff --git a/extend/fast/Auth.php b/extend/fast/Auth.php index 396c4cfc9a935cb500109798b164b5d96b9b5e65..81429ef30399d37d4c3ec97a2bc2a304e1ab846c 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 +} diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js index 0196c3e968d9c84535b0abc7481631b4adaea73d..eb7e84d77fde5afd87e0706c6dec5c2366ee64b2 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,29 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin // 为表格绑定事件 Table.api.bindevent(table); + // 附件归类 + $(document).on('click', '.btn-classify', function () { + var ids = Table.api.selectedids(table); + Layer.open({ + title: __('Classify'), + content: Template("typetpl", {}), + btn: [__('OK')], + yes: function (index, layero) { + var category = $("select[name='category']", layero).val(); + Fast.api.ajax({ + url: "general/attachment/classify", + type: "post", + data: {category: category, ids: ids.join(',')}, + }, function () { + table.bootstrapTable('refresh', {}); + Layer.close(index); + }); + }, + success: function (layero, index) { + } + }); + }); + }, select: function () { // 初始化表格参数配置 @@ -106,14 +131,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 +188,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/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js index ea22a1f566eaf0da60c7d84473a381ab16000727..fd674e88c96eb266bace011a69b33cf39b2efd71 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 98244086fe33b35f9e89e653c65fabdffc3a329f..88da21a36a4c2fbaebc03b4278744b7436c85257 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 = []; diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js index ff6ad40ff4ee8a650c046df42bd2d977397bb68f..7dd26b29c6e2cad1076e150c2cd7bad36565d23a 100755 --- a/public/assets/js/require-upload.js +++ b/public/assets/js/require-upload.js @@ -251,10 +251,12 @@ define(['jquery', 'bootstrap', 'dropzone', 'template'], function ($, undefined, Upload.events.onUploadError(this, ret, file); }, uploadprogress: function (file, progress, bytesSent) { - + if (file.upload.chunked) { + $(this.element).prop("disabled", true).html(" " + __('Upload') + Math.floor((file.upload.bytesSent / 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 +271,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;