From ec041a76b54db294ad73b7a5903ce97772c9fad9 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Mon, 9 Oct 2023 12:03:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=8F=82=E6=95=B0=E5=80=BC=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=89=8D=E9=9D=A2=E7=9A=84=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataSetManagement/src/CustomEditForm.vue  | 81 ++++++++++++++-----
 1 file changed, 62 insertions(+), 19 deletions(-)

diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index bb0bd674..2d243450 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -192,7 +192,7 @@
                   <LabelSelect
                     :dataset-id="datasetId"
                     :id-list="dataForm.labelIds"
-                    @commit="(ids) =>{dataForm.labelIds = ids}"
+                    @commit="(ids) => { dataForm.labelIds = ids }"
                   />
                 </el-form-item>
               </el-col>
@@ -708,20 +708,32 @@
               align="center"
             >
               <template slot-scope="scope">
-                <el-date-picker
-                  v-if="scope.row.type === 'Date'"
-                  v-model="scope.row.value"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择日期时间"
-                />
-                <el-input
-                  v-else
-                  v-model="scope.row.value"
-                  class="bs-el-input"
-                  clearable
-                  placeholder="请输入值"
-                />
+                <el-form
+                  ref="form"
+                  :model="scope.row"
+                >
+                  <el-form-item
+                    :show-message="scope.row.require === 1"
+                    class="form-item-value"
+                    prop="value"
+                    :rules="getRules(scope.row)"
+                  >
+                    <el-date-picker
+                      v-if="scope.row.type === 'Date'"
+                      v-model="scope.row.value"
+                      type="datetime"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间"
+                    />
+                    <el-input
+                      v-else
+                      v-model="scope.row.value"
+                      class="bs-el-input"
+                      clearable
+                      placeholder="请输入值"
+                    />
+                  </el-form-item>
+                </el-form>
               </template>
             </el-table-column>
             <el-table-column
@@ -775,11 +787,15 @@
           <el-button
             class="bs-el-button-default"
             @click="cancelParam"
-          >取消</el-button>
+          >
+            取消
+          </el-button>
           <el-button
             type="primary"
             @click="setParam"
-          >确定</el-button>
+          >
+            确定
+          </el-button>
         </span>
       </el-dialog>
     </el-scrollbar>
@@ -963,6 +979,13 @@ export default {
         this.datasetTest(false)
       })
     },
+    getRules (row) {
+      return [{
+        required: row.require === 1,
+        message: '参数值不能为空',
+        trigger: ['blur', 'change']
+      }]
+    },
     /**
      * 获取数据源列表
      */
@@ -1014,6 +1037,13 @@ export default {
      * 保存参数设置
      */
     setParam () {
+      for (let i = 0; i < this.paramsListCopy.length; i++) {
+        const row = this.paramsListCopy[i]
+        if (row.require === 1 && (row.value === '' || row.value === null)) {
+          this.$message.error(`第${i + 1}行参数值不能为空`)
+          return
+        }
+      }
       this.dataForm.paramsList = cloneDeep(this.paramsListCopy)
       if (this.isTest) {
         this.datasetTest()
@@ -1419,16 +1449,29 @@ export default {
 .bs-pagination {
   padding: 16px !important;
   position: unset !important;
+
   ::v-deep .el-input__inner {
     width: 110px !important;
     border: none;
     background: var(--bs-el-background-1);
   }
 }
-.bs-el-select{
+
+.bs-el-select {
   width: 100% !important;
 }
-::v-deep .el-input__inner{
+
+::v-deep .el-input__inner {
   width: 100% !important;
 }
+
+::v-deep .el-table__row{
+  height: 58px;
+  .cell{
+    width: 100%;
+    margin: 0 auto;
+    position: absolute;
+    top:8px;
+  }
+}
 </style>