From 0d2fea7fb5aa3d63860d332382eafcb213804f51 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Thu, 14 Nov 2024 13:55:58 +0800
Subject: [PATCH] =?UTF-8?q?databrage=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E8=BD=AC=E5=AF=B9=E8=B1=A1=E5=8F=82=E6=95=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/AdminControllerBase.php | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/extend/base/common/controller/AdminControllerBase.php b/extend/base/common/controller/AdminControllerBase.php
index 64fef28..9d88300 100644
--- a/extend/base/common/controller/AdminControllerBase.php
+++ b/extend/base/common/controller/AdminControllerBase.php
@@ -110,8 +110,8 @@ class AdminControllerBase extends BaseController
      */
     protected function initialize()
     {
-        if(empty($this->pageKeyName)){
-            $this->pageKeyName = $this->request->controller().'_'. $this->request->action();
+        if (empty($this->pageKeyName)) {
+            $this->pageKeyName = $this->request->controller() . '_' . $this->request->action();
         }
 
         parent::initialize();
@@ -138,10 +138,10 @@ class AdminControllerBase extends BaseController
      * @param mixed $value 变量值
      * @return mixed
      */
-    public function assign($name, $value = null, $isAppendToDataBrage = false)
+    public function assign($name, $value = null, $isAppendToDataBrage = false, $forceObject = false)
     {
         if ($isAppendToDataBrage) {
-            $this->dataBrage[$name] = $value;
+            $this->setDataBrage($name, $value, $forceObject);
         }
 
         return $this->app->view->assign($name, $value);
@@ -185,9 +185,9 @@ class AdminControllerBase extends BaseController
         $vars['content_js'] = $this->fetchJS($template);
 
         $content_main = View::layout($this->layout)
-        ->config([
-            'view_suffix' => 'html',
-        ])->fetch($template, $vars);
+            ->config([
+                'view_suffix' => 'html',
+            ])->fetch($template, $vars);
 
         $html = '';
         $html .= $content_main;
@@ -202,8 +202,12 @@ class AdminControllerBase extends BaseController
      * @param mixed $value
      * @return void
      */
-    public function setDataBrage($name, $value)
+    public function setDataBrage($name, $value, $forceObject = false)
     {
+        if ($forceObject && !is_object($value)) {
+            $value = (object) $value;
+        }
+
         $this->dataBrage[$name] = $value;
 
         return $this;
@@ -370,12 +374,10 @@ class AdminControllerBase extends BaseController
             'autoloadJs' => $autoloadJs,
             'isSuperAdmin' => $isSuperAdmin,
             'version' => env('app_debug') ? time() : sysconfig('site', 'site_version'),
-            'pageKeyName'=>$this->pageKeyName
+            'pageKeyName' => $this->pageKeyName,
         ];
 
         View::assign($data);
-
-        
     }
 
     /**