Add asNameVar and suffixId

Author: Vladzimir

Component.php

@@ -45,6 +45,10 @@ class Component implements JsonSerializable
      * @var string
      */
     protected string $prefixVarId = 'id_';
+    /**
+     * @var string|null
+     */
+    protected ?string $suffixVarId = null;
 
     public function __construct(string|null $id, bool $asSelector = true, string $endSymbols = ';' . PHP_EOL)
     {
@@ -195,12 +199,35 @@ public function asUseVar(): static
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function asNameVar(): static
+    {
+        $this->exportMode = 'name';
+        return $this;
+    }
+
+    /**
+     * @param string $prefixVarId
+     * @return $this
+     */
     public function setPrefixVarId(string $prefixVarId): static
     {
         $this->prefixVarId = $prefixVarId;
         return $this;
     }
 
+    /**
+     * @param string $suffixVarId
+     * @return $this
+     */
+    public function setSuffixVarId(string $suffixVarId): static
+    {
+        $this->suffixVarId = $suffixVarId;
+        return $this;
+    }
+
     /**
      * @throws Exception
      */
@@ -211,7 +238,9 @@ public function __toString()
         $data = $this->method ?? '(' . Encode::json($this) . ')';
 
         $id = $this->id;
-        $prefixVarId = $this->prefixVarId;
+        $cleanId = $this->cleanId($id);
+        $prefixVarId = $this->cleanId($this->prefixVarId);
+        $suffixVarId = $this->cleanId($this->suffixVarId ?: '_' . static::COMPONENT_NAME);
         $selector = '';
         $end = '';
 
@@ -237,15 +266,17 @@ public function __toString()
         $outputData = static::COMPONENT_NAME . $data . $components . $end;
         $output = $selector . $outputData;
 
+        if ($this->exportMode === 'name') {
+            return "{$prefixVarId}{$cleanId}{$suffixVarId}";
+        }
+
         if ($this->exportMode === 'var') {
             if ($id === null || $id === '') {
                 $warn = "console.warn('Cannot export as var: component id is not set');" . PHP_EOL;
                 return $warn . $output;
             }
 
-            $cleanId = $this->cleanId($id);
-
-            return "var {$prefixVarId}{$cleanId} = {$output}";
+            return "var {$prefixVarId}{$cleanId}{$suffixVarId} = {$output}";
         }
 
         if ($this->exportMode === 'use') {
@@ -254,9 +285,7 @@ public function __toString()
                 return $warn . $output;
             }
 
-            $cleanId = $this->cleanId($id);
-
-            return "{$prefixVarId}{$cleanId}.{$outputData}";
+            return "{$prefixVarId}{$cleanId}{$suffixVarId}.{$outputData}";
         }
 
         return $output;

Extensions/DatagridFilter/FilterRules.php

@@ -2,12 +2,13 @@
 
 namespace Easyui\Extensions\DatagridFilter;
 
+use Easyui\Js;
 use Easyui\Options;
 
 /**
- * @method $this field(string $field) []
- * @method $this op(string $op) []
- * @method $this value(string $value) []
+ * @method $this field(string|JS $field) []
+ * @method $this op(string|JS $op) []
+ * @method $this value(string|JS $value) []
  */
 class FilterRules extends Options
 {