Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/components/Colophon/colContent.jsx

@@ -27,6 +27,53 @@ const ColConen = () => {
 };
 
 const arr = [
+  {
+    key: '5',
+    label: 'v6.0.20210115 ',
+    content: (
+      <div className={styles.hr}>
+        <div className={styles.topBox}>
+          <div className={styles.topl}>v6.0.20210115</div>
+          <div className={styles.topr}>2021-01-15</div>
+        </div>
+        <hr />
+        <h3>用户管理</h3>
+        <ul>
+          <li>【优化】 优化了table展示图标</li>
+          <li>【修复】 修复了批量删除失效的问题</li>
+        </ul>
+        <h3>角色管理</h3>
+        <ul>
+          <li>【优化】 优化了选中列表时的展示内容</li>
+        </ul>
+        <h3>站点管理</h3>
+        <ul>
+          <li>【新增】 新增已选列表框，展示选中的人员</li>
+        </ul>
+        <h3>GIS平台</h3>
+        <ul>
+          <li>【修复】 修复了维护管理不能提交保存</li>
+        </ul>
+        <h3>产品配置</h3>
+        <ul>
+          <li>【新增】 新配置路由成为独立模块</li>
+          <li>【优化】 优化了配置提交规则</li>
+        </ul>
+        <h3>Web配置</h3>
+        <ul>
+          <li>【优化】 优化了页面刷新问题</li>
+        </ul>
+        <h3>网关配置</h3>
+        <ul>
+          <li>【新增】 动态使用网关接口</li>
+        </ul>
+        <h3>运维痕迹</h3>
+        <ul>
+          <li>【优化】 优化运维痕迹操作信息展示</li>
+        </ul>
+      </div>
+    ),
+  },
   {
     key: '4',
     label: 'v6.0.20210108 ',

src/components/Colophon/index.jsx

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

src/pages/mobileConfig/index.js

@@ -169,30 +169,30 @@ const MobileConfigPage = props => {
 
   const ContentTab = () => (
     <ProCard>
-      <Spin tip="loading..." spinning={loading}>
-        <Tabs activeKey={activeKey} type="card" onChange={handleChange}>
-          {showConfig && (
-            <TabPane tab={tabArr[0].title} key={tabArr[0].key}>
-              {activeKey === tabArr[0].key && tabArr[0].component}
-            </TabPane>
-          )}
-          {showConfig && subType !== 'add' && (
-            <TabPane tab={tabArr[1].title} key={tabArr[1].key}>
-              {activeKey === tabArr[1].key && tabArr[1].component}
-            </TabPane>
-          )}
-          {/* {showConfig && subType !== 'add' && (
+      {/* <Spin tip="loading..." spinning={loading}> */}
+      <Tabs activeKey={activeKey} type="card" onChange={handleChange}>
+        {showConfig && (
+          <TabPane tab={tabArr[0].title} key={tabArr[0].key}>
+            {activeKey === tabArr[0].key && tabArr[0].component}
+          </TabPane>
+        )}
+        {showConfig && subType !== 'add' && (
+          <TabPane tab={tabArr[1].title} key={tabArr[1].key}>
+            {activeKey === tabArr[1].key && tabArr[1].component}
+          </TabPane>
+        )}
+        {/* {showConfig && subType !== 'add' && (
             <TabPane tab={tabArr[2].title} key={tabArr[2].key}>
               {activeKey === tabArr[2].key && tabArr[2].component}
             </TabPane>
           )} */}
-          {showConfig && subType !== 'add' && (
-            <TabPane tab={tabArr[3].title} key={tabArr[3].key}>
-              {activeKey === tabArr[3].key && tabArr[3].component}
-            </TabPane>
-          )}
-        </Tabs>
-      </Spin>
+        {showConfig && subType !== 'add' && (
+          <TabPane tab={tabArr[3].title} key={tabArr[3].key}>
+            {activeKey === tabArr[3].key && tabArr[3].component}
+          </TabPane>
+        )}
+      </Tabs>
+      {/* </Spin> */}
     </ProCard>
   );
   const cts = (tabPaneItem, id) => (
@@ -239,14 +239,16 @@ const MobileConfigPage = props => {
   ];
   return (
     <PageContainer>
-      <Tabs
-        activeKey={parentKey}
-        onChange={handleParChange}
-        type="editable-card"
-        onEdit={handleEdit}
-      >
-        {singleList.map(item => cts(item, parentKey))}
-      </Tabs>
+      <Spin spinning={loading} tip="loading...">
+        <Tabs
+          activeKey={parentKey}
+          onChange={handleParChange}
+          type="editable-card"
+          onEdit={handleEdit}
+        >
+          {singleList.map(item => cts(item, parentKey))}
+        </Tabs>
+      </Spin>
       <Drawer
         title="新增应用"
         destroyOnClose

src/pages/webConfig/components/editForm.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Input, Button, Popconfirm, Spin } from 'antd';
 import { modifyProduct } from '@/services/webConfig/api';
 const { Item } = Form;
 const { Option } = Select;
+const { TextArea } = Input;
 const EditForm = props => {
   const { productObj, editCallback, handleDel } = props;
   const [config, setConfig] = useState(''); // 网站配置信息
@@ -111,7 +112,10 @@ const EditForm = props => {
               },
             ]}
           >
-            <Input placeholder="请输入默认配置" allowClear />
+            <TextArea
+              placeholder="请输入默认配置"
+              autoSize={{ minRows: 3, maxRows: 5 }}
+            />
           </Item>
           <div style={{ display: 'flex', marginLeft: '35%' }}>
             <Item

src/pages/webConfig/components/productForm.jsx

@@ -3,6 +3,7 @@ import { Form, Select, Input, Button, notification, Spin } from 'antd';
 import { modifyProduct } from '@/services/webConfig/api';
 const { Item } = Form;
 const { Option } = Select;
+const { TextArea } = Input;
 const AddForm = props => {
   const { addCallback } = props;
   const [config, setConfig] = useState(''); // 网站配置信息
@@ -124,7 +125,11 @@ const AddForm = props => {
               },
             ]}
           >
-            <Input placeholder="请输入默认配置" allowClear />
+            <TextArea
+              placeholder="请输入默认配置"
+              allowClear
+              autoSize={{ minRows: 3, maxRows: 5 }}
+            />
           </Item>
           <Item wrapperCol={{ span: 7, offset: 7 }}>
             <Button type="primary" htmlType="submit">