修改移动应用界面bug

src/pages/mobileConfig/menuconfig/editForm.jsx

@@ -21,22 +21,26 @@ const EditForm = props => {
     otherForm.resetFields();
   }, [info]);
   useEffect(() => {
-    if (nodeType === 1 || nodeType === 2) {
-      let arr = Object.keys(form.getFieldsValue());
-      let obj = {};
-      arr.map(i => {
-        obj[i] = info[i];
-      });
-      form.setFieldsValue({ ...obj, shortName: info.menuShortName });
-    }
-    if (nodeType === 3 || nodeType === 4) {
-      let arr = Object.keys(otherForm.getFieldsValue());
-      let obj = {};
-      arr.map(i => {
-        obj[i] = info[i];
-      });
-      otherForm.setFieldsValue({ ...obj, shortName: info.menuShortName });
+    if(JSON.stringify(info)!='{}' ){
+      let data =info.data
+      if (nodeType === 1 || nodeType === 2) {
+        let arr = Object.keys(form.getFieldsValue());
+        let obj = {};
+        arr.map(i => {
+          obj[i] = data[i];
+        });
+        form.setFieldsValue({ ...obj, shortName: data.menuShortName });
+      }
+      if (nodeType === 3 || nodeType === 4) {
+        let arr = Object.keys(otherForm.getFieldsValue());
+        let obj = {};
+        arr.map(i => {
+          obj[i] = data[i];
+        });
+        otherForm.setFieldsValue({ ...obj, shortName: data.menuShortName });
+      }
     }
+
   }, [info]);
 
   const submit = () => {
@@ -214,7 +218,7 @@ const EditForm = props => {
             <Input />
           </Item>
           <CheckList
-            info={info}
+            info={info.data?info.data:{}}
             nodeType={nodeType}
             valueCallback={valueCallback}
           />

src/pages/platformCenter/filedConfig/fieldEditor.jsx

@@ -33,7 +33,6 @@ const AddModal = props => {
             if (validate) {
                 setLoading(true);
                 let obj = form.getFieldsValue();
-                console.log('obj', obj);
                 let data = [{ Unit: pramData.Unit || '', StoreType: "nvarchar(255)", Group: pramData.Group || '', Shape, ExceptionEvent: pramData.ExceptionEvent || '', RowSpan: pramData.RowSpan || 0, ColSpan: pramData.ColSpan || 0, ReadOnly: pramData.ReadOnly || false, EditableLater: pramData.EditableLater || false, ExceptionValue: pramData.ExceptionValue || '', Preset: pramData.Preset || '', ID: Number(itemData.ID), Name: obj.Name, Alias: obj.Alias, SyncEvent: obj.SyncEvent, ValidationRule: obj.ValidationRule, ExceptionEventFields: characterValue }]
 
                 switch (Shape) {

src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx

@@ -121,27 +121,26 @@ const ProjectManage = () => {
     }
     const changeDesc = (record) => {
         setCurrentTempalte(record)
-        // history.push({pathname:`/platformCenter/schemeDetail`,state:{template:record}} )
+        // history.push({ pathname: `/platformCenter/schemeDetail`, state: { template: record } })
         handleShowModal("editVisible", true)
     }
     const TestDesc = (record) => {
-
-        if(record.ThemeName)
-        TestPush({
-            theme:record.ThemeName,
-            msgType:record.MsgType,
-            tousers:record.PushGroup,
-            pushPath:record.item.AgentConfig?record.item.AgentConfig.Url:'',
-            msgTypeId:record.ID
-        }).then(
-            res =>{
-                if(res.code === 0){
-                    message.success("测试推送成功")
-                }else{
-                    message.error(res.msg)
+        if (record.ThemeName)
+            TestPush({
+                theme: record.ThemeName,
+                msgType: record.MsgType,
+                tousers: record.PushGroup,
+                pushPath: record.item.AgentConfig ? record.item.AgentConfig.Url : '',
+                msgTypeId: record.ID
+            }).then(
+                res => {
+                    if (res.code === 0) {
+                        message.success("测试推送成功")
+                    } else {
+                        message.error(res.msg)
+                    }
                 }
-            }
-        )
+            )
     }
     const DeleteProject = (record) => {
         let agen = record.item.AgentConfig
@@ -158,21 +157,21 @@ const ProjectManage = () => {
                             res3 => {
                                 if (res3.code === 0) {
                                     message.success("删除方案成功")
-                                    setFlag(flag +1)
+                                    setFlag(flag + 1)
                                 }
                             }
                         )
                     }
                 }
             )
-        }else{
+        } else {
             DeleteMessageConfig({
-                id:config.ID
+                id: config.ID
             }).then(
-                res3 =>{
-                    if(res3.code === 0){
+                res3 => {
+                    if (res3.code === 0) {
                         message.success("删除方案成功")
-                        setFlag(flag +1)
+                        setFlag(flag + 1)
                     }
                 }
             )
@@ -189,11 +188,11 @@ const ProjectManage = () => {
         setvisibleParams({ ...visibleParams, [key]: value });
     };
     const editModal = () => {
-        handleShowModal("editVisbile",false)
+        handleShowModal("editVisbile", false)
         setFlag(flag + 1)
     }
     const bddModal = () => {
-        handleShowModal("addVisbile",false)
+        handleShowModal("addVisbile", false)
         setFlag(flag + 1)
     }
     const onAddClick = () => {
@@ -237,6 +236,7 @@ const ProjectManage = () => {
             res => {
                 let mesList = []
                 if (res.code === 0) {
+                    console.log('res.data.MessageConfigModels',res.data.MessageConfigModels);
                     res.data.MessageConfigModels.map((item) => {
                         mesList.push({
                             name: item.MessageConfig.MsgType,
@@ -248,7 +248,7 @@ const ProjectManage = () => {
                             item: item
                         })
                     })
-                    console.log('mesList',mesList);
+                    console.log('mesList', mesList);
                     setDataList(mesList)
                 }
             }
@@ -297,7 +297,7 @@ const ProjectManage = () => {
 
             </div>
             <div className={styles.list_view}>
-                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} rowKey='ID'/>
+                <Table columns={columns} dataSource={dataList} pagination={{ pageSize: '10' }} rowKey='ID' />
             </div>
             <EditModal
                 visible={visibleParams.editVisible}

src/pages/platformCenter/messageManage/projectManage/components/IISAgentConfig/VisibleIISAgentConfig.jsx

@@ -25,7 +25,6 @@ const VisibleIISAgentConfig = props => {
     const [form] = Form.useForm();
     const dateFormat = 'YYYY-MM-DD HH:mm:ss';
     const { agentConfig, value, onIISAgentSubmit } = props
-
     useEffect(() => {
         if (agentConfig) {
             form.setFieldsValue({
@@ -53,11 +52,13 @@ const VisibleIISAgentConfig = props => {
         }
 
 
-
-        form.setFieldsValue({
-            name: value
-        })
-        setSelectRole(props.value)
+        if(value){
+            form.setFieldsValue({
+                name: value
+            })
+            setSelectRole(props.value)
+        }
+ 
     }, [props])
 
 
@@ -174,6 +175,7 @@ const VisibleIISAgentConfig = props => {
                 destroyOnClose
                 cancelText="取消"
                 okText="确认"
+                forceRender 
                 visible={previewVisible}
                 onOk={() => handleOk()}
                 confirmLoading={loading}

src/pages/platformCenter/messageManage/projectManage/components/IISAgentConfig/VisibleIISAgentConfig.less

 .agent_container {
     display: flex;
     flex-direction: row;
-    
+    width: 80%;
     .select_btn {
         display: inline-block;
         color: #2f54eb;
         cursor: pointer;
         border-bottom: 1px solid #2f54eb;
-        width: 80px;
+        width: 6rem;
+        text-align: center;
         margin-left: 20px;
     }
 

src/pages/platformCenter/messageManage/projectManage/components/RolseSelect/VisibleRoleModal.less

 .role_container {
   display: flex;
   flex-direction: row;
-
+  width: 80%;
   .select_btn {
     display: inline-block;
     color: #2f54eb;
     cursor: pointer;
     border-bottom: 1px solid #2f54eb;
-    width: 80px;
+    width: 6rem;
+    text-align: center;
     margin-left: 20px;
   } 
 }

src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx

@@ -72,11 +72,8 @@ const TemplateManage = () => {
         setOption([]);
         GetThirdpartyTemplates(obj).then(res => {
                 if (res.msg==="Ok") {
-                    console.log(res.data);
                     setOption(res.data);
-                    console.log(2)
                 } else {
-                    console.log(1);
                     notification.error({
                         message: '提示',
                         duration: 15,

src/pages/platformCenter/schemeDetail/schemeDetail.less

 .editModal_container{
     width: 100%;
-    background-color: #FFFFFF;
-    overflow-y: scroll;
+    overflow-y: hidden;
+    height: calc(100% - 20px);
     display: flex;
     flex-direction: column;
+    .content{
+        height: calc(100vh - 140px);
+        overflow-y: scroll;
+    }
+    .cardList{
+        display: flex;
+        flex-wrap: wrap;
+        .cardListItem{
+            width: 50%;
+            line-height: 3rem;
+        }
+    }
+    .ant-card-bordered {
+        border-right: none;
+    }
     .push_trench{
         width: 100%;
         height: fit-content;
         display: flex;
         flex-direction:row;
         flex-wrap: wrap;
-        
+        justify-content: space-between;
         .trench_card{
-            width: 500px;
-            margin: 20px;
+            margin-top: 1rem;
+            width: 49.6%;
             border-width: 1px;
             border-color: #EEEEEE;
             border-style: solid;
             border-radius: 5px;
             display: flex;
             flex-direction: column;
-            justify-content: space-around;
             align-items: center;
+            background-color: #ffffff;
             .card_title{
                 border-bottom-style: solid;
                 border-bottom-width: 1px;
@@ -30,7 +45,8 @@
                 width: 100%;
                 display: flex;
                 flex-direction: row;
-                justify-content: flex-start;
+                justify-content:space-between;
+                padding: 0 1rem;
                 align-items: center;
                 .lable{
                     font-size: large;
@@ -41,7 +57,10 @@
                 margin-top: 10px;
                 width: 100%;
                 padding: 10px;
-
+                height: 18rem;
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
             }
             
         }

src/pages/platformCenter/standingBook/editorModal.jsx

@@ -223,7 +223,7 @@ const AddModal = props => {
                                 </Input>
                                 <Dropdown
                                     placement='bottomRight'
-                                    style={{width:'10rem'}}
+                                    style={{width:'20rem'}}
                                     overlay={<Menu>
                                          {tableData.length ? tableData.map((item, index) => { return  <Menu.Item onClick={()=>{setType(item); form.setFieldsValue({ Type:item})}} style={{width:'26.6rem'}} key={index}>{item}</Menu.Item> }) : ''}
                                     </Menu>} >

src/pages/platformCenter/standingBook/standingBook.jsx

@@ -303,6 +303,12 @@ const standingBook = props => {
                         size="small"
                         rowKey='ID'
                         bordered
+                        onRow={record => {
+                            return {
+                              onDoubleClick: event => {event.stopPropagation(); editor(record)}, //双击
+                            };
+                          }}
+                
                         columns={columns}
                         dataSource={allData[pickItem]}
                         // loading={tableLoading}

src/pages/platformCenter/standingBook/standingBook.less

@@ -331,7 +331,7 @@
     }
   }
 .formData{
-    height: 26rem;
+    height: 38rem;
     overflow-y: scroll;
     .ant-form-item-label > label.ant-form-item-required:not(.ant-form-item-required-mark-optional)::before{
         display: none;