fix: 运维管理 远程升级修复部分bug
This commit is contained in:
jackhoo_98
parent
90d33baffd
commit
8167603fae
|
|
@ -53,7 +53,7 @@ const handleChange = async (info: UploadChangeParam) => {
|
|||
if (info.file.status === 'done') {
|
||||
loading.value = false;
|
||||
const result = info.file.response?.result;
|
||||
const api = await querySystemApi(['paths']);
|
||||
const api: any = await querySystemApi(['paths']);
|
||||
const path = api.result[0]?.properties
|
||||
? api.result[0]?.properties['base-path']
|
||||
: '';
|
||||
|
|
@ -88,6 +88,8 @@ watch(
|
|||
.upload-box {
|
||||
:deep(.ant-btn) {
|
||||
width: 110px;
|
||||
border-top-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
.upload-text {
|
||||
margin: 0 10px;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,16 @@
|
|||
</j-form-item>
|
||||
</j-col>
|
||||
<j-col :span="12"
|
||||
><j-form-item label="签名" v-bind="validateInfos.sign">
|
||||
><j-form-item v-bind="validateInfos.sign">
|
||||
<template #label>
|
||||
签名
|
||||
<j-tooltip title="请输入本地文件进行签名加密后的值">
|
||||
<AIcon
|
||||
type="QuestionCircleOutlined"
|
||||
style="margin-left: 2px"
|
||||
/>
|
||||
</j-tooltip>
|
||||
</template>
|
||||
<j-input
|
||||
placeholder="请输入签名"
|
||||
v-model:value="formData.sign" /></j-form-item
|
||||
|
|
@ -148,14 +157,14 @@
|
|||
title="确认删除吗？"
|
||||
ok-text="确认"
|
||||
cancel-text="取消"
|
||||
@confirm="removeUser(propertie)"
|
||||
@confirm="removeList(propertie)"
|
||||
>
|
||||
<AIcon type="DeleteOutlined" />
|
||||
</j-popconfirm>
|
||||
</j-form-item>
|
||||
</div>
|
||||
<j-form-item class="formRef-form-item-add">
|
||||
<j-button type="dashed" block @click="addUser">
|
||||
<j-button type="dashed" block @click="addList">
|
||||
<AIcon type="PlusOutlined" />
|
||||
添加
|
||||
</j-button>
|
||||
|
|
@ -198,13 +207,13 @@ const dynamicValidateForm = reactive<{ properties: Properties[] }>({
|
|||
properties: [],
|
||||
});
|
||||
|
||||
const removeUser = (item: Properties) => {
|
||||
const removeList = (item: Properties) => {
|
||||
let index = dynamicValidateForm.properties.indexOf(item);
|
||||
if (index !== -1) {
|
||||
dynamicValidateForm.properties.splice(index, 1);
|
||||
}
|
||||
};
|
||||
const addUser = () => {
|
||||
const addList = () => {
|
||||
dynamicValidateForm.properties.push({
|
||||
id: '',
|
||||
value: '',
|
||||
|
|
@ -226,8 +235,9 @@ const props = defineProps({
|
|||
const emit = defineEmits(['change']);
|
||||
|
||||
const id = props.data.id;
|
||||
const VersionOrder = props.data.versionOrder;
|
||||
|
||||
const formData = ref({
|
||||
const formData: any = ref({
|
||||
name: '',
|
||||
productId: undefined,
|
||||
version: '',
|
||||
|
|
@ -239,7 +249,7 @@ const formData = ref({
|
|||
description: '',
|
||||
});
|
||||
|
||||
const extraValue = ref({});
|
||||
const extraValue: any = ref({});
|
||||
|
||||
const validatorSign = async (_: Record<string, any>, value: string) => {
|
||||
const { signMethod, url } = formData.value;
|
||||
|
|
@ -252,18 +262,16 @@ const validatorSign = async (_: Record<string, any>, value: string) => {
|
|||
}
|
||||
};
|
||||
const validatorVersionOrder = async (_: Record<string, any>, value: string) => {
|
||||
if (id && VersionOrder === value) {
|
||||
return Promise.resolve();
|
||||
} else {
|
||||
const { signMethod, productId } = formData.value;
|
||||
if (value && !!signMethod && productId) {
|
||||
const res = await validateVersion(productId, value);
|
||||
if (res.status === 200) {
|
||||
if (id && props.data.versionOrder === value) {
|
||||
formData.value.versionOrder = '';
|
||||
} else {
|
||||
Promise.reject(res.result ? ['版本序号已存在'] : '');
|
||||
Promise.reject(res.result ? '版本序号已存在' : '');
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return Promise.resolve();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -278,7 +286,6 @@ const { resetFields, validate, validateInfos } = useForm(
|
|||
version: [
|
||||
{ required: true, message: '请输入版本号' },
|
||||
{ max: 64, message: '最多可输入64个字符', trigger: 'change' },
|
||||
{ validator: validatorVersionOrder, trigger: 'blur' },
|
||||
],
|
||||
versionOrder: [
|
||||
{ required: true, message: '请输入版本序号' },
|
||||
|
|
@ -298,13 +305,13 @@ const filterOption = (input: string, option: any) => {
|
|||
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
|
||||
};
|
||||
|
||||
const onSubmit = async () => {
|
||||
const { properties } = await formRef.value?.validate();
|
||||
const handleOk = async () => {
|
||||
const { properties }: any = await formRef.value?.validate();
|
||||
|
||||
validate()
|
||||
.then(async (res) => {
|
||||
const product = productOptions.value.find(
|
||||
(item) => item?.value === res.productId,
|
||||
.then(async (res: any) => {
|
||||
const product: any = productOptions.value.find(
|
||||
(item: any) => item?.value === res.productId,
|
||||
);
|
||||
const productName = product?.label || props.data?.url;
|
||||
const size = extraValue.value?.length || props.data?.size;
|
||||
|
|
@ -317,9 +324,9 @@ const onSubmit = async () => {
|
|||
};
|
||||
loading.value = true;
|
||||
const response = !id
|
||||
? await save(params)
|
||||
: await update({ ...props.data, ...params });
|
||||
if (response.status === 200) {
|
||||
? await save(params).catch(() => {})
|
||||
: await update({ ...props.data, ...params }).catch(() => {});
|
||||
if (response?.status === 200) {
|
||||
message.success('操作成功');
|
||||
emit('change', true);
|
||||
}
|
||||
|
|
@ -330,9 +337,6 @@ const onSubmit = async () => {
|
|||
});
|
||||
};
|
||||
|
||||
const handleOk = () => {
|
||||
onSubmit();
|
||||
};
|
||||
const handleCancel = () => {
|
||||
emit('change', false);
|
||||
};
|
||||
|
|
@ -347,8 +351,8 @@ onMounted(() => {
|
|||
paging: false,
|
||||
terms: [{ column: 'state', value: 1 }],
|
||||
sorts: [{ name: 'createTime', order: 'desc' }],
|
||||
}).then((resp) => {
|
||||
productOptions.value = resp.result.map((item) => ({
|
||||
}).then((resp: any) => {
|
||||
productOptions.value = resp.result.map((item: any) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ const firmwareId = route.query.id;
|
|||
const productId = route.query.productId;
|
||||
const view = props.data.view;
|
||||
|
||||
const formData = ref({
|
||||
const formData: any = ref({
|
||||
name: '',
|
||||
mode: undefined,
|
||||
responseTimeoutSeconds: '',
|
||||
|
|
@ -187,8 +187,8 @@ onMounted(() => {
|
|||
paging: false,
|
||||
terms: [{ column: 'state', value: 1 }],
|
||||
sorts: [{ name: 'createTime', order: 'desc' }],
|
||||
}).then((resp) => {
|
||||
productOptions.value = resp.result.map((item) => ({
|
||||
}).then((resp: any) => {
|
||||
productOptions.value = resp.result.map((item: any) => ({
|
||||
value: item.id,
|
||||
label: item.name,
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
<template>
|
||||
<page-container>
|
||||
<div>
|
||||
<Search :columns="columns" target="search" @search="handleSearch" />
|
||||
<pro-search
|
||||
:columns="columns"
|
||||
target="search"
|
||||
@search="handleSearch"
|
||||
/>
|
||||
<j-pro-table
|
||||
ref="tableRef"
|
||||
model="TABLE"
|
||||
|
|
@ -246,11 +250,12 @@ onMounted(() => {
|
|||
queryProduct({
|
||||
paging: false,
|
||||
sorts: [{ name: 'name', order: 'desc' }],
|
||||
}).then((resp) => {
|
||||
const list = resp.result.filter((it) => {
|
||||
terms: [{ column: 'state', value: 1 }], // 不传参会报错，暂时查询启用状态的，后期会改查全部 todo
|
||||
}).then((resp: any) => {
|
||||
const list = resp.result.filter((it: any) => {
|
||||
return _.map(it?.features || [], 'id').includes('supportFirmware');
|
||||
});
|
||||
productOptions.value = list.map((item) => ({
|
||||
productOptions.value = list.map((item: any) => ({
|
||||
label: item.name,
|
||||
value: item.id,
|
||||
}));
|
||||
|
|
|
|||
Loading…
Reference in New Issue