revt: 回退网元软件包类型支持adb,mf,rtproxy
This commit is contained in:
@@ -15,8 +15,8 @@ const props = defineProps({
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
/**软件类型,指定上传 */
|
||||
type: {
|
||||
/**网元类型,指定上传 */
|
||||
neType: {
|
||||
type: String,
|
||||
},
|
||||
});
|
||||
@@ -29,7 +29,7 @@ type ModalStateType = {
|
||||
title: string;
|
||||
/**表单数据 */
|
||||
from: {
|
||||
type: string;
|
||||
neType: string;
|
||||
name: string;
|
||||
path: string;
|
||||
status: 'done' | 'uploading' | 'error';
|
||||
@@ -88,7 +88,7 @@ function fnModalOk() {
|
||||
rows.push(info);
|
||||
} else {
|
||||
message.error({
|
||||
content: `${info.type} ${res.msg}`,
|
||||
content: `${info.neType} ${res.msg}`,
|
||||
duration: 3,
|
||||
});
|
||||
}
|
||||
@@ -131,13 +131,13 @@ function fnBeforeUploadFile(file: FileType) {
|
||||
return Upload.LIST_IGNORE;
|
||||
}
|
||||
|
||||
// 取文件包类型判断是否支持
|
||||
let softwareType = '';
|
||||
const typeIndex = fileName.indexOf('-');
|
||||
if (typeIndex !== -1) {
|
||||
softwareType = fileName.substring(0, typeIndex).toUpperCase();
|
||||
// 取网元类型判断是否支持
|
||||
let neType = '';
|
||||
const neTypeIndex = fileName.indexOf('-');
|
||||
if (neTypeIndex !== -1) {
|
||||
neType = fileName.substring(0, neTypeIndex).toUpperCase();
|
||||
}
|
||||
if (!['MF', 'RTPROXY', 'ADB'].concat(NE_TYPE_LIST).includes(softwareType)) {
|
||||
if (!NE_TYPE_LIST.includes(neType)) {
|
||||
notification.warning({
|
||||
message: fileName,
|
||||
description: t('views.ne.neSoftware.fileCheckType'),
|
||||
@@ -158,17 +158,17 @@ function fnBeforeUploadFile(file: FileType) {
|
||||
}
|
||||
|
||||
// 单网元上传
|
||||
if (props.type && props.type !== softwareType) {
|
||||
if (props.neType && props.neType !== neType) {
|
||||
notification.warning({
|
||||
message: fileName,
|
||||
description: t('views.ne.neSoftware.fileTypeNotEq', {
|
||||
txt: props.type,
|
||||
txt: props.neType,
|
||||
}),
|
||||
});
|
||||
return Upload.LIST_IGNORE;
|
||||
} else {
|
||||
// 多文件上传时检查是否有同类型网元包
|
||||
const hasItem = modalState.from.find(item => item.type === softwareType);
|
||||
const hasItem = modalState.from.find(item => item.neType === neType);
|
||||
if (hasItem) {
|
||||
notification.warning({
|
||||
message: fileName,
|
||||
@@ -180,7 +180,7 @@ function fnBeforeUploadFile(file: FileType) {
|
||||
|
||||
modalState.from.push({
|
||||
name: fileName,
|
||||
type: softwareType,
|
||||
neType: neType,
|
||||
version: version,
|
||||
uid: file.uid,
|
||||
status: 'uploading',
|
||||
@@ -249,10 +249,10 @@ onMounted(() => {});
|
||||
:label-col="{ span: 6 }"
|
||||
:labelWrap="true"
|
||||
>
|
||||
<template v-if="props.type">
|
||||
<a-form-item :label="t('views.ne.neSoftware.type')" name="type">
|
||||
<template v-if="props.neType">
|
||||
<a-form-item :label="t('views.ne.common.neType')" name="type">
|
||||
<a-tag color="processing">
|
||||
{{ props.type }}
|
||||
{{ props.neType }}
|
||||
</a-tag>
|
||||
</a-form-item>
|
||||
|
||||
@@ -322,21 +322,21 @@ onMounted(() => {});
|
||||
<p :key="item.uid" v-for="item in modalState.from">
|
||||
<template v-if="item.status === 'done'">
|
||||
<a-alert
|
||||
:message="`${item.type}-${item.version}`"
|
||||
:message="`${item.neType}-${item.version}`"
|
||||
type="success"
|
||||
show-icon
|
||||
/>
|
||||
</template>
|
||||
<template v-if="item.status === 'uploading'">
|
||||
<a-alert
|
||||
:message="`${item.type}-${item.version}`"
|
||||
:message="`${item.neType}-${item.version}`"
|
||||
type="info"
|
||||
show-icon
|
||||
/>
|
||||
</template>
|
||||
<template v-if="item.status === 'error'">
|
||||
<a-alert
|
||||
:message="`${item.type}-${item.version}`"
|
||||
:message="`${item.neType}-${item.version}`"
|
||||
type="error"
|
||||
show-icon
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user