0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#16325

This commit is contained in:
XieYongHong 2023-07-15 17:37:44 +08:00
parent 07d6499b03
commit 0d26cdbd93
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/device/components/Metadata/Import/index.vue
View File

@ -30,7 +30,7 @@
<j-select-option value="script">脚本</j-select-option> <j-select-option value="script">脚本</j-select-option>
</j-select> </j-select>
</j-form-item> </j-form-item>
<j-form-item label="文件上传" v-bind="validateInfos.upload" v-if="formModel.metadataType === 'file'"> <j-form-item v-if="formModel.type === 'import' && formModel.metadataType === 'file'" label="文件上传" v-bind="validateInfos.upload">
<j-input v-model:value="formModel.upload"> <j-input v-model:value="formModel.upload">
<template #addonAfter> <template #addonAfter>
<j-upload v-model:file-list="fileList" :before-upload="beforeUpload" accept=".json" :show-upload-list="false" <j-upload v-model:file-list="fileList" :before-upload="beforeUpload" accept=".json" :show-upload-list="false"

31
src/views/edge/Resource/index.vue
View File

@ -214,14 +214,17 @@ const columns = [
new Promise((resolve) => { new Promise((resolve) => {
query({ query({
paging: false, paging: false,
sotrs: [{ name: 'createTime', order: 'desc' }], sorts: [{ name: 'createTime', order: 'desc' }],
}).then((resp: any) => { }).then((resp: any) => {
resolve( const arrMap = new Map()
resp.result.data.map((item: any) => ({ resp.result.data.forEach((item: any) => {
label: item.category, const labelItem = options.find(a => a.value === item.category)
value: item.category arrMap.set(item.category, {
})) label: labelItem?.label || item.category,
) value: item.category,
})
})
resolve([...arrMap.values()]);
}); });
}), }),
}, },
@ -244,12 +247,14 @@ const columns = [
}, },
], ],
}).then((resp: any) => { }).then((resp: any) => {
resolve( const arrMap = new Map()
resp.result.map((item: any) => ({ resp.result.data.forEach((item: any) => {
label: item.sourceName, arrMap.set(item.sourceId, {
value: item.sourceId, label: item.sourceName,
})), value: item.sourceId,
); })
})
resolve([...arrMap.values()]);
}); });
}), }),
}, },