From b0ca028ed4bed9a07eaf16b5ba3f5fe4e741f1b0 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Jun 2024 15:30:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/lang/en.js                  |  4 +-
 core/frontend/src/lang/tw.js                  |  4 +-
 core/frontend/src/lang/zh.js                  |  4 +-
 .../chart/components/senior/DataForecast.vue  | 42 +++++++++++++++----
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index bc6ba1d5bb..dc94d92875 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -1837,7 +1837,9 @@ export default {
     forecast_period: 'Forecast period',
     forecast_confidence_interval: 'Confidence interval',
     forecast_model: 'Forecast model',
-    forecast_degree: 'Degree'
+    forecast_degree: 'Degree',
+    linear_regression: 'Linear regression',
+    polynomial_regression: 'Polynomial regression'
   },
   dataset: {
     scope_edit: 'Effective only when editing',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 5e7ba6a5b4..d3cf2b9264 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -1830,7 +1830,9 @@ export default {
     forecast_period: '預測週期',
     forecast_confidence_interval: '置信區間',
     forecast_model: '預測模型',
-    forecast_degree: '階數'
+    forecast_degree: '階數',
+    linear_regression: '線性回歸',
+    polynomial_regression: '多項式擬合'
   },
   dataset: {
     scope_edit: '僅編輯時生效',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 5e51e789ea..326b5d7f1c 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -1827,7 +1827,9 @@ export default {
     forecast_period: '预测周期',
     forecast_confidence_interval: '置信区间',
     forecast_model: '预测模型',
-    forecast_degree: '阶数'
+    forecast_degree: '阶数',
+    linear_regression: '线性回归',
+    polynomial_regression: '多项式拟合'
   },
   dataset: {
     goto: ', 前往 ',
diff --git a/core/frontend/src/views/chart/components/senior/DataForecast.vue b/core/frontend/src/views/chart/components/senior/DataForecast.vue
index bed450d820..01b0d1fb8a 100644
--- a/core/frontend/src/views/chart/components/senior/DataForecast.vue
+++ b/core/frontend/src/views/chart/components/senior/DataForecast.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <el-form
+      ref="forecastForm"
       :model="forecastCfg"
+      :rules="rules"
       label-width="80px"
       size="mini"
       @submit.native.prevent
@@ -43,12 +45,17 @@
       <el-form-item
         v-if="!forecastCfg.allPeriod"
         class="form-item"
+        prop="trainingPeriod"
         :label="$t('chart.forecast_training_period')"
       >
         <el-input-number
           v-model="forecastCfg.trainingPeriod"
           :disabled="!forecastCfg.enable"
           :min="5"
+          :max="1000"
+          :step="1"
+          :precision="0"
+          step-strictly
           size="mini"
           @change="onForecastChange"
         />
@@ -69,12 +76,16 @@
       </el-form-item>
       <el-form-item
         class="form-item"
+        prop="period"
         :label="$t('chart.forecast_period')"
       >
         <el-input-number
           v-model="forecastCfg.period"
           :disabled="!forecastCfg.enable"
           :min="1"
+          :max="100"
+          :precision="0"
+          step-strictly
           size="mini"
           @change="onForecastChange"
         />
@@ -101,6 +112,7 @@
         v-show="false"
         v-if="forecastCfg.ciType === 'custom'"
         class="form-item"
+        prop="confidenceInterval"
         :label="$t('chart.custom_case')"
       >
         <el-input-number
@@ -109,6 +121,8 @@
           :max="0.99"
           :min="0.75"
           :step="0.01"
+          :precision="2"
+          step-strictly
           size="mini"
           @change="onForecastChange"
         />
@@ -133,6 +147,7 @@
       <el-form-item
         v-if="forecastCfg.algorithm === 'polynomial-regression'"
         class="form-item"
+        prop="degree"
         :label="$t('chart.forecast_degree')"
       >
         <el-input-number
@@ -140,6 +155,8 @@
           :disabled="!forecastCfg.enable"
           :max="10"
           :min="1"
+          :precision="0"
+          step-strictly
           size="mini"
           @change="onForecastChange"
         />
@@ -171,15 +188,21 @@ export default {
         degree: 3
       },
       algorithmOptions: [
-        { name: '线性回归', value: 'linear-regression' },
-        { name: '多项式拟合', value: 'polynomial-regression' }
+        { name: this.$t('chart.linear_regression'), value: 'linear-regression' },
+        { name: this.$t('chart.polynomial_regression'), value: 'polynomial-regression' }
       ],
       ciOptions: [
         { name: '90%', value: 0.90 },
         { name: '95%', value: 0.95 },
         { name: '99%', value: 0.99 },
         { name: '自定义', value: 'custom' }
-      ]
+      ],
+      rules: {
+        trainingPeriod: [{ required: true, trigger: 'change', message: this.$t('commons.cannot_be_null') }],
+        period: [{ required: true, trigger: 'change', message: this.$t('commons.cannot_be_null') }],
+        degree: [{ required: true, trigger: 'change', message: this.$t('commons.cannot_be_null') }],
+        confidenceInterval: [{ required: true, trigger: 'change', message: this.$t('commons.cannot_be_null') }]
+      }
     }
   },
   watch: {
@@ -208,10 +231,15 @@ export default {
       }
     },
     onForecastChange() {
-      if (this.forecastCfg.ciType !== 'custom') {
-        this.forecastCfg.confidenceInterval = this.forecastCfg.ciType
-      }
-      this.$emit('onForecastChange', this.forecastCfg)
+      this.$refs.forecastForm.validate((valid) => {
+        if (!valid) {
+          return
+        }
+        if (this.forecastCfg.ciType !== 'custom') {
+          this.forecastCfg.confidenceInterval = this.forecastCfg.ciType
+        }
+        this.$emit('onForecastChange', this.forecastCfg)
+      })
     }
   }
 }