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

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

上级 98fc7d37
import { useClickOutside, useNamespace } from '@ibiz-template/vue-util';
import { defineComponent, PropType, Ref, ref, toRefs, watch } from 'vue';
import { defineComponent, PropType, ref, toRefs, watch } from 'vue';
import { UploadEditorController } from '@ibiz-template/controller';
import {
FileInfo,
......@@ -32,11 +32,11 @@ export const IBizGridFileUploadPopover = defineComponent({
default: 300,
},
controller: {
type: Object as PropType<Ref<UploadEditorController>>,
type: Object as PropType<UploadEditorController>,
required: true,
},
data: {
type: Object as PropType<Ref<IData>>,
type: Object as PropType<IData>,
required: true,
},
},
......@@ -52,6 +52,8 @@ export const IBizGridFileUploadPopover = defineComponent({
downloadUrl,
value,
uploadUrl,
controller: props.controller,
data: props.data,
});
const componentRef = ref();
......
......@@ -58,8 +58,8 @@ export const IBizGridFileUpload = defineComponent({
uploadUrl: uploadUrl.value,
downloadUrl: downloadUrl.value,
width,
controller,
data,
controller: controller.value,
data: data.value,
},
on: {
close: (result: {
......
......@@ -225,7 +225,11 @@ export function useIBizUpload(opts: {
);
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);
return true;
}
......
......@@ -125,7 +125,7 @@ export function useIViewUpload(
// 上传前回调
const beforeUpload = (file: IData) => {
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);
return false;
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册