4 tahun lalu · 0b07a97ca3
--- a/src/Controllers/RenderableController.php
+++ b/src/Controllers/RenderableController.php
@@ -28,9 +28,15 @@ class RenderableController
 
				 
			
 
				     protected function render($renderable)
			
 
				     {
			
 
				+        Admin::script('Dcat.pjaxResponded()', true);
			
 
				+
			
 
				+        $asset = Admin::asset();
			
 
				+
			
 
				         return Helper::render($renderable->render())
			
 
				             .Admin::html()
			
 
				-            .Admin::asset()->scriptToHtml()
			
 
				-            .Admin::asset()->styleToHtml();
			
 
				+            .$asset->jsToHtml()
			
 
				+            .$asset->cssToHtml()
			
 
				+            .$asset->scriptToHtml()
			
 
				+            .$asset->styleToHtml();
			
 
				     }
			
 
				 }
			
--- a/src/Layout/Asset.php
+++ b/src/Layout/Asset.php
@@ -661,20 +661,20 @@ class Asset
 
				 
			
 
				         return <<<HTML
			
 
				 <script data-exec-on-popstate>
			
 
				-Dcat.ready(function () { 
			
 
				+(function () {
			
 
				     try {
			
 
				-        {$script}
			
 
				+        {$directScript}
			
 
				     } catch (e) {
			
 
				         console.error(e)
			
 
				     }
			
 
				-});
			
 
				-(function () {
			
 
				+})();
			
 
				+Dcat.ready(function () { 
			
 
				     try {
			
 
				-        {$directScript}
			
 
				+        {$script}
			
 
				     } catch (e) {
			
 
				         console.error(e)
			
 
				     }
			
 
				-})()
			
 
				+})
			
 
				 </script>
			
 
				 HTML;
			
 
				     }
			
--- a/src/Widgets/Widget.php
+++ b/src/Widgets/Widget.php
@@ -119,13 +119,16 @@ abstract class Widget implements Renderable
 
				         ]);
			
 
				     }
			
 
				 
			
 
				+    public function addScript()
			
 
				+    {
			
 
				+        $this->script && Admin::script($this->script);
			
 
				+    }
			
 
				+
			
 
				     /**
			
 
				      * 收集静态资源.
			
 
				      */
			
 
				-    protected function collectAssets()
			
 
				+    public static function collectAssets()
			
 
				     {
			
 
				-        $this->script && Admin::script($this->script);
			
 
				-
			
 
				         static::$js && Admin::js(static::$js);
			
 
				         static::$css && Admin::css(static::$css);
			
 
				     }
			
@@ -145,7 +148,8 @@ abstract class Widget implements Renderable
 
				      */
			
 
				     public function render()
			
 
				     {
			
 
				-        $this->collectAssets();
			
 
				+        static::collectAssets();
			
 
				+        $this->addScript();
			
 
				 
			
 
				         return $this->html();
			
 
				     }