mirror of https://github.com/1Panel-dev/1Panel
fix: 文件上传限制增加提示信息
parent
76a9c7f34b
commit
8f5028463a
|
@ -73,7 +73,6 @@ declare module 'vue' {
|
||||||
FileList: typeof import('./src/components/file-list/index.vue')['default']
|
FileList: typeof import('./src/components/file-list/index.vue')['default']
|
||||||
FileRole: typeof import('./src/components/file-role/index.vue')['default']
|
FileRole: typeof import('./src/components/file-role/index.vue')['default']
|
||||||
Footer: typeof import('./src/components/app-layout/footer/index.vue')['default']
|
Footer: typeof import('./src/components/app-layout/footer/index.vue')['default']
|
||||||
Gropu: typeof import('./src/components/gropu/index.vue')['default']
|
|
||||||
Group: typeof import('./src/components/group/index.vue')['default']
|
Group: typeof import('./src/components/group/index.vue')['default']
|
||||||
InfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']
|
InfiniteScroll: typeof import('element-plus/es')['ElInfiniteScroll']
|
||||||
Loading: typeof import('element-plus/es')['ElLoadingDirective']
|
Loading: typeof import('element-plus/es')['ElLoadingDirective']
|
||||||
|
|
|
@ -160,10 +160,11 @@ const uploadRef = ref<UploadInstance>();
|
||||||
const beforeAvatarUpload = (rawFile) => {
|
const beforeAvatarUpload = (rawFile) => {
|
||||||
if (type.value === 'app' || type.value === 'website') {
|
if (type.value === 'app' || type.value === 'website') {
|
||||||
if (!rawFile.name.endsWith('.tar.gz')) {
|
if (!rawFile.name.endsWith('.tar.gz')) {
|
||||||
MsgError(i18n.global.t('database.unSupportType'));
|
MsgError(i18n.global.t('commons.msg.unSupportType'));
|
||||||
return false;
|
return false;
|
||||||
} else if (rawFile.size / 1024 / 1024 > 50) {
|
}
|
||||||
MsgError(i18n.global.t('database.unSupportSize'));
|
if (rawFile.size / 1024 / 1024 > 50) {
|
||||||
|
MsgError(i18n.global.t('commons.msg.unSupportSize', [50]));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -176,10 +177,11 @@ const beforeAvatarUpload = (rawFile) => {
|
||||||
!rawFile.name.endsWith('.zip') &&
|
!rawFile.name.endsWith('.zip') &&
|
||||||
!rawFile.name.endsWith('.tgz')
|
!rawFile.name.endsWith('.tgz')
|
||||||
) {
|
) {
|
||||||
MsgError(i18n.global.t('database.unSupportType'));
|
MsgError(i18n.global.t('commons.msg.unSupportType'));
|
||||||
return false;
|
return false;
|
||||||
} else if (rawFile.size / 1024 / 1024 > 10) {
|
}
|
||||||
MsgError(i18n.global.t('database.unSupportSize'));
|
if (rawFile.size / 1024 / 1024 > 10) {
|
||||||
|
MsgError(i18n.global.t('commons.msg.unSupportSize', [10]));
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -91,6 +91,8 @@ export default {
|
||||||
operate: 'Operate',
|
operate: 'Operate',
|
||||||
inputOrSelect: 'Please select or enter',
|
inputOrSelect: 'Please select or enter',
|
||||||
backupSuccess: 'Backup Success',
|
backupSuccess: 'Backup Success',
|
||||||
|
unSupportType: 'Current file type is not supported!',
|
||||||
|
unSupportSize: 'The uploaded file exceeds {0}M, please confirm!',
|
||||||
},
|
},
|
||||||
login: {
|
login: {
|
||||||
firstLogin: 'First login, please create an initial administrator user!',
|
firstLogin: 'First login, please create an initial administrator user!',
|
||||||
|
@ -288,8 +290,6 @@ export default {
|
||||||
portHelper:
|
portHelper:
|
||||||
'This port is the exposed port of the container. You need to save the modification separately and restart the container!',
|
'This port is the exposed port of the container. You need to save the modification separately and restart the container!',
|
||||||
|
|
||||||
unSupportType: 'Current file type is not supported!',
|
|
||||||
unSupportSize: 'The uploaded file exceeds 10M, please confirm!',
|
|
||||||
selectFile: 'Select file',
|
selectFile: 'Select file',
|
||||||
supportUpType: 'Only sql, zip, sql.gz, and (tar.gz gz tgz) files within 10 MB are supported',
|
supportUpType: 'Only sql, zip, sql.gz, and (tar.gz gz tgz) files within 10 MB are supported',
|
||||||
zipFormat:
|
zipFormat:
|
||||||
|
@ -615,8 +615,9 @@ export default {
|
||||||
connTestOk: 'Connection information available',
|
connTestOk: 'Connection information available',
|
||||||
connTestFailed: 'Connection unavailable, please check connection information!',
|
connTestFailed: 'Connection unavailable, please check connection information!',
|
||||||
host: 'Host',
|
host: 'Host',
|
||||||
createConn: 'Create a connection',
|
createConn: 'New connection',
|
||||||
group: 'Group',
|
group: 'Group',
|
||||||
|
noHost: 'No host',
|
||||||
groupChange: 'Change group',
|
groupChange: 'Change group',
|
||||||
expand: 'Expand all',
|
expand: 'Expand all',
|
||||||
fold: 'All contract',
|
fold: 'All contract',
|
||||||
|
|
|
@ -97,6 +97,8 @@ export default {
|
||||||
backupSuccess: '备份成功',
|
backupSuccess: '备份成功',
|
||||||
restoreSuccess: '备份成功',
|
restoreSuccess: '备份成功',
|
||||||
notFound: '抱歉,您访问的页面不存在',
|
notFound: '抱歉,您访问的页面不存在',
|
||||||
|
unSupportType: '不支持当前文件类型!',
|
||||||
|
unSupportSize: '上传文件超过 {0}M,请确认!',
|
||||||
},
|
},
|
||||||
login: {
|
login: {
|
||||||
firstLogin: '首次登录,请创建初始管理员用户!',
|
firstLogin: '首次登录,请创建初始管理员用户!',
|
||||||
|
@ -294,8 +296,6 @@ export default {
|
||||||
|
|
||||||
confChange: '配置修改',
|
confChange: '配置修改',
|
||||||
|
|
||||||
unSupportType: '不支持当前文件类型!',
|
|
||||||
unSupportSize: '上传文件超过 10M,请确认!',
|
|
||||||
selectFile: '选择文件',
|
selectFile: '选择文件',
|
||||||
dropHelper: '将上传文件拖拽到此处,或者',
|
dropHelper: '将上传文件拖拽到此处,或者',
|
||||||
clickHelper: '点击上传',
|
clickHelper: '点击上传',
|
||||||
|
@ -625,6 +625,7 @@ export default {
|
||||||
host: '主机',
|
host: '主机',
|
||||||
createConn: '新建连接',
|
createConn: '新建连接',
|
||||||
group: '分组',
|
group: '分组',
|
||||||
|
noHost: '暂无主机',
|
||||||
groupChange: '切换分组',
|
groupChange: '切换分组',
|
||||||
expand: '全部展开',
|
expand: '全部展开',
|
||||||
fold: '全部收缩',
|
fold: '全部收缩',
|
||||||
|
|
|
@ -9,12 +9,14 @@
|
||||||
<el-form ref="hostInfoRef" label-position="top" :model="dialogData" :rules="rules">
|
<el-form ref="hostInfoRef" label-position="top" :model="dialogData" :rules="rules">
|
||||||
<el-form-item :label="$t('commons.table.group')" prop="group">
|
<el-form-item :label="$t('commons.table.group')" prop="group">
|
||||||
<el-select filterable v-model="dialogData.groupID" clearable style="width: 100%">
|
<el-select filterable v-model="dialogData.groupID" clearable style="width: 100%">
|
||||||
|
<div v-for="item in groupList" :key="item.id">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in groupList"
|
v-if="item.name === 'default'"
|
||||||
:key="item.id"
|
:label="$t('website.default')"
|
||||||
:label="item.name"
|
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
/>
|
/>
|
||||||
|
<el-option v-else :label="item.name" :value="item.id" />
|
||||||
|
</div>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
|
@ -32,7 +32,11 @@
|
||||||
<template #search>
|
<template #search>
|
||||||
<el-select v-model="group" @change="search()" clearable>
|
<el-select v-model="group" @change="search()" clearable>
|
||||||
<template #prefix>{{ $t('terminal.group') }}</template>
|
<template #prefix>{{ $t('terminal.group') }}</template>
|
||||||
<el-option v-for="item in groupList" :key="item.name" :value="item.id" :label="item.name" />
|
<el-option :label="$t('commons.table.all')" value=""></el-option>
|
||||||
|
<div v-for="item in groupList" :key="item.name">
|
||||||
|
<el-option v-if="item.name === 'default'" :label="$t('website.default')" :value="item.id" />
|
||||||
|
<el-option v-else :value="item.id" :label="item.name" />
|
||||||
|
</div>
|
||||||
</el-select>
|
</el-select>
|
||||||
</template>
|
</template>
|
||||||
<template #main>
|
<template #main>
|
||||||
|
@ -46,7 +50,12 @@
|
||||||
<el-table-column :label="$t('terminal.ip')" prop="addr" fix />
|
<el-table-column :label="$t('terminal.ip')" prop="addr" fix />
|
||||||
<el-table-column :label="$t('terminal.user')" show-overflow-tooltip prop="user" />
|
<el-table-column :label="$t('terminal.user')" show-overflow-tooltip prop="user" />
|
||||||
<el-table-column :label="$t('terminal.port')" prop="port" />
|
<el-table-column :label="$t('terminal.port')" prop="port" />
|
||||||
<el-table-column :label="$t('commons.table.group')" show-overflow-tooltip prop="groupBelong" />
|
<el-table-column :label="$t('commons.table.group')" show-overflow-tooltip prop="groupBelong">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<span v-if="row.groupBelong === 'default'">{{ $t('website.default') }}</span>
|
||||||
|
<span v-else>{{ row.groupBelong }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column :label="$t('commons.table.title')" show-overflow-tooltip prop="name">
|
<el-table-column :label="$t('commons.table.title')" show-overflow-tooltip prop="name">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<span v-if="row.addr === '127.0.0.1'">{{ $t('terminal.localhost') }}</span>
|
<span v-if="row.addr === '127.0.0.1'">{{ $t('terminal.localhost') }}</span>
|
||||||
|
@ -91,7 +100,7 @@ const paginationConfig = reactive({
|
||||||
total: 0,
|
total: 0,
|
||||||
});
|
});
|
||||||
const info = ref();
|
const info = ref();
|
||||||
const group = ref();
|
const group = ref<string>('');
|
||||||
const dialogGroupChangeRef = ref();
|
const dialogGroupChangeRef = ref();
|
||||||
|
|
||||||
const acceptParams = () => {
|
const acceptParams = () => {
|
||||||
|
|
|
@ -85,17 +85,23 @@
|
||||||
:data="hostTree"
|
:data="hostTree"
|
||||||
:props="defaultProps"
|
:props="defaultProps"
|
||||||
:filter-node-method="filterHost"
|
:filter-node-method="filterHost"
|
||||||
|
:empty-text="$t('terminal.noHost')"
|
||||||
>
|
>
|
||||||
<template #default="{ node, data }">
|
<template #default="{ node, data }">
|
||||||
<span class="custom-tree-node">
|
<span class="custom-tree-node">
|
||||||
|
<span v-if="node.label === 'default'">{{ $t('website.default') }}</span>
|
||||||
|
<div v-else>
|
||||||
<span v-if="node.label.length <= 25">
|
<span v-if="node.label.length <= 25">
|
||||||
<a @click="onClickConn(node, data)">{{ node.label }}</a>
|
<a @click="onClickConn(node, data)">{{ node.label }}</a>
|
||||||
</span>
|
</span>
|
||||||
<el-tooltip v-else :content="node.label" placement="top-start">
|
<el-tooltip v-else :content="node.label" placement="top-start">
|
||||||
<span>
|
<span>
|
||||||
<a @click="onClickConn(node, data)">{{ node.label.substring(0, 22) }}...</a>
|
<a @click="onClickConn(node, data)">
|
||||||
|
{{ node.label.substring(0, 22) }}...
|
||||||
|
</a>
|
||||||
</span>
|
</span>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
|
</div>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
</el-tree>
|
</el-tree>
|
||||||
|
|
Loading…
Reference in New Issue