release: 8.6.0

Author: modstart

app/Constant/AppConstant.php

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

module/AdminManager/View/widget/serverInfo.blade.php

@@ -16,7 +16,7 @@
             <div class="col-lg-4 col-md-6">
                 <div class="tw-flex ub-border-bottom tw-p-2">
                     <div class="tw-w-24 tw-flex-shrink-0 tw-font-bold">MSCore</div>
-                    <div class="tw-flex-grow">V{{\ModStart\ModStart::$version}} ( With <b>{{strtoupper(\ModStart\Module\ModuleManager::getEnv())}}</b> )</div>
+                    <div class="tw-flex-grow">V{{\ModStart\ModStart::$version}} ( With <b>{{strtoupper(ModStart\ModStart::env())}}</b> )</div>
                 </div>
             </div>
             <div class="col-lg-4 col-md-6">

module/Article/Admin/Controller/ArticleController.php

@@ -8,6 +8,7 @@
 use ModStart\Admin\Concern\HasAdminQuickCRUD;
 use ModStart\Admin\Layout\AdminCRUDBuilder;
 use ModStart\Field\AbstractField;
+use ModStart\Field\AutoRenderedFieldValue;
 use ModStart\Field\Type\FieldRenderMode;
 use ModStart\Form\Form;
 use ModStart\Grid\GridFilter;
@@ -33,15 +34,18 @@ protected function crud(AdminCRUDBuilder $builder)
                         switch ($field->renderMode()) {
                             case FieldRenderMode::GRID:
                             case FieldRenderMode::DETAIL:
-                                return TextLink::primary(
-                                    htmlspecialchars($item->title),
-                                    ArticleUtil::url($item->toArray()),
-                                    'target="_blank"'
+                                return AutoRenderedFieldValue::make(
+                                    TextLink::primary(
+                                        htmlspecialchars($item->title),
+                                        ArticleUtil::url($item->toArray()),
+                                        'target="_blank"'
+                                    )
                                 );
                         }
                     });
+                $url = modstart_web_url('article/别名');
                 $builder->text('alias', '别名')
-                    ->help('默认留空，可通过链接 /article/别名 访问，不能为纯数字');
+                    ->help("默认留空，可通过链接 <code>$url</code> 访问，不能为纯数字");
                 $builder->richHtml('content', '内容')->listable(false);
                 $builder->display('created_at', L('Created At'))->listable(false);
                 $builder->display('updated_at', L('Updated At'))->listable(false);

module/Article/Docs/release.md

@@ -1,4 +1,4 @@
-## 1.5.0
+## 1.5.0 链接别名不能为纯数字文案提示
 
 - 优化：链接别名不能为纯数字文案提示
 

module/Article/config.json

@@ -14,7 +14,7 @@
     "title": "通用文章",
     "version": "1.5.0",
     "author": "官方",
-    "modstartVersion": ">=2.6.0",
+    "modstartVersion": ">=3.9.0",
     "description": "提供多位置、单页文章基础管理功能",
     "config": {
         "position": [
@@ -24,4 +24,4 @@
             ]
         ]
     }
-}
+}

module/Member/Docs/release.md

@@ -4,6 +4,7 @@
 - 优化：手机快速注册登录密码设置控件不是password修复
 - 优化：VIP设置赠送积分但积分设置为0时异常问题
 - 修复：已登录绑定授权信息，开启自动绑定账户时，绑定账户异常问题
+- 修复：用户注册弹窗异常验证码发送异常问题
 
 ---
 

module/Member/Util/MemberUtil.php

@@ -24,6 +24,7 @@
 use Module\Member\Events\MemberUserDeletedEvent;
 use Module\Member\Events\MemberUserLoginAttemptEvent;
 use Module\Member\Events\MemberUserLoginFailedEvent;
+use Module\Member\Model\MemberUser;
 use Module\Member\Type\MemberMessageStatus;
 use Module\Member\Type\MemberPasswordStrength;
 use Module\Member\Type\MemberStatus;
@@ -710,11 +711,12 @@ public static function mergeMemberUserBasics(&$records, $memberUserIdKey = 'memb
     {
         $keepFields = self::processBasicFields($keepFields);
         if (is_array($records)) {
-            ModelUtil::join($records, $memberUserIdKey, $memberUserMergeKey, 'member_user', 'id');
+            ModelUtil::join($records, $memberUserIdKey, $memberUserMergeKey, MemberUser::class, 'id');
             foreach ($records as $k => $v) {
                 if (empty($v[$memberUserMergeKey])) {
                     continue;
                 }
+                $viewName = self::viewName($v[$memberUserMergeKey]);
                 $memberUser = ArrayUtil::keepKeys($v[$memberUserMergeKey], $keepFields);
                 if (empty($memberUser['nickname'])) {
                     $memberUser['nickname'] = $memberUser['username'];
@@ -724,23 +726,24 @@ public static function mergeMemberUserBasics(&$records, $memberUserIdKey = 'memb
                 } else {
                     $memberUser['avatar'] = AssetsUtil::fixFull($memberUser['avatar']);
                 }
+                $memberUser['viewName'] = $viewName;
                 $records[$k][$memberUserMergeKey] = $memberUser;
             }
         } else {
-            ModelUtil::joinItems($records, $memberUserIdKey, $memberUserMergeKey, 'member_user', 'id');
+            ModelUtil::joinItems($records, $memberUserIdKey, $memberUserMergeKey, MemberUser::class, 'id');
             foreach ($records as $item) {
                 if (empty($item->{$memberUserMergeKey})) {
                     continue;
                 }
+                $viewName = self::viewName($item->{$memberUserMergeKey});
                 $memberUser = ArrayUtil::keepKeys($item->{$memberUserMergeKey}, $keepFields);
-                if (empty($memberUser['nickname'])) {
-                    $memberUser['nickname'] = $memberUser['username'];
-                }
+                $memberUser['nickname'] = $memberUser['username'];
                 if (empty($memberUser['avatar'])) {
                     $memberUser['avatar'] = AssetsUtil::fixFull('asset/image/avatar.svg');
                 } else {
                     $memberUser['avatar'] = AssetsUtil::fixFull($memberUser['avatar']);
                 }
+                $memberUser['viewName'] = $viewName;
                 $item->{$memberUserMergeKey} = $memberUser;
             }
         }

module/Member/View/field/adminUserSelector.blade.php

@@ -1,5 +1,9 @@
-<div class="line">
+<div class="line" data-field="{{$name}}">
     <div class="label">
+        {!! in_array('required',$rules)?'<span class="ub-text-danger ub-text-bold">*</span>':'' !!}
+        @if($tip)
+            <a class="ub-text-muted" href="javascript:;" data-tip-popover="{{$tip}}"><i class="iconfont icon-warning"></i></a>
+        @endif
         {{$label}}
     </div>
     <div class="field">

module/Member/View/pc/register.blade.php

@@ -10,11 +10,6 @@
     {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageHeadAppend'); !!}
 @endsection
 
-@section('bodyAppend')
-    @parent
-    {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageBodyAppend'); !!}
-@endsection
-
 @section('bodyAppend')
     @parent
     {{\ModStart\ModStart::js('asset/common/commonVerify.js')}}
@@ -47,6 +42,7 @@
             },window.api.dialog);
         });
     </script>
+    {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageBodyAppend'); !!}
 @endsection
 
 @section('bodyContent')

module/Member/View/pc/registerDialog.blade.php

@@ -9,10 +9,6 @@
     {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageHeadAppend'); !!}
 @endsection
 
-@section('bodyAppend')
-    {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageBodyAppend'); !!}
-@endsection
-
 @section('bodyAppend')
     @parent
     {{\ModStart\ModStart::js('asset/common/commonVerify.js')}}
@@ -45,6 +41,7 @@
             },window.api.dialog);
         });
     </script>
+    {!! \ModStart\Core\Hook\ModStartHook::fireInView('MemberRegisterPageBodyAppend'); !!}
 @endsection
 
 {!! \ModStart\ModStart::style('html,body{background:var(--color-content-bg);}') !!}