更新展示形式，升级到2.4.5

jero-web/src/views/system/modules/SysFillRuleModal.vue

@@ -10,40 +10,27 @@
     cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则名称">
-          <a-input placeholder="请输入规则名称" v-decorator="['ruleName', validatorRules.ruleName]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则Code">
-          <a-input placeholder="请输入规则Code" :disabled="disabledCode" v-decorator="['ruleCode', validatorRules.ruleCode]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则实现类">
-          <a-input placeholder="请输入规则实现类" v-decorator="['ruleClass', validatorRules.ruleClass]"/>
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="规则参数">
-          <a-textarea placeholder="请输入规则参数" :rows="5" v-decorator="['ruleParams', validatorRules.ruleParams]"/>
-        </a-form-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规则名称" prop="ruleName">
+          <a-input placeholder="请输入规则名称" v-model="model.ruleName"/>
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol"  :wrapperCol="wrapperCol" label="规则Code"  prop="ruleCode" >
+          <a-input placeholder="请输入规则Code" :disabled="disabledCode" v-model="model.ruleCode"/>
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规则实现类" prop="ruleClass" >
+          <a-input placeholder="请输入规则实现类" v-model="model.ruleClass"/>
+        </a-form-model-item>
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="规则参数" prop="ruleParams">
+          <a-textarea placeholder="请输入规则参数" :rows="5" v-model="model.ruleParams"/>
+        </a-form-model-item>
 
-      </a-form>
+      </a-form-model>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-  import pick from 'lodash.pick'
   import { httpAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
 
@@ -59,35 +46,30 @@
         wrapperCol: { xs: { span: 24 }, sm: { span: 16 } },
 
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules: {
-          ruleName: { rules: [{ required: true, message: '规则名称不能为空' }] },
-          ruleCode: {
-            rules: [
-              { required: true, message: '规则Code不能为空' },
-              { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
-            ]
-          },
-          ruleClass: { rules: [{ required: true, message: '规则实现类不能为空' }] },
-          ruleParams: {
-            rules: [{
-              validator: (rule, value, callback) => {
+          ruleName: [{ required: true, message: '规则名称不能为空' }],
+          ruleCode: [
+            { required: true, message: '规则Code不能为空' },
+            { validator: (rule, value, callback) => validateDuplicateValue('sys_fill_rule', 'rule_code', value, this.model.id, callback) }
+          ],
+          ruleClass: [{ required: true, message: '规则实现类不能为空' }],
+          ruleParams: [{
+            validator: (rule, value, callback) => {
 
-                try {
-                  let json = JSON.parse(value)
-                  if (json instanceof Array) {
-                    callback('只能传递JSON对象，不能传递JSON数组')
-                  } else if (json instanceof Object) {
-                    callback()
-                  } else {
-                    callback('请输入JSON字符串')
-                  }
-                } catch {
+              try {
+                let json = JSON.parse(value)
+                if (json instanceof Array) {
+                  callback('只能传递JSON对象，不能传递JSON数组')
+                } else if (json instanceof Object) {
+                  callback()
+                } else {
                   callback('请输入JSON字符串')
                 }
+              } catch {
+                callback('请输入JSON字符串')
               }
-            }]
-          },
+            }
+          }],
         },
         url: {
           add: '/sys/fillRule/add',
@@ -107,11 +89,10 @@
         this.edit({})
       },
       edit(record) {
-        this.form.resetFields()
-        this.model = Object.assign({}, record)
         this.visible = true
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, 'ruleName', 'ruleCode', 'ruleClass', 'ruleParams'))
+          this.$refs.form.resetFields()
+          this.model = Object.assign({}, record)
         })
       },
       close() {
@@ -121,8 +102,8 @@
       handleOk() {
         const that = this
         // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
+        this.$refs.form.validate((ok, err) => {
+          if (ok) {
             that.confirmLoading = true
             let httpUrl = this.url.add, method = 'post'
             if (this.model.id) {
@@ -130,17 +111,16 @@
               method = 'put'
             }
 
-            let formData = Object.assign(this.model, values)
-            httpAction(httpUrl, formData, method).then((res) => {
+            httpAction(httpUrl, this.model, method).then((res) => {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$emit('ok')
+                that.close()
               } else {
                 that.$message.warning(res.message)
               }
             }).finally(() => {
               that.confirmLoading = false
-              that.close()
             })
           }
         })