From 1173fb1e905ed51d1f8e3bbd7624bf1e13f4cd95 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot <xiaojunnuo@qq.com> Date: Tue, 18 Apr 2023 19:24:09 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=B1:=20[client]=20sync=20upgrade=20wit?= =?UTF-8?q?h=203=20commits=20[trident-sync]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge remote-tracking branch 'origin/main' perf: 优化fs-images-format 加载失败时的显示 --- .../views/crud/component/uploader/form/crud.tsx | 16 ++++++---------- .../views/crud/component/uploader/form/mock.ts | 11 +++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx b/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx index 5ab7b480..b637b211 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx +++ b/packages/ui/certd-client/src/views/crud/component/uploader/form/crud.tsx @@ -93,6 +93,10 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti } } }, + error: { + title: "error", + type: "image-uploader" + }, pictureCard2: { title: "通过urls显示", type: "image-uploader", @@ -106,16 +110,8 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti }, column: { component: { - urls: [ - { - url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?1", - previewUrl: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?preview1" - }, - { - url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?2", - previewUrl: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?preview2" - } - ] + vModel: "urls" + // urls:[{url:'xxxx',previewUrl:'xxxx'}] } } }, diff --git a/packages/ui/certd-client/src/views/crud/component/uploader/form/mock.ts b/packages/ui/certd-client/src/views/crud/component/uploader/form/mock.ts index 30deb191..7351120e 100644 --- a/packages/ui/certd-client/src/views/crud/component/uploader/form/mock.ts +++ b/packages/ui/certd-client/src/views/crud/component/uploader/form/mock.ts @@ -8,6 +8,17 @@ const list = [ avatar: "http://greper.handsfree.work/extends/avatar.jpg", file: ["http://greper.handsfree.work/extends/avatar.jpg", "https://www.baidu.com/img/bd_logo1.png"], pictureCard: ["http://greper.handsfree.work/extends/avatar.jpg", "https://www.baidu.com/img/bd_logo1.png"], + error: ["http://localhost:11111/error_image"], + pictureCard2: [ + { + url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?1", + previewUrl: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?preview1" + }, + { + url: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?2", + previewUrl: "https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png?preview2" + } + ], limit: ["http://greper.handsfree.work/extends/avatar.jpg", "https://www.baidu.com/img/bd_logo1.png"], statusRemote: "0", keyValueType: "/2022-12-20/qygzqdjd1g.yaml"