feat: 用户前台表单提交新增字段校验方法validateInputValue

Author: modstart

module/Cms/Api/Controller/FormController.php

@@ -55,6 +55,10 @@ public function submit()
                         return Response::generateError($customField['title'] . '不能为空');
                     }
                 }
+                $ret = $f->validateInputValue($customField, $submitData[$customField['name']], $submitData);
+                if (Response::isError($ret)) {
+                    return Response::generateError($ret['message']);
+                }
                 $submitData[$customField['name']] = $f->serializeValue($submitData[$customField['name']], $submitData);
             }
         }

module/Cms/Field/AbstractCmsField.php

@@ -5,6 +5,7 @@
 
 
 use ModStart\Core\Input\InputPackage;
+use ModStart\Core\Input\Response;
 use ModStart\Field\AutoRenderedFieldValue;
 use ModStart\Form\Form;
 use ModStart\Support\Concern\HasFields;
@@ -15,16 +16,39 @@ abstract public function name();
 
     abstract public function title();
 
+    /**
+     * 后台字段保存数据准备
+     * @param $data
+     * @return mixed
+     */
     public function prepareDataOrFail($data)
     {
         return $data;
     }
 
+    /**
+     * 用户输入字段获取
+     * @param $field
+     * @param InputPackage $input
+     * @return array|mixed|string|string[]
+     */
     public function prepareInputOrFail($field, InputPackage $input)
     {
         return $input->getTrimString($field['name']);
     }
 
+    /**
+     * 用户输入字段检查
+     * @param $field
+     * @param $value
+     * @param $data
+     * @return array
+     */
+    public function validateInputValue($field, $value, $data)
+    {
+        return Response::generateSuccess();
+    }
+
     public function serializeValue($value, $data)
     {
         return $value;

module/Cms/Field/TextCmsField.php

@@ -6,6 +6,8 @@
 
 use Illuminate\Support\Facades\View;
 use ModStart\Core\Exception\BizException;
+use ModStart\Core\Input\Response;
+use ModStart\Core\Util\StrUtil;
 use ModStart\Field\AutoRenderedFieldValue;
 use ModStart\Form\Form;
 
@@ -27,6 +29,15 @@ public function prepareDataOrFail($data)
         return $data;
     }
 
+    public function validateInputValue($field, $value, $data)
+    {
+        if (!empty($field['maxLength']) && StrUtil::mbLengthGt($value, $field['maxLength'])) {
+            return Response::generateError("$field[title] 长度不能超过 $field[maxLength]");
+        }
+        return Response::generateSuccess();
+    }
+
+
     public function renderForGrid($viewData)
     {
         return AutoRenderedFieldValue::makeView('modstart::core.field.text-grid', $viewData);

module/Member/Api/routes.php

@@ -14,6 +14,7 @@
     $router->match(['post'], 'login_phone_captcha', 'AuthController@loginPhoneCaptcha');
     $router->match(['post'], 'register', 'AuthController@register');
     $router->match(['post'], 'register_email_verify', 'AuthController@registerEmailVerify');
+    $router->match(['post'], 'register_phone', 'AuthController@registerPhone');
     $router->match(['post'], 'register_phone_verify', 'AuthController@registerPhoneVerify');
     $router->match(['post'], 'register_captcha', 'AuthController@registerCaptcha');
     $router->match(['post'], 'register_captcha_verify', 'AuthController@registerCaptchaVerify');

module/Member/Core/ModuleServiceProvider.php

@@ -8,6 +8,7 @@
 use ModStart\Admin\Widget\DashboardItemA;
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Util\ColorUtil;
+use ModStart\Data\Event\DataDeletedEvent;
 use ModStart\Data\Event\DataUploadedEvent;
 use ModStart\Data\Event\DataUploadingEvent;
 use ModStart\Layout\Row;
@@ -16,6 +17,7 @@
 use Module\Member\Config\MemberHomeIcon;
 use Module\Member\Config\MemberMenu;
 use Module\Member\Model\MemberDataStatistic;
+use Module\Member\Model\MemberUpload;
 use Module\Member\Provider\MemberAdminShowPanel\MemberAdminShowPanelProvider;
 use Module\Member\Provider\MemberDeleteScheduleProvider;
 use Module\Member\Provider\VerifySmsTemplateProvider;
@@ -183,6 +185,16 @@ public function boot(Dispatcher $events)
             }
         }
 
+        if (class_exists(DataDeletedEvent::class)) {
+            DataDeletedEvent::listen(function (DataDeletedEvent $e) {
+                $record = MemberUpload::where(['dataId' => $e->data['id']])->first();
+                if ($record) {
+                    $record->delete();
+                    MemberDataStatistic::updateMemberUserUsedSize($record->userId);
+                }
+            });
+        }
+
         AdminMenu::register(function () {
             $moneyEnable = ModuleManager::getModuleConfig('Member', 'moneyEnable', false);
             $creditEnable = ModuleManager::getModuleConfig('Member', 'creditEnable', false);

module/Member/Docs/release.md

@@ -5,6 +5,8 @@
 - 修复：在线充值支付中心未安装页面提示
 - 新增：使用LockUtil替代DBLockUtil
 - 修复：用户授权登录绑定其他账号异常修复
+- 修复：register_phone接口不存在问题修复
+- 修复：用户消息单独点击已读操作不生效问题修复
 
 ---
 

module/Member/Migrate/2016_11_11_000000_create_member_upload.php

@@ -24,6 +24,7 @@ public function up()
                 $table->integer('uploadCategoryId')->nullable()->comment('分类ID');
 
                 $table->index(['userId', 'uploadCategoryId']);
+                $table->index(['dataId']);
 
             });
         }

module/Member/Web/Controller/memberMessage.js

@@ -29,8 +29,9 @@ MS.ready(
             });
         });
         grid.$lister.on('click', '[data-item-read]', function () {
-            $(this).closest('[data-message-id]').find('[data-message-unread],[data-item-read]').remove();
-            setAdRead($(this).closest('[data-message-id]').data('message-id'));
+            var $message = $(this).closest('[data-message-id]');
+            setAdRead($message.data('message-id'));
+            $message.find('[data-message-unread],[data-item-read]').remove();
         });
         grid.$lister.on('click', '[data-message-id]', function () {
             if ($(this).find('[data-message-unread]').length) {

module/Vendor/QuickRun/Verify/Field/LayoutHtmlVerifyFoot.php

@@ -0,0 +1,62 @@
+<?php
+
+
+namespace Module\Vendor\QuickRun\Verify\Field;
+
+
+use ModStart\Core\Util\IdUtil;
+use ModStart\Layout\LayoutHtml;
+
+/**
+ * 用户图片字段
+ *
+ * Class MemberImage
+ * @package Module\Member\Widget\Field
+ */
+class LayoutHtmlVerifyFoot extends LayoutHtml
+{
+    protected $isLayoutField = true;
+
+    public function __construct()
+    {
+        parent::__construct(null);
+    }
+
+    public function render()
+    {
+        $id = IdUtil::generate('LayoutHtmlVerifyFoot');
+        $this->label = <<<HTML_FOOT
+<script type="text/html" id="{$id}Content">
+    <button type="button" class="btn btn-primary" data-verify-pass>审核通过</button>
+    <button type="button" class="btn btn-danger" data-verify-reject>审核拒绝</button>
+    <input class="form" placeholder="输入拒绝理由" data-verify-rejct-remark />
+</script>
+<script>
+$(function(){
+    $(".panel-dialog-foot").css('text-align','left').html($('#{$id}Content').html());
+    var search = null;
+    try {
+        search = window.parent.__grids.get(0).lister.getParam().search;
+    } catch(e) { }
+    var request = function(data){
+        MS.dialog.loadingOn();
+        var formData = $('form').serializeJson();
+        MS.api.post(window.location.href,Object.assign(data,{search:search},formData), function(res){
+            MS.dialog.loadingOff();
+            MS.api.defaultCallback(res);
+        });
+    };
+    $(document).on('click','[data-verify-pass]',function(){
+        request({verify:true});
+    });
+    $(document).on('click','[data-verify-reject]',function(){
+        request({verify:false,remark:$('[data-verify-rejct-remark]').val()});
+    });
+});
+</script>
+HTML_FOOT;
+        return parent::render();
+    }
+
+
+}

module/Vendor/QuickRun/Verify/VerifyFieldUtil.php

@@ -0,0 +1,16 @@
+<?php
+
+
+namespace Module\Vendor\QuickRun\Verify;
+
+use ModStart\Support\Manager\FieldManager;
+use Module\Vendor\QuickRun\Verify\Field\LayoutHtmlVerifyFoot;
+
+class VerifyFieldUtil
+{
+    public static function register()
+    {
+        FieldManager::extend('layoutHtmlVerifyFoot', LayoutHtmlVerifyFoot::class);
+    }
+
+}