From 220771140035911a4963cf131a241914d6b0de7a Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 31 May 2023 15:41:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=BA=94=E7=94=A8=20?=
 =?UTF-8?q?cpu=20=E5=92=8C=E5=86=85=E5=AD=98=E9=99=90=E5=88=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C=20(#1205)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/app-store/installed/detail/index.vue | 4 +++-
 frontend/src/views/website/website/create/index.vue     | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/app-store/installed/detail/index.vue b/frontend/src/views/app-store/installed/detail/index.vue
index d353e59b9..e035d0288 100644
--- a/frontend/src/views/app-store/installed/detail/index.vue
+++ b/frontend/src/views/app-store/installed/detail/index.vue
@@ -100,7 +100,7 @@ import { reactive, ref } from 'vue';
 import Header from '@/components/drawer-header/index.vue';
 import { useI18n } from 'vue-i18n';
 import { FormInstance } from 'element-plus';
-import { Rules } from '@/global/form-rules';
+import { Rules, checkNumberRange } from '@/global/form-rules';
 import { MsgSuccess } from '@/utils/message';
 import i18n from '@/lang';
 import { canEditPort } from '@/global/business';
@@ -128,6 +128,8 @@ const paramModel = ref<any>({
 });
 const rules = reactive({
     params: {},
+    cpuQuota: [Rules.requiredInput, checkNumberRange(0, 99999)],
+    memoryLimit: [Rules.requiredInput, checkNumberRange(0, 9999999999)],
 });
 const submitModel = ref<any>({});
 
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index 25ec8b42d..d560da400 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -202,7 +202,7 @@
                                 :placeholder="$t('app.containerNameHelper')"
                             ></el-input>
                         </el-form-item>
-                        <el-form-item :label="$t('container.cpuQuota')" prop="cpuQuota">
+                        <el-form-item :label="$t('container.cpuQuota')" prop="appinstall.cpuQuota">
                             <el-input
                                 type="number"
                                 style="width: 40%"
@@ -213,7 +213,7 @@
                             </el-input>
                             <span class="input-help">{{ $t('container.limitHelper') }}</span>
                         </el-form-item>
-                        <el-form-item :label="$t('container.memoryLimit')" prop="memoryLimit">
+                        <el-form-item :label="$t('container.memoryLimit')" prop="appinstall.memoryLimit">
                             <el-input style="width: 40%" v-model.number="website.appinstall.memoryLimit" maxlength="10">
                                 <template #append>
                                     <el-select
@@ -302,7 +302,7 @@ import {
     CheckAppInstalled,
 } from '@/api/modules/app';
 import { CreateWebsite, PreCheck } from '@/api/modules/website';
-import { Rules } from '@/global/form-rules';
+import { Rules, checkNumberRange } from '@/global/form-rules';
 import i18n from '@/lang';
 import { ElForm, FormInstance } from 'element-plus';
 import { reactive, ref } from 'vue';
@@ -358,6 +358,8 @@ const rules = ref<any>({
         name: [Rules.appName],
         appId: [Rules.requiredSelectBusiness],
         params: {},
+        cpuQuota: [Rules.requiredInput, checkNumberRange(0, 99999)],
+        memoryLimit: [Rules.requiredInput, checkNumberRange(0, 9999999999)],
     },
     proxyType: [Rules.requiredSelect],
     port: [Rules.port],