From 38c398c1099f9ba5c75681e476822cf9d54f2428 Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 26 Oct 2026 10:59:17 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A7=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=96=87=E4=BB=B6=E5=9B=BE=E6=A0=87=E5=B9=B6=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=B8=8A=E4=BC=A0=E5=89=8D=E5=90=8E=E5=B0=BA=E5=AF=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 form-create 单文件上传组件 FileUpload:空态 80×80 上传图标卡片, 上传后同为 80×80;图片类文件(含 ico)显示缩略图,其它文件显示 文件图标 + 文件名,悬停可删除,含上传中与失败提示 - 后端 FormBuilder 新增 fileUpload() 规则,配置项 upload_type=3 (微信校验文件、系统ICO图标)改用该组件 - 移除系统设置页失效的 picture-card 尺寸覆盖(原写法尺寸变量作用在 列表项上,导致上传后 148×148 与空态 80×80 不一致且非图片破图) - 同步 crmeb-admin-ui 技能组件索引 --- .crmeb/skills/crmeb-admin-ui/SKILL.md | 1 + .../system/config/SystemConfigServices.php | 18 +- backend/crmeb/utils/FormBuilder.php | 28 ++ .../admin/src/components/fileUpload/index.vue | 280 ++++++++++++++++++ frontend/admin/src/main.js | 4 + .../src/pages/setting/setSystem/index.vue | 6 +- 6 files changed, 325 insertions(+), 12 deletions(-) create mode 100644 frontend/admin/src/components/fileUpload/index.vue diff --git a/.crmeb/skills/crmeb-admin-ui/SKILL.md b/.crmeb/skills/crmeb-admin-ui/SKILL.md index 780a6993e..b6d7b91a4 100644 --- a/.crmeb/skills/crmeb-admin-ui/SKILL.md +++ b/.crmeb/skills/crmeb-admin-ui/SKILL.md @@ -475,6 +475,7 @@ function del(row, tit, num) { | 组件 | 用途 | |---|---| | `uploadImg` / `uploadPictures` / `uploadVideo2` | 图片上传 / 素材库选择(左分类树+右列表,`@getPic` 回传)/ 视频上传 | +| `fileUpload` | 单文件上传(form-create 自定义组件,`main.js` 注册为 `type=FileUpload`,后端 `Form::fileUpload()` 生成规则):空态 80×80 上传图标卡片;已上传时图片类文件(含 ico)显示缩略图、其它文件显示文件图标+文件名,上传前后同尺寸;值仍是文件地址字符串 | | `wangEditor` | 富文本(wangeditor v5;自定义工具栏按钮经 `Boot.registerMenu` 模块级只注册一次;回调走组件事件) | | `cropperImg` | 图片裁剪 | | `echartsNew` | 图表封装(props `optionData`/`styles`,deep watch 重绘) | diff --git a/backend/app/services/system/config/SystemConfigServices.php b/backend/app/services/system/config/SystemConfigServices.php index 985e37d44..531bfeaf1 100644 --- a/backend/app/services/system/config/SystemConfigServices.php +++ b/backend/app/services/system/config/SystemConfigServices.php @@ -682,18 +682,22 @@ class SystemConfigServices extends BaseService if($type == 3){ $fileDataValue = json_decode($data['value'], true) ?: ''; if ($fileDataValue !== '') $fileDataValue = set_file_url($fileDataValue); + $fileDataValue = is_string($fileDataValue) ? $fileDataValue : ''; } else{ $fileDataValue = ''; } - $fileField = $this->builder->uploadFile($data['menu_name'], $data['info'], $this->url('/adminapi/file/upload/1', ['type' => 1], false, true), $fileDataValue) - ->name('file')->appendRule('suffix', [ - 'type' => 'div', - 'class' => 'tips-info', - 'style' => ['width' => '100%'], 'props' => ['innerHTML' => $data['desc'] ?? ''] - ])->col(13)->data(['menu_name' => $data['menu_name']])->headers([ + // 文件上传使用前端 form-create 自定义组件 FileUpload:非图片文件显示文件图标,上传前后同为 80×80 + $fileField = $this->builder->fileUpload($data['menu_name'], $data['info'], $this->url('/adminapi/file/upload/1', ['type' => 1], false, true), $fileDataValue, [ + 'data' => ['menu_name' => $data['menu_name']], + 'headers' => [ 'Authori-zation' => app()->request->header('Authori-zation'), - ]); + ], + ])->appendRule('suffix', [ + 'type' => 'div', + 'class' => 'tips-info', + 'style' => ['width' => '100%'], 'props' => ['innerHTML' => $data['desc'] ?? ''] + ])->col(13); // 如果需要显示类型选择器(编辑模式) if ($showTypeSelect) { diff --git a/backend/crmeb/utils/FormBuilder.php b/backend/crmeb/utils/FormBuilder.php index 55fabf2dd..a6e46723e 100644 --- a/backend/crmeb/utils/FormBuilder.php +++ b/backend/crmeb/utils/FormBuilder.php @@ -30,6 +30,34 @@ class FormBuilder extends Form } + /** + * 单文件上传(form-create 自定义组件) + * + * 前端 main.js 已注册 type=FileUpload 的自定义组件:空态为上传图标卡片, + * 已上传时图片类文件(含 ico)显示缩略图、其它文件显示文件图标与文件名, + * 上传前后同为 80×80。替代内置 upload 组件按图片卡片渲染文件 + * (非图片文件没有缩略图会破图,且上传前后尺寸不一致)。 + * 值为文件地址字符串,提交与回显行为与 uploadFile 一致。 + * + * @param string $field 字段名 + * @param string $title 字段标题 + * @param string $action 上传地址 + * @param string $value 已上传文件地址 + * @param array $props 组件 props 覆盖:data 上传附加参数、headers 上传请求头、accept 允许的文件类型、disabled 是否禁用 + * @return \FormBuilder\Driver\CustomComponent + */ + public static function fileUpload($field, $title, $action, $value = '', array $props = []) + { + return self::createComponent('FileUpload') + ->field($field) + ->title($title) + ->value((string)$value) + ->props(array_merge([ + 'action' => $action, + 'uploadName' => 'file', + ], $props)); + } + /** * 富文本编辑器(form-create 自定义组件) * diff --git a/frontend/admin/src/components/fileUpload/index.vue b/frontend/admin/src/components/fileUpload/index.vue new file mode 100644 index 000000000..bc8bd6933 --- /dev/null +++ b/frontend/admin/src/components/fileUpload/index.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/frontend/admin/src/main.js b/frontend/admin/src/main.js index 904600c74..afe852dba 100644 --- a/frontend/admin/src/main.js +++ b/frontend/admin/src/main.js @@ -42,6 +42,7 @@ import pagesHeader from '@/components/pagesHeader'; import dateRangePicker from '@/components/dateRangePicker/index.vue'; import common_wrapper from '@diy/components/mobilePage/common_wrapper.vue'; import iconCompat from '@/components/iconCompat/index.vue'; +import FileUpload from '@/components/fileUpload/index.vue'; import imgModal from './components/uploadPictures/model'; import videoModal from './components/uploadVideo2/model'; import lazyDirective from '@/utils/lazyDirective'; @@ -126,6 +127,9 @@ app.use(router); app.use(i18n); app.use(ElementPlus, { locale: zhCn }); app.use(formCreate); +// form-create 自定义单文件上传组件(后端 Form::fileUpload() 生成 type=FileUpload 规则, +// 替代按图片卡片渲染的内置 upload:非图片文件显示文件图标,上传前后尺寸一致) +formCreate.component('FileUpload', FileUpload); app.use(VxeUIAll); app.use(VxeTable); app.use(imgModal); diff --git a/frontend/admin/src/pages/setting/setSystem/index.vue b/frontend/admin/src/pages/setting/setSystem/index.vue index fd3031cbc..8fc991292 100644 --- a/frontend/admin/src/pages/setting/setSystem/index.vue +++ b/frontend/admin/src/pages/setting/setSystem/index.vue @@ -288,15 +288,11 @@ body :deep(.el-dialog .el-dialog__header) { line-height: 14px; // margin-top: 10px; } -// 图片上传控件统一 100x100:frame 单/多图(默认 58px)与 picture-card 上传框(默认 148px) +// frame 单/多图控件统一 80x80(默认 58px);文件上传改用 form-create 自定义组件 FileUpload,自带同尺寸样式 :deep(._fc-frame ._fc-upload-btn), :deep(._fc-frame ._fc-files) { width: 80px; height: 80px; line-height: 78px; } -:deep(.el-upload--picture-card), -:deep(.el-upload-list--picture-card .el-upload-list__item) { - --el-upload-picture-card-size: 80px; -}