新增：v8.0.0发布

Author: modstart

app/Constant/AppConstant.php

@@ -6,5 +6,5 @@ class AppConstant
 {
     const APP = 'cms9';
     const APP_NAME = 'ModStartCMS9';
-    const VERSION = '7.9.0';
+    const VERSION = '8.0.0';
 }

module/Cms/Admin/Controller/ContentController.php

@@ -399,7 +399,7 @@ function (Form $form) use ($catOptions) {
                     }
                     CmsRecommendBiz::itemUpdate(
                         $record['id'],
-                        $recordValue['modelId'],
+                        $record['modelId'],
                         $recommendTags
                     );
                 } else {

module/Cms/Docs/release.md

@@ -8,6 +8,7 @@
 - 新增：CMS备份增加内容区块模块处理逻辑
 - 新增：内容管理增加一键复制功能
 - 新增：数据库模型 CmsCat 和 CmsContent
+- 新增：列表增加自定义字段筛选过滤字段，支持自定义字段筛选
 - 优化：系统响应默认处理函数优化处理方式
 - 优化：CMS自定义字段编辑标识每次刷新问题
 - 优化：前端表单提交字段类型数组自动转换检测

module/Cms/View/admin/model/fieldEdit.blade.php

@@ -72,7 +72,9 @@
                 </div>
                 <div class="line">
                     <div class="label">
-                        后台列表搜索
+                        列表搜索
+                        <i class="iconfont icon-warning"
+                           data-tip-popover="开启后后台列表页面可搜索该字段，前台可通过链接参数搜索该字段（前台需设置访客列表页面可见）。"></i>
                     </div>
                     <div class="field">
                         <el-switch v-model="data.isSearch"></el-switch>

module/Cms/Web/Controller/ListController.php

@@ -4,6 +4,7 @@
 namespace Module\Cms\Web\Controller;
 
 use ModStart\Core\Input\InputPackage;
+use ModStart\Core\Input\Request;
 use ModStart\Core\Util\PageHtmlUtil;
 use Module\Cms\Api\Controller\BaseCatController;
 use Module\Cms\Util\CmsContentUtil;
@@ -38,7 +39,7 @@ public function index($id = 0)
         $viewData['pageSize'] = $pageSize;
         $viewData['records'] = $paginateData['records'];
         $viewData['total'] = $paginateData['total'];
-        $pageTemplate = '?page={page}';
+        $pageTemplate = '?' . Request::mergeQueries(['page' => ['{page}']]);
         if (!empty($cat['pageFullUrl'])) {
             $pageTemplate = modstart_web_url($cat['pageFullUrl']);
         }

module/Cms/config.json

@@ -18,7 +18,7 @@
     "tags": [
         "通用CMS"
     ],
-    "version": "3.6.0",
+    "version": "3.7.0",
     "modstartVersion": ">=2.9.0",
     "author": "ModStart",
     "description": "提供通用的动态模型内容管理系统",

module/Member/Admin/Controller/ConfigController.php

@@ -105,6 +105,9 @@ public function setting(AdminConfigBuilder $builder)
                     ->defaultValue(false);
             }
             $builder->number('Member_UsernameMinLength', '用户名最小长度')->defaultValue(3);
+            $builder->text('Member_RegisterUsernameSuggest', '自动注册用户名前缀')
+                ->defaultValue('用户')
+                ->help('部分场景注册时可能无法获取到用户名，开启自动注册后将自动设置用户名前缀，用户名如遇冲突将会自动追加随机字符串');
 
         });
         $builder->layoutPanel('找回密码', function ($builder) {
@@ -168,6 +171,12 @@ public function agreement(AdminConfigBuilder $builder)
                 $builder->text('Member_PrivacyTitle', '用户隐私协议标题')->help('默认为 用户隐私协议');
                 $builder->richHtml('Member_PrivacyContent', '用户隐私协议内容');
             });
+
+        $builder->switch('Member_AppealEnable', '账号申诉开启')
+            ->when('=', true, function ($builder) {
+                $builder->text('Member_AppealTitle', '账号申诉标题')->help('默认为 账号申诉');
+                $builder->richHtml('Member_AppealContent', '账号申诉内容');
+            });
         $builder->formClass('wide');
         return $builder->perform();
     }

module/Member/Admin/Controller/MemberController.php

@@ -22,6 +22,7 @@
 use ModStart\Core\Util\EventUtil;
 use ModStart\Core\Util\RandomUtil;
 use ModStart\Core\Util\TimeUtil;
+use ModStart\Detail\Detail;
 use ModStart\Field\AbstractField;
 use ModStart\Field\AutoRenderedFieldValue;
 use ModStart\Field\Select;
@@ -32,6 +33,7 @@
 use ModStart\Module\ModuleManager;
 use ModStart\Repository\Filter\RepositoryFilter;
 use ModStart\Support\Concern\HasFields;
+use ModStart\Widget\Box;
 use ModStart\Widget\TextDialogRequest;
 use Module\Member\Config\MemberAdminList;
 use Module\Member\Config\MemberOauth;
@@ -82,23 +84,47 @@ protected function crud(AdminCRUDBuilder $builder)
                     });
                 $builder->text('email', '邮箱');
                 $builder->text('phone', '手机');
-                $builder->text('nickname', '昵称');
+                $builder->text('nickname', '昵称')->required()->ruleUnique('member_user')
+                    ->hookRendering(function (AbstractField $field, $item, $index) {
+                        switch ($field->renderMode()) {
+                            case FieldRenderMode::GRID:
+                            case FieldRenderMode::DETAIL:
+                                return AutoRenderedFieldValue::make(
+                                    TextDialogRequest::make(
+                                        'primary',
+                                        htmlspecialchars($item->username),
+                                        modstart_admin_url('member/show', ['_id' => $item->id])
+                                    )->width('90%')->height('90%')->render()
+                                );
+                                break;
+                        }
+                    });
                 if (MemberOauth::hasEnableItems()) {
                     $builder->display('_oauth', '授权')->hookRendering(function (AbstractField $field, $item, $index) {
                         $oauthList = [];
                         $oauthRecords = MemberUtil::listOauths($item->id);
                         foreach ($oauthRecords as $oauthRecord) {
                             $color = null;
+                            $icon = 'iconfont icon-dot';
                             $title = $oauthRecord['type'];
                             $oauth = MemberOauth::getByOauthKey($oauthRecord['type']);
                             if ($oauth) {
                                 $color = $oauth->color();
                                 $title = $oauth->title();
+                                if (method_exists($oauth, 'icon')) {
+                                    $icon = $oauth->icon();
+                                }
                             }
                             if (empty($color)) {
                                 $color = ColorUtil::pick($oauthRecord['type']);
                             }
-                            $oauthList[] = '<a style="color:' . $color . ';" href="javascript:;" data-tip-popover="' . $title . '"><i class="iconfont icon-dot"></i></a>';
+                            $oauthList[] = join('', [
+                                "<a style='color:{$color};'",
+                                "href='javascript:;'",
+                                "data-tip-popover='{$title}'",
+                                "data-dialog-request='" . modstart_admin_url('member/oauth', ['_id' => $item->id]) . "'",
+                                "><i class='{$icon}'></i></a>",
+                            ]);
                         }
                         return join('', $oauthList);
                     });
@@ -161,6 +187,33 @@ public function selectRemote()
         return Select::optionRemoteHandleModel('member_user', 'id', 'username');
     }
 
+    public function oauth(AdminDialogPage $page)
+    {
+        $memberUser = MemberUtil::get(CRUDUtil::id());
+        BizException::throwsIfEmpty('用户不存在', $memberUser);
+        $detail = Detail::make('');
+        $oauthRecords = MemberUtil::listOauths($memberUser['id']);
+        foreach ($oauthRecords as $oauthRecord) {
+            $color = null;
+            $icon = 'iconfont icon-dot';
+            $title = $oauthRecord['type'];
+            $oauth = MemberOauth::getByOauthKey($oauthRecord['type']);
+            if ($oauth) {
+                $color = $oauth->color();
+                $title = $oauth->title();
+                if (method_exists($oauth, 'icon')) {
+                    $icon = $oauth->icon();
+                }
+            }
+            if (empty($color)) {
+                $color = ColorUtil::pick($oauthRecord['type']);
+            }
+            $detail->html('_', $title)->html($oauthRecord['openId']);
+        }
+        return $page->pageTitle('授权登录信息')
+            ->body(Box::make($detail, '授权登录信息'));
+    }
+
     public function add(AdminDialogPage $page)
     {
         $form = Form::make('');

module/Member/Admin/Controller/MemberVipSetController.php

@@ -9,6 +9,7 @@
 use ModStart\Admin\Layout\AdminConfigBuilder;
 use ModStart\Admin\Layout\AdminCRUDBuilder;
 use ModStart\Core\Dao\ModelUtil;
+use ModStart\Core\Util\RandomUtil;
 use ModStart\Form\Form;
 use ModStart\Grid\GridFilter;
 use ModStart\Module\ModuleManager;
@@ -36,6 +37,7 @@ protected function crud(AdminCRUDBuilder $builder)
                     $builder->switch('isDefault', '默认')->optionsYesNo()->help('会员是否默认为该等级')->required();
                     $builder->image('icon', '图标');
                     $builder->currency('price', '价格')->required();
+                    $builder->currency('priceMarket', '划线价格')->required();
                     $builder->number('vipDays', '时间')->required()->help('单位为天，365表示1年');
                     $builder->text('desc', '简要说明')->required();
                     $builder->richHtml('content', '详细说明')->required();
@@ -74,7 +76,7 @@ protected function crud(AdminCRUDBuilder $builder)
             ->defaultOrder(['sort', 'asc'])
             ->canSort(true)
             ->canShow(false)
-            ->title('用户VIP等级')
+            ->title('用户VIP')
             ->addDialogSize(['600px', '95%'])
             ->editDialogSize(['600px', '95%'])
             ->hookSaved(function (Form $form) {
@@ -86,8 +88,23 @@ public function config(AdminConfigBuilder $builder)
     {
         $builder->useDialog();
         $builder->pageTitle('功能设置');
-        // $builder->text('Member_VipTitle', 'VIP开通标题')->help('默认为 开通尊贵VIP 享受更多权益');
-        // $builder->text('Member_VipSubTitle', 'VIP开通副标题')->help('默认为 会员权益1 丨 会员权益2 丨 会员权益3 丨 会员权益4');
+        $builder->number('Member_VipCountDown', '倒计时长度')->unit('秒')->defaultValue(1800);
+        $openUserDefaults = [];
+        for ($i = 0; $i < 10; $i++) {
+            $openUserDefaults[] = [
+                'name' => RandomUtil::string(10),
+                'time' => '刚刚',
+                'title' => 'VIP黄金会员'
+            ];
+        }
+        $builder->complexFieldsList('Member_VipOpenUsers', '虚拟开通用户')
+            ->fields([
+                ['name' => 'name', 'title' => '用户', 'type' => 'text', 'defaultValue' => '', 'placeholder' => '', 'tip' => '',],
+                ['name' => 'time', 'title' => '时间', 'type' => 'text', 'defaultValue' => '', 'placeholder' => '', 'tip' => '',],
+                ['name' => 'title', 'title' => 'VIP标题', 'type' => 'text', 'defaultValue' => '', 'placeholder' => '', 'tip' => '',],
+            ])
+            ->help('当最近开通用户为空时，将显示虚拟开通用户')
+            ->defaultValue($openUserDefaults);
         $builder->richHtml('Member_VipContent', 'VIP开通说明')->help('默认为 VIP开通说明');
         $builder->formClass('wide');
         return $builder->perform();

module/Member/Admin/routes.php

@@ -26,6 +26,7 @@
 $router->match(['get', 'post'], 'member/send_message', 'MemberController@sendMessage');
 $router->match(['get', 'post'], 'member/status_forbidden', 'MemberController@statusForbidden');
 $router->match(['get', 'post'], 'member/export', 'MemberController@export');
+$router->match(['get', 'post'], 'member/oauth', 'MemberController@oauth');
 
 $router->match(['get', 'post'], 'member_vip_set', 'MemberVipSetController@index');
 $router->match(['get', 'post'], 'member_vip_set/add', 'MemberVipSetController@add');