feat: cms model edit error

Author: hackeranonymousdeepweb

module/Cms/Admin/Controller/ModelController.php

@@ -87,13 +87,16 @@ public function fieldEdit($modelId)
             $f = CmsField::getByNameOrFail($data['fieldType']);
             $data = $f->prepareDataOrFail($data);
             ModelUtil::transactionBegin();
+            $data['fieldData'] = json_encode($data['fieldData'], JSON_UNESCAPED_UNICODE);
             if ($id) {
                 ModelUtil::update('cms_model_field', $id, $data);
+                $data['fieldData'] = json_decode($data['fieldData'], true);
                 CmsModelUtil::editField($model, $record, $data);
             } else {
                 $data['modelId'] = $model['id'];
                 $data['sort'] = ModelUtil::sortNext('cms_model_field', ['modelId' => $model['id']]);
                 $data = ModelUtil::insert('cms_model_field', $data);
+                $data['fieldData'] = json_decode($data['fieldData'], true);
                 CmsModelUtil::addField($model, $data);
             }
             ModelUtil::transactionCommit();

module/Cms/Docs/release.md

@@ -1,4 +1,10 @@
-## 3.1.0
+## 3.2.0
+
+- 修复：模型字段不能编辑问题修复
+
+---
+
+## 3.1.0 自定义字段扩展，适配SiteMap
 
 - 新增：内容后台批量移动功能
 - 新增：获取栏目内容列表（包含副表字段）等方法

module/Cms/Field/RadioCmsField.php

@@ -29,7 +29,6 @@ public function prepareDataOrFail($data)
         }, $data['fieldData']['options']));
         BizException::throwsIf('选项为空', empty($data['fieldData']['options']));
         BizException::throwsIf('字段长度错误', $data['maxLength'] < 1 || $data['maxLength'] > 65535);
-        $data['fieldData'] = json_encode($data['fieldData']);
         return $data;
     }
 

module/Cms/Field/SelectCmsField.php

@@ -29,7 +29,6 @@ public function prepareDataOrFail($data)
         }, $data['fieldData']['options']));
         BizException::throwsIf('选项为空', empty($data['fieldData']['options']));
         BizException::throwsIf('字段长度错误', $data['maxLength'] < 1 || $data['maxLength'] > 65535);
-        $data['fieldData'] = json_encode($data['fieldData']);
         return $data;
     }
 

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

@@ -183,13 +183,18 @@
                         this.data.name = s
                     },
                     doSubmit() {
-                        this.$dialog.loadingOn()
-                        this.$api.post(window.location.href, {data: JSON.stringify(this.data)}, res => {
-                            this.$dialog.loadingOff()
-                            parent.__grids.get(0).lister.refresh()
-                            parent.layer.closeAll()
-                        }, res => {
-                            this.$dialog.loadingOff()
+                        MS.dialog.loadingOn()
+                        MS.api.post(window.location.href, {data: JSON.stringify(this.data)}, res => {
+                            MS.api.defaultCallback(res,{
+                                success:res=>{
+                                    MS.dialog.loadingOff()
+                                    parent.__grids.get(0).lister.refresh()
+                                    parent.layer.closeAll()
+                                },
+                                error:res=>{
+                                    MS.dialog.loadingOff()
+                                }
+                            })
                         })
                     }
                 }

module/Cms/config.json

@@ -15,7 +15,10 @@
         "WordSpliter",
         "SiteMapManager"
     ],
-    "version": "3.1.0",
+    "tags": [
+        "通用CMS"
+    ],
+    "version": "3.2.0",
     "modstartVersion": ">=2.9.0",
     "author": "ModStart",
     "description": "提供通用的动态模型内容管理系统",

module/Member/Api/Controller/MemberProfileController.php

@@ -82,7 +82,7 @@ public function password()
     public function avatar()
     {
         $input = InputPackage::buildFromInput();
-        $avatar = $input->get('avatar');
+        $avatar = $input->getTrimString('avatar');
         if (empty($avatar)) {
             return Response::generate(-1, '头像内容为空');
         }

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

@@ -32,7 +32,9 @@ public function login()
             return Response::redirect($redirect);
         }
         if (modstart_config('adminSSOClientEnable', false)) {
-            return Response::redirect(modstart_admin_url('sso/client?redirect=' . urlencode($redirect)));
+            return Response::redirect(modstart_admin_url('sso/client', [
+                'redirect' => $redirect,
+            ]));
         }
         /**
          * 获取人机检测Provider
@@ -122,6 +124,7 @@ public function login()
             'pageTitle' => L('Admin Login'),
             'captchaProviderName' => $captchaProviderName,
             'captchaProvider' => $captchaProvider,
+            'redirect' => $redirect,
         ]);
     }
 

vendor/modstart/modstart/views/admin/login.blade.php

@@ -74,7 +74,7 @@
                         @endif
                     @endif
                     <div class="line">
-                        <input type="hidden" name="redirect" value="<?php echo htmlspecialchars(\Illuminate\Support\Facades\Input::get('redirect',config('env.ADMIN_PATH','/admin/'))); ?>">
+                        <input type="hidden" name="redirect" value="{{$redirect}}">
                         <button type="submit" class="btn btn-block btn-lg btn-primary">
                             {{ L('Submit') }}
                             <i class="iconfont icon-right"></i>