fix: bug#15968
This commit is contained in:
parent
635fd513fc
commit
e985249876
|
@ -118,12 +118,12 @@ const beforeUpload = (_file: any) => {
|
||||||
const isXlsx =
|
const isXlsx =
|
||||||
_file.type ===
|
_file.type ===
|
||||||
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
|
||||||
if (!isCsv) {
|
if (!isCsv && !isXlsx) {
|
||||||
onlyMessage('请上传.csv格式文件', 'warning');
|
onlyMessage('请上传.xlsx或.csv格式文件', 'warning');
|
||||||
}
|
|
||||||
if (!isXlsx) {
|
|
||||||
onlyMessage('请上传.xlsx格式文件', 'warning');
|
|
||||||
}
|
}
|
||||||
|
// if (!isXlsx) {
|
||||||
|
// onlyMessage('请上传.xlsx格式文件', 'warning');
|
||||||
|
// }
|
||||||
// return (isCsv && fileType !== 'xlsx') || (isXlsx && fileType !== 'csv');
|
// return (isCsv && fileType !== 'xlsx') || (isXlsx && fileType !== 'csv');
|
||||||
return isCsv || isXlsx;
|
return isCsv || isXlsx;
|
||||||
};
|
};
|
||||||
|
|
|
@ -973,10 +973,6 @@ export default [
|
||||||
permission: 'gb28181-cascade',
|
permission: 'gb28181-cascade',
|
||||||
actions: ['query'],
|
actions: ['query'],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
permission: 'plugin-driver',
|
|
||||||
actions: ['query'],
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1019,10 +1015,6 @@ export default [
|
||||||
permission: 'gb28181-cascade',
|
permission: 'gb28181-cascade',
|
||||||
actions: ['query'],
|
actions: ['query'],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
permission: 'plugin-driver',
|
|
||||||
actions: ['query'],
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -1437,7 +1429,12 @@ export default [
|
||||||
url: '/iot/link/plugin',
|
url: '/iot/link/plugin',
|
||||||
icon: 'BoxPlotOutlined',
|
icon: 'BoxPlotOutlined',
|
||||||
showPage: ['plugin-driver'],
|
showPage: ['plugin-driver'],
|
||||||
permissions: [],
|
permissions: [
|
||||||
|
{
|
||||||
|
permission: 'plugin-driver',
|
||||||
|
actions: ['query'],
|
||||||
|
},
|
||||||
|
],
|
||||||
buttons: [
|
buttons: [
|
||||||
{
|
{
|
||||||
id: 'view',
|
id: 'view',
|
||||||
|
|
|
@ -3837,8 +3837,8 @@ jetlinks-ui-components@^1.0.23:
|
||||||
|
|
||||||
jetlinks-ui-components@^1.0.24:
|
jetlinks-ui-components@^1.0.24:
|
||||||
version "1.0.24"
|
version "1.0.24"
|
||||||
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#a1262b3a735a01cd1fd9801406d16291b5070367"
|
resolved "http://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.24.tgz#e15551fb114e4cb8752db962423b3ca17d9389c1"
|
||||||
integrity sha512-P4aolPQb1/wq4edN0AZ6WSavVAvQ+KEOEFzAarL/0dy6Oz3tTVemZmtgu20TsGbrNnEe/LheMu0QpvmkOq+3dg==
|
integrity sha512-TGyQ9SmdkoNkZScfYvfBF1/P1oBzXkxMuzR+DiNnof6CbSlYfPrkRsJIpOIZUjqg2o/6dyKLDK8gOxbxWm8wjA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@vueuse/core" "^9.12.0"
|
"@vueuse/core" "^9.12.0"
|
||||||
"@vueuse/router" "^9.13.0"
|
"@vueuse/router" "^9.13.0"
|
||||||
|
|
Loading…
Reference in New Issue