bugfix: admin user role rules

Author: modstart

vendor/modstart/modstart/config/data.php

@@ -26,6 +26,7 @@
                 'zip',
                 'epub',
                 'ai', 'psd', 'cad',
+                'css', 'html',
             ]
         ],
         'document' => [

vendor/modstart/modstart/src/Admin/Controller/AdminRoleController.php

@@ -53,7 +53,7 @@ protected function form()
     {
         $form = new Form(AdminRole::class, function (Form $form) {
             $form->display('id', L('ID'))->editable(true);
-            $form->text('name', L('Role Name'))->rules('required|unique:admin_role,name,' . CRUDUtil::id());
+            $form->text('name', L('Role Name'))->required()->rules('unique:admin_role,name,' . CRUDUtil::id());
             $form->tree('rules', L('Role Permission'))->rules('required')
                 ->columnNameId('rule')->tree(AdminPermission::menuAll(null, true))
                 ->hookValueUnserialize(function ($value, AbstractField $field) {

vendor/modstart/modstart/src/Admin/Controller/AdminUserController.php

@@ -66,7 +66,7 @@ protected function grid()
     protected function form()
     {
         $form = new Form(AdminUser::class, function (Form $form) {
-            $form->text('username', L('Username'))->rules('required|unique:admin_user,username,' . CRUDUtil::id());
+            $form->text('username', L('Username'))->required()->rules('unique:admin_user,username,' . CRUDUtil::id());
             $form->text('password', L('Password'))->rules($form->isModeAdd() ? 'required' : '')
                 ->placeholder($form->isModeAdd() ? '' : L('Keep Old Password If Empty'))
                 ->value($form->isModeAdd() ? RandomUtil::string(6) : '')

vendor/modstart/modstart/src/Field/AbstractField.php

@@ -267,7 +267,14 @@ public function rules($rule = null)
             return $this->rules;
         }
         // echo json_encode([$this->column, $this->rules]) . "\n";
-        $this->rules[] = $rule;
+        if (is_array($rule)) {
+            $rule = array_filter($rule);
+            $this->rules = array_merge($this->rules, $rule);
+        } else {
+            if (!empty($rule)) {
+                $this->rules[] = $rule;
+            }
+        }
         // $rules = array_filter(explode('|', "{$this->rules}|$rules"));
         // $this->rules = implode('|', $rules);
         return $this;