提交 dab91780 编写于 作者: jlj05024111@163.com's avatar jlj05024111@163.com

fix: 修复文件上传白名单为空数组时判断异常的问题

上级 a2f3d0c8
...@@ -32,11 +32,11 @@ export const IBizGridFileUploadPopover = defineComponent({ ...@@ -32,11 +32,11 @@ export const IBizGridFileUploadPopover = defineComponent({
default: 300, default: 300,
}, },
controller: { controller: {
type: Object as PropType<Ref<UploadEditorController>>, type: Object as PropType<UploadEditorController>,
required: true, required: true,
}, },
data: { data: {
type: Object as PropType<Ref<IData>>, type: Object as PropType<IData>,
required: true, required: true,
}, },
}, },
......
...@@ -58,8 +58,8 @@ export const IBizGridFileUpload = defineComponent({ ...@@ -58,8 +58,8 @@ export const IBizGridFileUpload = defineComponent({
uploadUrl: uploadUrl.value, uploadUrl: uploadUrl.value,
downloadUrl: downloadUrl.value, downloadUrl: downloadUrl.value,
width, width,
controller, controller: controller.value,
data, data: data.value,
}, },
on: { on: {
close: (result: { close: (result: {
......
...@@ -227,7 +227,11 @@ export function useIBizUpload(opts: { ...@@ -227,7 +227,11 @@ export function useIBizUpload(opts: {
); );
return true; return true;
} }
if (controller.whiteList && !controller.whiteList.includes(item.name)) { if (
controller.whiteList &&
controller.whiteList.length > 0 &&
!controller.whiteList.includes(item.name)
) {
ibiz.message.error(`${item.name} 文件格式不正确`, 2.5, true); ibiz.message.error(`${item.name} 文件格式不正确`, 2.5, true);
return true; return true;
} }
......
...@@ -125,7 +125,7 @@ export function useIViewUpload( ...@@ -125,7 +125,7 @@ export function useIViewUpload(
// 上传前回调 // 上传前回调
const beforeUpload = (file: IData) => { const beforeUpload = (file: IData) => {
const type = file.name.split('.').pop() || ''; const type = file.name.split('.').pop() || '';
if (c.whiteList && !c.whiteList.includes(type)) { if (c.whiteList && c.whiteList.length > 0 && !c.whiteList.includes(type)) {
ibiz.message.error(`${file.name} 文件格式不正确`, 2.5, true); ibiz.message.error(`${file.name} 文件格式不正确`, 2.5, true);
return false; return false;
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册