bug fix

package.json

@@ -43,7 +43,7 @@
   "dependencies": {
     "@ant-design/pro-layout": "^4.5.9",
     "@antv/data-set": "^0.10.2",
-    "@zjxpcyc/xrc-form2": "^2.1.0",
+    "@zjxpcyc/xrc-form2": "^2.2.1",
     "antd": "^3.20.0",
     "classnames": "^2.2.6",
     "dva": "^2.4.1",

src/pages/UserManage/Editor/Miniapp.jsx

@@ -35,9 +35,9 @@ const TplItem = React.forwardRef((props, ref) => {
     <div ref={ref}>
       <Input.Group compact>
         <Tooltip title="消息类型">
-          <Select style={{ width: '15%' }} value={!!val.isSubscribe} onChange={handleChange('isSubscribe')}>
-            <Option value={true}>订阅</Option>
-            <Option value={false}>服务</Option>
+          <Select style={{ width: '15%' }} value={!!val.isSubscribe - 0} onChange={handleChange('isSubscribe')}>
+            <Select.Option value={1}>订阅</Select.Option>
+            <Select.Option value={0}>服务</Select.Option>
           </Select>
         </Tooltip>
         <Tooltip title="消息模板ID">
@@ -89,16 +89,16 @@ const Miniapp = (props) => {
   }
 
   const tplFields = (props.tplTyps || []).map((x) => {
-    console.log(props.tplTyps)
-    console.log('tpls: ', tpls)
-    console.log('appdata: ', appdata)
-    console.log('tpls.filter: ', tpls.filter(y => y.tplType === x.code)[0] || {})
+    // console.log(props.tplTyps)
+    // console.log('tpls: ', tpls)
+    // console.log('appdata: ', appdata)
+    // console.log('tpls.filter: ', tpls.filter(y => y.tplType === x.code)[0] || {})
     return {
       label: x.name,
       name: `tpl.${x.code}`,
       node: TplItem,
       value: tpls.filter(y => y.tplType === x.code)[0] || {},
-      hidden: vals => vals.isSubscribe,
+      hidden: ({ allFieldsValues }) => allFieldsValues.isSubscribe,
     }
   })
 
@@ -200,13 +200,16 @@ const Miniapp = (props) => {
         return
       }
 
-      return submitData[key]
+      return {
+        ...submitData[key],
+        tplType: tplType.code,
+      }
     })
 
     return [tplData, errors]
   }
 
-  const handleSubmit = val => {
+  const handleSubmit = (val, setSubmitting) => {
     // 校验字段
     const { tpl, ...otherData} = val
 
@@ -225,14 +228,18 @@ const Miniapp = (props) => {
       tpls: tplData,
     }
 
+    setSubmitting(true)
+
     saveMiniapp({ data }).then((miniapp) => {
       
       if (typeof props.onChange === 'function') {
         props.onChange({ ...user, miniapp })
       }
 
+      setSubmitting(false)
+
       notification.success({ message: '保存小程序信息成功' })
-    }).catch(x => x)
+    }).catch(x => setSubmitting(false))
   }
 
   const handleCancel = () => {