fix: 修复页面问题

src/components/Colophon/colContent.jsx

@@ -30,13 +30,60 @@ const ColConen = () => {
 };
 
 const arr = [
+  {
+    key: '2',
+    label: 'v5.0.20201225 ',
+    content: (
+      <div className={styles.hr}>
+        <div className={styles.topBox}>
+          <div className={styles.topl}>v5.0.20201225</div>
+          <div className={styles.topr}>2020-12-25</div>
+        </div>
+        <hr />
+        <h3>角色管理</h3>
+        <ul>
+          <li>【修改】 修改了分组获取方式，禁止手动修改</li>
+          <li>【修改】 修改了默认展示的应用</li>
+        </ul>
+        <h3>gis平台</h3>
+        <ul>
+          <li>【新增】 新增七参数配置</li>
+        </ul>
+        <h3>业务平台</h3>
+        <ul>
+          <li>【修改】 修改了页面内容，优化了引导方式</li>
+        </ul>
+        <h3>web配置</h3>
+        <ul>
+          <li>【修改】 菜单展示页面结构调整，调整提交逻辑</li>
+        </ul>
+        <h3>移动应用配置</h3>
+        <ul>
+          <li>【修改】 菜单展示页面结构调整，调整提交逻辑</li>
+        </ul>
+        <h3>系统日志</h3>
+        <ul>
+          <li>【修改】 模块名称做了修改</li>
+          <li>【修改】 运维痕迹页面展示内容做了调整</li>
+        </ul>
+        <h3>数据库连接配置</h3>
+        <ul>
+          <li>【修改】 调整页面展示结构</li>
+        </ul>
+        <h3>版本记录</h3>
+        <ul>
+          <li>【修改】 修改了版本内容展示方式，调整了版本号的定义方式</li>
+        </ul>
+      </div>
+    ),
+  },
   {
     key: '1',
-    label: 'v1.0.20201218 ',
+    label: 'v5.0.20201218 ',
     content: (
       <div className={styles.hr}>
         <div className={styles.topBox}>
-          <div className={styles.topl}>v1.0.20201218</div>
+          <div className={styles.topl}>v5.0.20201218</div>
           <div className={styles.topr}>2020-12-18</div>
         </div>
         <hr />
@@ -61,11 +108,11 @@ const arr = [
   },
   {
     key: '0',
-    label: `v1.0.20201217 `,
+    label: `v5.0.20201217 `,
     content: (
       <div className={styles.hr}>
         <div className={styles.topBox}>
-          <div className={styles.topl}>v1.0.20201217</div>
+          <div className={styles.topl}>v5.0.20201217</div>
           <div className={styles.topr}>2020-12-17</div>
         </div>
         <hr />

src/components/Colophon/index.jsx

@@ -13,7 +13,7 @@ const Colophon = props => {
   };
   return (
     <div className={styles.desc} onClick={handleClick}>
-      <div>版本号v1.0.20201218</div>
+      <div>版本号v5.0.20201225</div>
       <div onClick={e => e.stopPropagation()}>
         <Modal
           width={1200}

src/pages/database/InitDataBase.jsx

@@ -429,18 +429,20 @@ const InitDataBase = props => {
           >
             修改描述
           </Button>
-          <Popconfirm
-            title="是否删除该连接的历史记录？"
-            okText="确认"
-            cancelText="取消"
-            onConfirm={() => {
-              delConfirm(record);
-            }}
-          >
-            <Button size="small" danger>
-              删除
-            </Button>
-          </Popconfirm>
+          <div onClick={e => e.stopPropagation()}>
+            <Popconfirm
+              title="是否删除该连接的历史记录？"
+              okText="确认"
+              cancelText="取消"
+              onConfirm={() => {
+                delConfirm(record);
+              }}
+            >
+              <Button size="small" danger>
+                删除
+              </Button>
+            </Popconfirm>
+          </div>
         </Space>
       ),
     },

src/pages/mobileConfig/index.js

@@ -26,7 +26,7 @@ import { appConnector } from '@/containers/App/store';
 const { TabPane } = Tabs;
 const MobileConfigPage = props => {
   const { userMode } = props;
-  const [activeKey, setActiveKey] = useState('1'); // tabs活动页
+  const [activeKey, setActiveKey] = useState('0'); // tabs活动页
   const [miniTitle, setMiniTitle] = useState(''); // 应用名称
   const [flag, setFlag] = useState(1); // 刷新标志
   const [showConfig, setShowConfig] = useState(true);

src/pages/mobileConfig/menuconfig/VersionPublish.js

@@ -166,7 +166,7 @@ export default props => {
         <Spin />
       ) : (
         <>
-          <div className="base-info">
+          <div className={styles.apkbox}>
             <p className={styles.title}>apk版本管理：</p>
             <div className={styles.row}>
               <div className={styles.label}>当前包名：</div>
@@ -197,7 +197,7 @@ export default props => {
               </div>
             </div>
             <Button
-              style={{ marginLeft: '115px' }}
+              style={{ marginLeft: '115px', marginTop: '20px' }}
               type="primary"
               onClick={() => setShowModal(true)}
             >

src/pages/mobileConfig/menuconfig/checkBox.less

 .box{
   display: flex;
-  padding: 10px 10px 10px 20px;
+  padding:  20px;
   margin: 20px;
   flex-wrap: wrap;
-  border: 1px solid #eee;
+  border: 1px solid #bfbfbf;
 }
 .check{
   flex-shrink: 0;

src/pages/mobileConfig/menuconfig/otherConfig.less

@@ -12,7 +12,7 @@
 
 .VersionPublish {
   display: flex;
-  padding: 0 15px;
+  padding: 20px 15px;
   min-height: calc( 100vh - 232px)!important;
 }
 
@@ -35,4 +35,7 @@
   margin-top: 15px;
   min-height: calc(100vh - 135px);
   // min-height: calc(100vh - 255px);
+}
+.apkbox{
+  margin: 0 0 0 20vw;
 }
\ No newline at end of file

src/pages/webConfig/menuconfig/checkBox.jsx

@@ -5,7 +5,7 @@ const CheckList = props => {
   const { info, valueCallback, nodeType } = props;
   const [list, setList] = useState([]);
   const [flag, setFlag] = useState(false);
-  const a = 'a';
+  console.log(info, 'info');
   useEffect(() => {
     if (info.pageUrl) {
       let arr = [...info.relatedRoleList];

src/pages/webConfig/menuconfig/checkBox.less

 .box{
   display: flex;
-  padding: 10px;
-  margin-top: 10px;
+  padding: 20px;
+  margin: 20px;
   flex-wrap: wrap;
+  border: 1px solid #bfbfbf;
 }
 .check{
   flex-shrink: 0;

src/pages/webConfig/menuconfig/editForm.jsx

@@ -3,16 +3,23 @@ import { Form, Input, Button, Row, Col, Select } from 'antd';
 import styles from './addForm.less';
 import PicturesWall from '@/components/Upload/index';
 import EditeConfigWrapper from './editConfigFileWrapper';
+import CheckList from './checkBox';
 
 const { Item } = Form;
 const EditForm = props => {
-  const { submitCallback, nodeType, info, configFiles } = props;
+  const {
+    submitCallback,
+    nodeType,
+    info,
+    configFiles,
+    valueCallback = () => {},
+  } = props;
   const [form] = Form.useForm();
   const [otherForm] = Form.useForm();
   const layout = {
     layout: 'horizontal',
-    labelCol: { span: 4, offset: 1 },
-    wrapperCol: { span: 16 },
+    labelCol: { span: 2 },
+    wrapperCol: { span: 20, offset: 0 },
   };
   // 回显表单
   useEffect(() => {
@@ -96,6 +103,11 @@ const EditForm = props => {
               </Select>
             </EditeConfigWrapper>
           </Item>
+          <CheckList
+            info={info}
+            nodeType={nodeType}
+            valueCallback={valueCallback}
+          />
           <Item wrapperCol={{ offset: 10 }} style={{ marginTop: '40px' }}>
             <Button type="primary" htmlType="submit">
               提交

src/pages/webConfig/menuconfig/webMenu.jsx

@@ -490,6 +490,7 @@ const MiniMenu = props => {
               info={info}
               configFiles={configFiles}
               submitCallback={editSubmitCallback}
+              valueCallback={valueCallback}
             />
           ) : (
             <Empty
@@ -498,7 +499,7 @@ const MiniMenu = props => {
             />
           )}
         </div>
-        <div
+        {/* <div
           className={classnames({
             [styles.rightBox]: true,
           })}
@@ -509,7 +510,7 @@ const MiniMenu = props => {
             nodeType={nodeType}
             valueCallback={valueCallback}
           />
-        </div>
+        </div> */}
       </div>
     </Spin>
   );

src/pages/webConfig/menuconfig/webMenu.less

@@ -46,11 +46,11 @@
 }
 .middle{
   min-width: 500px;
-  width: 500px;
+  width: 100%;
   min-height: 100%;
   border: 1px solid #eee;
   padding: 10px;
-  margin: 0 10px;
+  margin: 0 0 0 10px;
 }
 .title{
   display: flex;

src/routes/config.js

@@ -254,7 +254,7 @@ export default {
           routes: [
             {
               path: '/log/service',
-              name: '服务日志',
+              name: '服务监控',
               component: ServiceLog,
             },
             {
@@ -264,7 +264,7 @@ export default {
             },
             {
               path: '/log/omsLog',
-              name: '运维日志',
+              name: '运维痕迹',
               component: OmsLog,
             },
           ],