优化事件

Author: deatil

src/larke/admin/Events/Action.php

@@ -24,18 +24,22 @@ public function trigger($event, ...$var): void
 
         $listeners = $this->listener[$event] ?? [];
 
-        if (str_contains($event, '.')) {
+        if (str_contains($event, '.*')) {
+            $needSort = false;
             [$prefix, $event] = explode('.', $event, 2);
 
             foreach ($this->listener as $e => $listener) {
                 if ($event == '*' && str_starts_with($e, $prefix . '.')) {
                     $listeners = array_merge($listeners, $listener);
+                    $needSort = true;
                 }
             }
+            
+            if ($needSort) {
+                $listeners = $this->arraySort($listeners, 'sort');
+            }
         }
 
-        $listeners = $this->arraySort($listeners, 'sort');
-
         foreach ($listeners as $key => $listener) {
             $this->dispatch($listener['listener'], $var);
         }

src/larke/admin/Events/Event.php

@@ -104,12 +104,18 @@ public function observe($observer, string $prefix = '', int $sort = 1)
      */
     public function listen(string $event, $listener, int $sort = 1)
     {
+        if (! isset($this->listener[$event])) {
+            $this->listener[$event] = [];
+        }
+        
         $this->listener[$event][] = [
             'listener' => $listener,
             'sort'     => $sort,
             'key'      => $this->filterBuildUniqueId($listener),
         ];
 
+        $this->listener[$event] = $this->arraySort($this->listener[$event], 'sort');
+
         return $this;
     }
 

src/larke/admin/Events/Filter.php

@@ -24,21 +24,24 @@ public function trigger($event, $params = null, ...$var)
             $event  = $event::class;
         }
 
-        $result    = [];
         $listeners = $this->listener[$event] ?? [];
 
-        if (str_contains($event, '.')) {
+        if (str_contains($event, '.*')) {
+            $needSort = false;
             [$prefix, $event] = explode('.', $event, 2);
 
             foreach ($this->listener as $e => $listener) {
                 if ($event == '*' && str_starts_with($e, $prefix . '.')) {
                     $listeners = array_merge($listeners, $listener);
+                    $needSort = true;
                 }
             }
+            
+            if ($needSort) {
+                $listeners = $this->arraySort($listeners, 'sort');
+            }
         }
 
-        $listeners = $this->arraySort($listeners, 'sort');
-
         $tmp = $var;
         $result = $params;
         foreach ($listeners as $key => $listener) {

src/larke/resources/config/larkeadmin.php

@@ -6,8 +6,8 @@
         'name'      => "LarkeAdmin",
         'name_mini' => "Larke",
         'logo'      => "<b>Larke</b> admin",
-        'release'   => "20240723",
-        'version'   => "2.0.5",
+        'release'   => "20240728",
+        'version'   => "2.0.6",
     ],
 
     // 是否使用 https 方式