mirror/MCSManager
2
0
Fork 1
mirror of https://github.com/MCSManager/MCSManager.git synced 2024-12-21 07:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into abstract

Browse Source
This commit is contained in:
unitwk 2024-01-09 14:47:37 +08:00
commit 307e5483ab
15 changed files with 69 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/CopyButton.vue
View File

@ -17,7 +17,7 @@ const copy = async () => {
if (!navigator.clipboard) {
Modal.warning({
title: t("TXT_CODE_ca07c84c"),
content: [h("span", t("请手动复制以下内容")), h("br"), h("span", props.value)]
content: [h("span", t("TXT_CODE_2452016e")), h("br"), h("span", props.value)]
});
return;
}

4
frontend/src/components/fc/UploadFileDialog.vue
View File

@ -70,7 +70,7 @@ onMounted(() => {
<template>
<a-modal
v-model:open="open"
:title="t('上传文件')"
:title="t('TXT_CODE_e00c858c')"
:closable="false"
:destroy-on-close="true"
width="400px"
@ -85,7 +85,7 @@ onMounted(() => {
>
<a-button type="primary" :loading="percentComplete > 0">
<FolderOpenOutlined v-if="percentComplete === 0" />
{{ percentComplete > 0 ? t("TXT_CODE_b625dbf0") + percentComplete + "%" : t("选择文件") }}
{{ percentComplete > 0 ? t("TXT_CODE_b625dbf0") + percentComplete + "%" : t("TXT_CODE_335ba209") }}
</a-button>
</a-upload>
<a-button class="ml-16" @click="cancel">{{ t("TXT_CODE_a0451c97") }}</a-button>

4
frontend/src/config/index.ts
View File

@ -479,10 +479,10 @@ export function getLayoutCardPool() {
permission: ROLE.GUEST,
meta: {},
type: "PluginCard",
title: t("扩展页面卡片"),
title: t("TXT_CODE_5ebec0db"),
width: 4,
description: t(
"此卡片可以上传自定义 HTML 页面并直接执行 Javascript 脚本，可以直接使用网页上所有元素，适用于 Web 前端开发人员。"
"TXT_CODE_cb84b22"
),
height: LayoutCardHeight.SMALL,
category: NEW_CARD_TYPE.COMMON

2
frontend/src/tools/nodes.ts
View File

@ -1,7 +1,7 @@
import { t } from "@/lang/i18n";
export function computeNodeName(ip: string, available: boolean, remark?: string) {
if (!ip) return t("请选择节点");
if (!ip) return t("TXT_CODE_aa373641");
const online = available ? "" : t("TXT_CODE_836addb9");
return remark ? `${remark} - ${ip} ${online}` : `${ip} ${online}`;
}

2
frontend/src/tools/validator.ts
View File

@ -7,7 +7,7 @@ export function emptyValueValidator(value: string | number) {
}
export function isNumberValidator(value: any) {
if (!value || isNaN(Number(value))) throw new Error(t("字段必须是数字"));
if (!value || isNaN(Number(value))) throw new Error(t("TXT_CODE_a9bcbde9"));
return Promise.resolve();
}

2
frontend/src/widgets/InstanceList.vue
View File

@ -464,7 +464,7 @@ onMounted(async () => {
v-else-if="instancesMoreInfo.length === 0"
class="flex align-center justify-center h-100 w-100"
>
<Empty :description="t('无内容，请在右上角下拉框选择节点，或点击新建应用')" />
<Empty :description="t('TXT_CODE_5415f009')" />
</div>
</a-row>
</div>

4
frontend/src/widgets/LoginCard.vue
View File

@ -38,7 +38,7 @@ const loginStep = ref(0);
const handleLogin = async () => {
if (!formData.username.trim() || !formData.password.trim()) {
return message.error(t("请完善账号信息！"));
return message.error(t("TXT_CODE_c846074d"));
}
loginStep.value++;
@ -135,7 +135,7 @@ const loginSuccess = () => {
</a>
</div>
<a-button size="large" type="primary" style="min-width: 95px" @click="handleLogin">
{{ t("确定") }}
{{ t("TXT_CODE_d507abff") }}
</a-button>
</div>
</div>

4
frontend/src/widgets/Settings.vue
View File

@ -208,7 +208,7 @@ onMounted(async () => {
</div>
</template>
<template #api>
<template #security>
<div :style="{ maxHeight: card.height, overflowY: 'auto' }">
<a-typography-title :level="4" class="mb-24">
{{ t("TXT_CODE_9c3ca8f") }}
@ -299,7 +299,7 @@ onMounted(async () => {
</div>
</template>
<template #password>
<template #about>
<div :style="{ maxHeight: card.height, overflowY: 'auto' }">
<a-typography-title :level="4" class="mb-24">
{{ t("TXT_CODE_3b4b656d") }}

4
frontend/src/widgets/instance/BaseInfo.vue
View File

@ -78,11 +78,11 @@ onMounted(async () => {
{{ t("TXT_CODE_46f575ae") }}{{ parseTimestamp(instanceInfo?.config.lastDatetime) }}
</a-typography-paragraph>
<a-typography-paragraph v-if="instanceInfo?.config.docker.image">
{{ t("资源限制：") }}
{{ t("TXT_CODE_4f917a65") }}
<a href="javascript:;" @click="DockerInfoDialog?.openDialog()">查看</a>
</a-typography-paragraph>
<a-typography-paragraph v-if="instanceInfo?.config.docker.image">
{{ t("可用端口：") }}
{{ t("TXT_CODE_2e4469f6") }}
<div style="padding: 10px 0px 0px 16px">
<div
v-for="(item, index) in dockerPortsArray(instanceInfo?.config.docker.ports ?? [])"

12
frontend/src/widgets/instance/dialogs/DockerInfo.vue
View File

@ -18,21 +18,21 @@ defineExpose({
</script>
<template>
<a-modal v-model:open="open" centered :title="t('容器资源限制信息')">
<a-modal v-model:open="open" centered :title="t('TXT_CODE_a7f6b0e0')">
<a-descriptions :column="{ md: 2, sm: 2, xs: 1 }">
<a-descriptions-item :label="t('最大内存')">
<a-descriptions-item :label="t('TXT_CODE_dd238854')">
{{ props.dockerInfo?.memory }} MB
</a-descriptions-item>
<a-descriptions-item :label="t('网络模式')">
<a-descriptions-item :label="t('TXT_CODE_efcef926')">
{{ props.dockerInfo?.networkMode }}
</a-descriptions-item>
<a-descriptions-item :label="t('镜像名')">
<a-descriptions-item :label="t('TXT_CODE_77000411')">
{{ props.dockerInfo?.image }}
</a-descriptions-item>
<a-descriptions-item :label="t('容器名')">
<a-descriptions-item :label="t('TXT_CODE_c3a3b6b1')">
{{ props.dockerInfo?.containerName }}
</a-descriptions-item>
<a-descriptions-item v-if="props.dockerInfo?.ports" :label="t('可用端口')">
<a-descriptions-item v-if="props.dockerInfo?.ports" :label="t('TXT_CODE_d32301c1')">
<div>
<div
v-for="(item, index) in dockerPortsArray(props?.dockerInfo.ports ?? [])"

2
frontend/src/widgets/node/NodeItem.vue
View File

@ -207,7 +207,7 @@ const nodeOperations = computed(() =>
<template #title>
{{
t(
"远程节点版本与面板端所需版本不一致，这可能会导致工作异常，请立即更新远程节点！"
"TXT_CODE_e520908a"
)
}}
</template>

8
frontend/src/widgets/others/PluginCard.vue
View File

@ -75,16 +75,16 @@ onUnmounted(() => {
<div v-if="containerState.isDesignMode">
<a-typography-paragraph>
<p>
{{ t("支持上传 HTML 文件，此卡片会加载 HTML 并运行 Javascript 代码。") }}
{{ t("TXT_CODE_c565b2e0") }}
<br />
{{ t("使用其他人分享的文件可能会导致面板被入侵。") }}
{{ t("TXT_CODE_6750d9d3") }}
</p>
<div v-if="originUrl">{{ t("HTML 文件:") }}</div>
<div v-if="originUrl">{{ t("TXT_CODE_6345aa71") }}</div>
<div v-if="originUrl" class="mt-16 mb-16">
<a :href="originUrl" target="_blank" rel="noopener noreferrer">{{ originUrl }}</a>
</div>
<a-button class="mt-8" type="primary" @click="uploadHtmlFile">
{{ t("上传 HTML 文件") }}
{{ t("TXT_CODE_40a87804") }}
</a-button>
</a-typography-paragraph>
</div>

22
languages/en_US.json
View File

@ -1724,5 +1724,25 @@
"TXT_CODE_76d20724": "Assigned Instances",
"TXT_CODE_9393b484": "Assign",
"TXT_CODE_6c274bdc": "This user does not enable the APIKEY.",
"TXT_CODE_e99ab99a": "Are you sure you want to delete this user?"
"TXT_CODE_e99ab99a": "Are you sure you want to delete this user?",
"TXT_CODE_2452016e": "请手动复制以下内容",
"TXT_CODE_5ebec0db": "扩展页面卡片",
"TXT_CODE_cb84b22": "此卡片可以上传自定义 HTML 页面并直接执行 Javascript 脚本，可以直接使用网页上所有元素，适用于 Web 前端开发人员。",
"TXT_CODE_aa373641": "请选择节点",
"TXT_CODE_a9bcbde9": "字段必须是数字",
"TXT_CODE_4f917a65": "资源限制：",
"TXT_CODE_2e4469f6": "可用端口：",
"TXT_CODE_8dfc41ef": "主机",
"TXT_CODE_8f8103b7": "容器",
"TXT_CODE_a7f6b0e0": "容器资源限制信息",
"TXT_CODE_77000411": "镜像名",
"TXT_CODE_d32301c1": "可用端口",
"TXT_CODE_5415f009": "无内容，请在右上角下拉框选择节点，或点击新建应用",
"TXT_CODE_c846074d": "请完善账号信息！",
"TXT_CODE_e520908a": "远程节点版本与面板端所需版本不一致，这可能会导致工作异常，请立即更新远程节点！",
"TXT_CODE_c565b2e0": "支持上传 HTML 文件，此卡片会加载 HTML 并运行 Javascript 代码。",
"TXT_CODE_6750d9d3": "使用其他人分享的文件可能会导致面板被入侵。",
"TXT_CODE_6345aa71": "HTML 文件:",
"TXT_CODE_40a87804": "上传 HTML 文件",
"TXT_CODE_ccb60658": "身份验证"
}

22
languages/zh_CN.json
View File

@ -1714,5 +1714,25 @@
"TXT_CODE_76d20724": "用户所有实例",
"TXT_CODE_9393b484": "分配实例",
"TXT_CODE_6c274bdc": "此用户没有开启 APIKEY 功能。",
"TXT_CODE_e99ab99a": "你确定要删除这个用户吗？"
"TXT_CODE_e99ab99a": "你确定要删除这个用户吗？",
"TXT_CODE_2452016e": "请手动复制以下内容",
"TXT_CODE_5ebec0db": "扩展页面卡片",
"TXT_CODE_cb84b22": "此卡片可以上传自定义 HTML 页面并直接执行 Javascript 脚本，可以直接使用网页上所有元素，适用于 Web 前端开发人员。",
"TXT_CODE_aa373641": "请选择节点",
"TXT_CODE_a9bcbde9": "字段必须是数字",
"TXT_CODE_4f917a65": "资源限制：",
"TXT_CODE_2e4469f6": "可用端口：",
"TXT_CODE_8dfc41ef": "主机",
"TXT_CODE_8f8103b7": "容器",
"TXT_CODE_a7f6b0e0": "容器资源限制信息",
"TXT_CODE_77000411": "镜像名",
"TXT_CODE_d32301c1": "可用端口",
"TXT_CODE_5415f009": "无内容，请在右上角下拉框选择节点，或点击新建应用",
"TXT_CODE_c846074d": "请完善账号信息！",
"TXT_CODE_e520908a": "远程节点版本与面板端所需版本不一致，这可能会导致工作异常，请立即更新远程节点！",
"TXT_CODE_c565b2e0": "支持上传 HTML 文件，此卡片会加载 HTML 并运行 Javascript 代码。",
"TXT_CODE_6750d9d3": "使用其他人分享的文件可能会导致面板被入侵。",
"TXT_CODE_6345aa71": "HTML 文件:",
"TXT_CODE_40a87804": "上传 HTML 文件",
"TXT_CODE_ccb60658": "身份验证"
}

4
panel/src/app/service/frontend_layout.ts
View File

@ -354,7 +354,7 @@ function getDefaultFrontendLayoutConfig(): IPageLayoutConfig[] {
type: "Settings",
title: t("TXT_CODE_3fe97dcc"),
width: 8,
height: LayoutCardHeight.MEDIUM,
height: LayoutCardHeight.LARGE,
disableDelete: true
}
]
@ -526,7 +526,7 @@ function getDefaultFrontendLayoutConfig(): IPageLayoutConfig[] {
id: getRandomId(),
meta: {},
type: "LoginCard",
title: t("身份验证"),
title: t("TXT_CODE_ccb60658"),
width: 4,
height: LayoutCardHeight.AUTO,
disableDelete: true