fix: fix

src/components/Colophon/colContent.jsx

@@ -30,6 +30,42 @@ const ColConen = () => {
 };
 
 const arr = [
+  {
+    key: '4',
+    label: 'v6.0.20210108 ',
+    content: (
+      <div className={styles.hr}>
+        <div className={styles.topBox}>
+          <div className={styles.topl}>v6.0.20210108</div>
+          <div className={styles.topr}>2021-01-08</div>
+        </div>
+        <hr />
+        <h3>图片管理</h3>
+        <ul>
+          <li>【优化】 筛选展示图片的类型</li>
+        </ul>
+        <h3>用户管理</h3>
+        <ul>
+          <li>【优化】 优化了table展示图标</li>
+        </ul>
+        <h3>站点管理</h3>
+        <ul>
+          <li>【新增】 新增搜索过滤功能</li>
+          <li>【修改】 修改了页面展示形式</li>
+        </ul>
+        <h3>Web配置</h3>
+        <ul>
+          <li>【新增】 产品配置模块</li>
+          <li>【优化】 优化菜单描述</li>
+        </ul>
+        <h3>移动应用配置</h3>
+        <ul>
+          <li>【优化】 增加展示应用类别</li>
+          <li>【优化】 优化菜单描述</li>
+        </ul>
+      </div>
+    ),
+  },
   {
     key: '3',
     label: 'v5.0.20201231 ',

src/components/Colophon/index.jsx

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

src/pages/database/InitDataBase.jsx

@@ -141,15 +141,7 @@ const InitDataBase = props => {
         doInitLog();
       }, 100);
     }
-    const timer = setInterval(() => {
-      if (
-        scroll.current.scrollHeight ===
-        scroll.current.clientHeight + scroll.current.scrollTop
-      ) {
-        clearInterval(timer);
-      }
-      scroll.current.scrollTo(0, scroll.current.scrollHeight - 570);
-    }, 1000);
+
     initDBv4({
       _version: 9999,
       _dc: Date.now(),
@@ -171,6 +163,15 @@ const InitDataBase = props => {
         setCardLoading(false);
         console.log(err);
       });
+    const timer = setInterval(() => {
+      if (
+        scroll.current.scrollHeight ===
+        scroll.current.clientHeight + scroll.current.scrollTop
+      ) {
+        clearInterval(timer);
+      }
+      scroll.current.scrollTo(0, scroll.current.scrollHeight - 570);
+    }, 1000);
   };
   const onValuesChange = (value, b) => {
     form.setFieldsValue(value);
@@ -333,7 +334,6 @@ const InitDataBase = props => {
   };
   // 弹窗确认回调
   const modalOkCallback = () => {
-    console.log(form.getFieldsValue());
     const obj = form.getFieldsValue();
     // 更新描述
     updateConnDesc({

src/pages/userCenter/userManage/ChangePasswordModal.jsx

@@ -44,6 +44,11 @@ const ChangePasswordModal = props => {
               description: res.message,
             });
           }
+          passwordForm.setFieldsValue({
+            oldPassword: currentUser.password,
+            newPassword: '',
+            passwordConfirm: '',
+          });
         })
         .catch(err => {
           message.error(err);
@@ -73,7 +78,14 @@ const ChangePasswordModal = props => {
       title="修改密码"
       visible={visible}
       onOk={submitChangePassword}
-      onCancel={onCancel}
+      onCancel={() => {
+        passwordForm.setFieldsValue({
+          oldPassword: currentUser.password,
+          newPassword: '',
+          passwordConfirm: '',
+        });
+        onCancel();
+      }}
       okText="确认"
       cancelText="取消"
     >

src/pages/userCenter/userManage/EditUserModal.jsx

@@ -80,6 +80,12 @@ const EditUserModal = props => {
               description: res.message,
             });
           }
+          editUserForm.setFieldsValue({
+            loginName: voca.stripTags(currentUser.loginName),
+            userName: voca.stripTags(currentUser.userName),
+            phone: '',
+            email: '',
+          });
         })
         .catch(err => {
           message.error(err);
@@ -91,7 +97,15 @@ const EditUserModal = props => {
       title="编辑用户"
       visible={visible}
       onOk={submitEditUser}
-      onCancel={onCancel}
+      onCancel={() => {
+        onCancel();
+        editUserForm.setFieldsValue({
+          loginName: voca.stripTags(currentUser.loginName),
+          userName: voca.stripTags(currentUser.userName),
+          phone: '',
+          email: '',
+        });
+      }}
       okText="确认"
       cancelText="取消"
     >