diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue index def7216e..44a3edd4 100644 --- a/src/components/FormViewer/index.vue +++ b/src/components/FormViewer/index.vue @@ -427,15 +427,17 @@ } console.log(subTableDataStore.getGroupData); let resultObj = {} - tabsFormRef.value.forEach((item,index) => { - console.log(item.getFieldsValue(),index) - let data = item.getFieldsValue() - Object.keys(data).forEach(key => { - if(!resultObj[key]){ - resultObj[key] = data[key] - } + if(tabsFormRef.value){ + tabsFormRef.value.forEach((item,index) => { + console.log(item.getFieldsValue(),index) + let data = item.getFieldsValue() + Object.keys(data).forEach(key => { + if(!resultObj[key]){ + resultObj[key] = data[key] + } + }) }) - }) + } //卡片组的值赋值给form,优化卡片组必填验证不通过 setFieldsValue({ ...resultObj, diff --git a/src/components/Upload/src/components/FileUpload.vue b/src/components/Upload/src/components/FileUpload.vue index f9cddcbe..788d3002 100644 --- a/src/components/Upload/src/components/FileUpload.vue +++ b/src/components/Upload/src/components/FileUpload.vue @@ -188,15 +188,15 @@ // 防止弹出多个错误提示 setTimeout(() => (isActMsg.value = true), 1000); } - // const isLt = file.size / 1024 / 1024 > maxSize; - // if (isLt) { - // createMessage.error(t('component.upload.maxSizeMultiple', [maxSize])); - // isLtMsg.value = false; - // // 防止弹出多个错误提示 - // setTimeout(() => (isLtMsg.value = true), 1000); - // } - // return (isAct && !isLt) || Upload.LIST_IGNORE; - return isAct || Upload.LIST_IGNORE; + const isLt = file.size / 1024 / 1024 > 50; + if (isLt) { + createMessage.error(t('component.upload.maxSizeMultiple', [50])); + isLtMsg.value = false; + // 防止弹出多个错误提示 + setTimeout(() => (isLtMsg.value = true), 1000); + } + return (isAct && !isLt) || Upload.LIST_IGNORE; + // return isAct || Upload.LIST_IGNORE; }; async function customRequest(info: UploadRequestOption) { diff --git a/src/utils/http/axios/index.ts b/src/utils/http/axios/index.ts index 825bad95..ec4c9a92 100644 --- a/src/utils/http/axios/index.ts +++ b/src/utils/http/axios/index.ts @@ -233,7 +233,7 @@ function createAxios(opt?: Partial) { // authentication schemes,e.g: Bearer // authenticationScheme: 'Bearer', authenticationScheme: '', - timeout: 10 * 1000, + timeout: 30 * 1000, // 基础接口地址 // baseURL: globSetting.apiUrl, diff --git a/src/views/sys/exception/Exception.vue b/src/views/sys/exception/Exception.vue index eb22c1a2..16580791 100644 --- a/src/views/sys/exception/Exception.vue +++ b/src/views/sys/exception/Exception.vue @@ -12,7 +12,7 @@ -
+
@@ -328,7 +328,6 @@ function exitScreen() { position:absolute; bottom:46px; right:590px; - z-index:1; cursor:pointer; img{ width:100%;