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' => "", - 'wangEditor' => "
", - default => "", + 'ckeditor' => "", + 'ueditor' => "", + default => "
", }; } } \ No newline at end of file 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", 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
\n' + '\n' + '
\n' + - '\n' + + '\n' + '
\n' + '
'; break;