刘洋 6 kuukautta sitten
vanhempi
commit
a8077ecc18

+ 1 - 1
src/modules/admin/app-deploy/AppDeployControlKey.vue

@@ -28,7 +28,7 @@
       v-model="data"
       @change="dataChange"
     >
-      <el-radio :label="null">无</el-radio>
+      <!-- <el-radio :label="null">无</el-radio> -->
       <el-radio :label="true">是</el-radio>
       <el-radio :label="false">否</el-radio>
     </el-radio-group>

+ 18 - 1
src/modules/admin/app-deploy/ModifyAppDeploy.vue

@@ -15,7 +15,7 @@
       :model="modalForm"
       :rules="rules"
       :key="modalForm.id"
-      label-width="130px"
+      label-width="auto"
     >
       <el-form-item prop="name" label="名称:">
         <el-input
@@ -157,6 +157,17 @@ export default {
         },
         trigger: "change",
       },
+      booleanValidator: {
+        required: true,
+        validator: (rule, value, callback) => {
+          const val = this.getModalFromVal(rule.field);
+          if (!val && val !== false) {
+            callback(new Error("请选择"));
+          } else {
+            callback();
+          }
+        },
+      },
     };
   },
   methods: {
@@ -210,6 +221,12 @@ export default {
             { ...this.numberValidator },
           ];
         }
+        if (cont.type === "boolean") {
+          // custom[cont.key] = null;
+          this.rules[`control.custom.${cont.key}`] = [
+            { ...this.booleanValidator },
+          ];
+        }
       });
       this.modalForm.control.custom = custom;