From e49b747f4365da4134654410928f4c6ffdd31a17 Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Tue, 16 Jul 2024 16:02:19 +0800
Subject: [PATCH 1/3] style: adjust width of search input in easy-admin

Set a fixed width for the search input field in the easy-admin plugin to
enhance the consistency and readability of the search section. The update
modifies the easy-admin.js and public.css files to enforce the new styling.
---
 public/static/admin/css/public.css           | 4 +++-
 public/static/plugs/easy-admin/easy-admin.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/public/static/admin/css/public.css b/public/static/admin/css/public.css
index 3091e2f..ba54111 100644
--- a/public/static/admin/css/public.css
+++ b/public/static/admin/css/public.css
@@ -305,7 +305,9 @@ table样式
 }
 
 .form-search .layui-input-inline {
-    width: 170px;
+    min-width: 170px;
+    max-width: 300px;
+    width: auto;
 }
 
 .form-search .layui-input-inline input,
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index df3a1ae..f72305f 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -369,7 +369,7 @@ define(["jquery", "tableSelect"], function ($, tableSelect) {
                                 formHtml += '\t<div class="layui-form-item layui-inline">\n' +
                                     '<label class="layui-form-label">' + d.title + '</label>\n' +
                                     '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
+                                    '<input style="width: 275px;font-size: 0.82rem" id="c-' + d.fieldAlias + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
                                     '</div>\n' +
                                     '</div>';
                                 break;

From 27b718da3ced82323211a171b9d7397325bf89ff Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Wed, 17 Jul 2024 11:32:15 +0800
Subject: [PATCH 2/3] fix(composer): update alibabacloud/client dependency to
 support PHP 8.1

The Alibaba Cloud client dependency has been updated to version 1.6.0 to add
PHP 8.1 compatibility. This change is reflected in the composer.json file under
the `require` section.

Additionally, the ordering of the `ext-mysqli` and `ext-pdo` dependencies has
been corrected for clarity and consistency.
---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 2135f71..76e6d40 100644
--- a/composer.json
+++ b/composer.json
@@ -29,15 +29,14 @@
         "topthink/think-filesystem": "^2.0",
         "aliyuncs/oss-sdk-php": "^2.6",
         "qcloud/cos-sdk-v5": "^2.6",
-        "alibabacloud/client": "^1.5",
         "jianyan74/php-excel": "^1.0.2",
         "doctrine/annotations": "^1.13",
         "phpoffice/phpspreadsheet": "^1.28",
         "myclabs/php-enum": "^1.8",
         "ext-json": "*",
         "qiniu/php-sdk": "v7.11.0",
-      "ext-mysqli": "*",
-      "ext-pdo": "*"
+        "ext-mysqli": "*",
+        "ext-pdo": "*"
     },
     "require-dev": {
         "symfony/var-dumper": ">=4.2",

From 96d162d11f5347dd24d544a790dcab7221320f0e Mon Sep 17 00:00:00 2001
From: wolfcode <37436228+wolf-leo@users.noreply.github.com>
Date: Thu, 18 Jul 2024 12:40:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B=E6=97=B6=E4=BF=AE=E6=AD=A3=E4=BA=86?=
 =?UTF-8?q?common.php=E4=B8=AD=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=88=86=E9=85=8D=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据编辑器类型（ckeditor、wangEditor、ueditor），现在正确地分配了相应的HTML结构。
之前默认分配给wangEditor的div结构，在编辑器类型为ueditor时会出现问题，现在已将其修正为正确的script标签结构。
同时，也对ckeditor的textarea标签进行了样式修正。
---
 app/common.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/common.php b/app/common.php
index 087e26e..271182e 100644
--- a/app/common.php
+++ b/app/common.php
@@ -110,9 +110,9 @@ if (!function_exists('auth')) {
     {
         $editor_type = sysConfig('site', 'editor_type');
         return match ($editor_type) {
-            'ckeditor'   => "<textarea name='{$name}' rows='20' class='layui-textarea editor' placeholder='{$placeholder}'>{$detail}</textarea>",
-            'wangEditor' => "<div class='wangEditor_div'><textarea name='{$name}' rows='20' class='layui-textarea editor layui-hide'>{$detail}</textarea><div id='editor_toolbar_{$name}'></div><div id='editor_{$name}' style='height: 300px'></div></div>",
-            default      => "<script type='text/plain' id='{$name}' name='{$name}' class='editor' data-content='{$detail}'></script>",
+            'ckeditor' => "<textarea name='{$name}' rows='20' class='layui-textarea editor' placeholder='{$placeholder}'>{$detail}</textarea>",
+            'ueditor'  => "<script type='text/plain' id='{$name}' name='{$name}' class='editor' data-content='{$detail}'></script>",
+            default    => "<div class='wangEditor_div'><textarea name='{$name}' rows='20' class='layui-textarea editor layui-hide'>{$detail}</textarea><div id='editor_toolbar_{$name}'></div><div id='editor_{$name}' style='height: 300px'></div></div>",
         };
     }
 }
\ No newline at end of file