优化事件

deatil · Jul 28, 2024 · 2d100f1 · 2d100f1
1 parent 1bcf4b5
commit 2d100f1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/Event/Action.php b/src/Event/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);
         }

diff --git a/src/Event/Event.php b/src/Event/Event.php
@@ -51,6 +51,8 @@ public function listen(string $event, $listener, int $sort = 1)
             'key'      => $this->filterBuildUniqueId($listener),
         ];
 
+        $this->listener[$event] = $this->arraySort($this->listener[$event], 'sort');
+
         return $this;
     }
 

diff --git a/src/Event/Filter.php b/src/Event/Filter.php
@@ -24,21 +24,24 @@ public function trigger($event, $value = 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 = $value;
         foreach ($listeners as $key => $listener) {

diff --git a/src/helper.php b/src/helper.php
@@ -14,8 +14,8 @@
 use Laket\Admin\Model\Attachment as AttachmentModel;
 
 // 版本号
-define("LAKET_VERSION", "1.5.6");
-define("LAKET_RELEASE", "1.5.6.20240723");
+define("LAKET_VERSION", "1.5.7");
+define("LAKET_RELEASE", "1.5.7.20240728");
 
 if (! function_exists('make')) {
     /**