JeecgBoot2.4.3版本发布——企业级低代码平台

ant-design-vue-jeecg/src/views/system/modules/DictModal.vue

@@ -9,30 +9,34 @@
     cancelText="关闭"
   >
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="dictName"
+          required
           label="字典名称">
-          <a-input placeholder="请输入字典名称" v-decorator.trim="[ 'dictName', validatorRules.dictName]"/>
-        </a-form-item>
+          <a-input placeholder="请输入字典名称" v-model="model.dictName"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
+          prop="dictCode"
+          required
           label="字典编码">
-          <a-input placeholder="请输入字典编码" v-decorator.trim="[ 'dictCode', validatorRules.dictCode]"/>
-        </a-form-item>
+          <a-input placeholder="请输入字典编码" v-model="model.dictCode"/>
+        </a-form-model-item>
 
-        <a-form-item
+        <a-form-model-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="描述">
-          <a-input v-decorator="[ 'description']"/>
-        </a-form-item>
+          <a-input v-model="model.description"/>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
@@ -58,14 +62,12 @@
           sm: { span: 16 }
         },
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules: {
-          dictName: { rules: [{ required: true, message: '请输入字典名称!' }] },
-          dictCode: {
-            rules: [{ required: true, message: '请输入字典编码!' },
-              { validator: this.validateDictCode }]
+          dictName: [{ required: true, message: '请输入字典名称!' }],
+          dictCode: [
+            { required: true, message: '请输入字典编码!' },
+            { validator: this.validateDictCode }]
           }
-        }
       }
     },
     created() {
@@ -99,30 +101,24 @@
         } else {
           this.visiblekey = false
         }
-        this.form.resetFields()
         this.model = Object.assign({}, record)
         this.visible = true
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'dictName', 'dictCode', 'description'))
-        })
       },
       // 确定
       handleOk() {
         const that = this
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate(valid => {
+          if (valid) {
             that.confirmLoading = true
-            values.dictName = (values.dictName || '').trim()
-            values.dictCode = (values.dictCode || '').trim()
-            values.description = (values.description || '').trim()
-            let formData = Object.assign(this.model, values)
+            this.model.dictName = (this.model.dictName || '').trim()
+            this.model.dictCode = (this.model.dictCode || '').trim()
+            this.model.description = (this.model.description || '').trim()
             let obj
-            console.log(formData)
             if (!this.model.id) {
-              obj = addDict(formData)
+              obj = addDict(this.model)
             } else {
-              obj = editDict(formData)
+              obj = editDict(this.model)
             }
             obj.then((res) => {
               if (res.success) {
@@ -135,6 +131,8 @@
               that.confirmLoading = false
               that.close()
             })
+          }else{
+            return false;
           }
         })
       },
@@ -145,6 +143,7 @@
       close() {
         this.$emit('close')
         this.visible = false
+        this.$refs.form.resetFields();
       }
     }
   }