fix:合并资料云盘代码

274f9160 · wufan · cbfb51a6 · 274f9160 · 274f9160 · 274f9160
Commit 274f9160 authored Dec 23, 2020 by wufan
8 changed files
--- a/src/bu-components/ChooseMembersModal.jsx
+++ b/src/bu-components/ChooseMembersModal.jsx
@@ -203,7 +203,7 @@ class ChooseMembersModal extends React.Component {
        title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
        key: 'avatar',
        dataIndex: 'avatar',
-        width: '18%',
+        width: '40',
        render: (value, record) => {
          return (
            <div className='avatar'>
@@ -219,7 +219,8 @@ class ChooseMembersModal extends React.Component {
        title: '',
        key: 'adminNameLeft',
        dataIndex: 'adminName',
-        width: '40%',
+        width: '30%',
+        align: 'center',
        render: (value, record) => {
          const { adminName } = record;
          return (
@@ -260,13 +261,12 @@ class ChooseMembersModal extends React.Component {
        title : '操作',
        key : 'edit',
        dataIndex : 'edit',
-        width : '20%',
+        width : '70%',
        align : 'right',
        render: (value, record) => {
          return (
            <div className='edit' onClick={() => this.clearOneUser(record)}>
-              {/* <Icon type="close-circle-o" /> */}
+              <span className="icon iconfont">&#xe717;</span>
-              <img src="https://image.xiaomaiketang.com/xm/sPxHWhs83R.png" className='edit-img' alt=""/>
            </div>
          )
        }
@@ -288,7 +288,7 @@ class ChooseMembersModal extends React.Component {
          onCancel={this.handleClose}
          onOk={this.addMember}
          title={title}
-          width={560}
+          width={680}
          maskClosable={false}
        >
          <div className='choose-container'>
@@ -309,7 +309,7 @@ class ChooseMembersModal extends React.Component {
                    dataSource={allUserList}
                    columns={this.selectedColumnsLeft()}               
                    pagination={false}
-                    scroll={{ y: 216}}
+                    scroll={{ y: 290}}
                    // bordered={true}
                    size={'small'}
                    rowSelection={{
@@ -342,7 +342,7 @@ class ChooseMembersModal extends React.Component {
                  dataSource={selectUserList}
                  columns={this.selectedColumnsRight()}
                  showHeader={false}
-                  scroll={{ y: 300 }}
+                  scroll={{ y: 375 }}
                  pagination={false}
                  size={'small'}
                />

--- a/src/bu-components/ChooseMembersModal.less
+++ b/src/bu-components/ChooseMembersModal.less
 .choose-container{
  display: flex;
-  background-color: #fff !important;
+  height: 417px;
  .container-left{
    width: 50%;
    padding-right: 10px;
+    margin-left: 10px;
    .container-left-header{
      margin-bottom: 10px;
@@ -12,19 +12,33 @@
    .container-left-body{
      border: 1px solid #E9E9E9;
      .search{
-        width: 250px;
+        width: 305px;
        padding: 7px 7px;
      }
      .container-left-body-table{
-        width: 252px;
+        width: 300px;
-        height: 256px;
+        height: 330px;
-        >table >thead >tr{
-          border-bottom:none;
-        }
        .ant-table {
          border: none;
          min-height: 250px !important;
+          .ant-table-header{
+            margin-bottom: -7px !important;
+            >table > .ant-table-thead > tr > th {
+              background-color: #fff !important;
+            }
+          }
+          .ant-table-tbody{
+            >tr >td {
+              border-bottom: none;
+              background-color: #fff !important;
+            }
+          }
        }
        .ant-empty-normal {
          margin: 100px 0 !important;
        }
@@ -35,25 +49,12 @@
            border-radius: 50%;
          }
        }
-        .ant-table-tbody{
-          >tr >td {
-            border-bottom:none;
-          }
-        }
-        .ant-table-row{
-          background-color: #fff !important;
-        }
-        .ant-table-row:hover{
-          background-color: #E9E9E9;
-        }
      }
    }
  }
  .container-right{
    width: 50%;
-    height: 340px;
    .span-left{
      margin-left: 10px;
      .span-left-l{
@@ -77,11 +78,11 @@
      }
      .ant-table {
-        min-height: 303px !important;
+        min-height: 378px !important;
      }
      .ant-empty-normal {
-        margin: 100px 0 !important;
+        margin: 130px 0 !important;
      }
      .avatar{
@@ -100,13 +101,6 @@
        >tr .ant-table-selection-column{
          width: 30px !important;
        }
-        .ant-table-row{
-          border: none !important;
-          background-color: #fff !important;
-        }
-        .ant-table-row:hover{
-          background-color: #e6e1e1;
-        }
      }
    }
  }

--- a/src/bu-components/ManagingMembersModal.jsx
+++ b/src/bu-components/ManagingMembersModal.jsx
@@ -298,12 +298,10 @@ class ManagingMembersModal extends React.Component {
              <div className='managing-left'>
                已有成员
                <Tooltip title="不在名单内的员工不可查看此文件/文件夹" arrowPointAtCenter>                
-                  {/* <Icon type="info-circle-o" /> */}
+                  <img src="https://image.xiaomaiketang.com/xm/JbGfBpiPjt.png"  className='tool-tip-left' alt=""/>
-                  <img src="https://image.xiaomaiketang.com/xm/XWy5riGJTi.png"  className='tool-tip-left' alt=""/>
                </Tooltip>     
              </div>
              <div className='managing-right' onClick={ () => this.handleChooseModal() }>
-                {/* <Icon type="plus-circle" /> */}
                <img src="https://image.xiaomaiketang.com/xm/xkZs3C6G5R.png" className='tool-tip-right' alt=""/>
                添加成员
              </div> 

--- a/src/bu-components/ManagingMembersModal.less
+++ b/src/bu-components/ManagingMembersModal.less
@@ -21,8 +21,8 @@
    cursor: pointer;
    .tool-tip-right{
      margin-right: 4px;
-      width: 14px;
+      width: 16px;
-      height: 14px;
+      height: 16px;
    }
  }
 }

--- a/src/common/less/icon-font.less
+++ b/src/common/less/icon-font.less
 @font-face {
  font-family: 'iconfont';  /* project id 2223403 */
-  src: url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.eot');
+  src: url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.eot');
-  src: url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.eot?#iefix') format('embedded-opentype'),
+  src: url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2223403_s8xyuagw3n.svg#iconfont') format('svg');
+  url('//at.alicdn.com/t/font_2223403_wb5zt50q1xj.svg#iconfont') format('svg');
 }
 .iconfont{
  font-family:"iconfont" !important;

--- a/src/index.html
+++ b/src/index.html
 <!--
 * @Author: 吴文洁
 * @Date: 2020-08-24 12:20:57
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-22 16:49:48
+ * @LastEditTime: 2020-12-23 16:49:52
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->
@@ -25,7 +25,7 @@
      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
    -->
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_s8xyuagw3n.css">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_wb5zt50q1xj.css">
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -146,7 +146,6 @@ class FolderList extends React.Component {
      id: folder.id,
      folderName: folder.folderName
    });
-    console.log("folder.rights---",folder.rights);
    this.setState({
      parentRights: folder.rights,
    })
@@ -348,11 +347,17 @@ class FolderList extends React.Component {
        Service.Hades('public/hadesStore/renameFolder', {
          id: renameModalData.id,
          name: folderName
-        }).then(() => {
+        }).then(res2 => {
-          message.success('重命名成功');
+          if (res2.result.code) {
-          this.setState({ renameModalData: {} });
+            const errorMessage = '此目录下已存在同名文件';
-          this.props.onRefresh({ parentId: currentFolder.id || null });
+            message.warning(errorMessage);
-        })
+            return;
+          } else {
+            message.success('重命名成功');
+            this.setState({ renameModalData: {} });
+            this.props.onRefresh({ parentId: currentFolder.id || null });
+          }
+        });  
      });
    })
  }
@@ -700,27 +705,18 @@ class FolderList extends React.Component {
            />
          </Otherwise>
        </Choose>
-        {
-          folderPathList &&
+        <CreateFolderModal
-          <CreateFolderModal
+          title='重命名'
-            title="重命名"
+          folderName={renameModalData.folderName}
-            folderName={renameModalData.folderName}
+          folderPathList={folderPathList}
-            folderPathList={folderPathList}
+          isOpen={renameModalData.visible}
-            isOpen={renameModalData.visible}
+          onClose={() => {
-            onClose={() => { this.setState({ renameModalData: {} }) }}
+            this.setState({ renameModalData: {} });
-            onOk={this.handleRenameDone}
+          }}
-          />
+          onOk={this.handleRenameDone}
-        }
+        />
-        {
-          !folderPathList &&
-          <CreateFolderModal
-            title="重命名"
-            folderName={renameModalData.folderName}
-            isOpen={renameModalData.visible}
-            onClose={() => { this.setState({ renameModalData: {} }) }}
-            onOk={this.handleRenameDone}
-          />
-        }
        <UploadProgressModal
          isOpen={showUploadModal}

--- a/src/modules/resource-disk/components/FolderManage.jsx
+++ b/src/modules/resource-disk/components/FolderManage.jsx
@@ -82,21 +82,28 @@ class FolderManage extends React.Component {
  }
  // 请求当前目录下的文件列表
-  handleFetchFolderList = (params = {}) => {
+  handleFetchFolderList = (params = {}, isSearch = false) => {
    this.setState({
      loading: true
    }, () => {
      const { parentRights } = params;
-      const { showResultPage, searchName } = this.state;
+      const { showResultPage, searchName, query, _parentRights } = this.state;
-      const { currentRootDisk: { disk } } = this.props;
+      const { current } = query;
+      const {
+        currentRootDisk: { disk }
+      } = this.props;
      const _params = {
-        ...this.state.query,
+        ...query,
        ...params,
+        parentRights,
        disk,
        searchName: showResultPage ? searchName : null,
        storeId:User.getStoreId(),
        createId:User.getUserId()
      }
+      _params.current = isSearch ? 1 : current;
      if (parentRights) {
        this.setState({ _parentRights: parentRights });
      }
@@ -108,7 +115,7 @@ class FolderManage extends React.Component {
        // 判断是否继承了父级文件权限
        if (records.length > 0 && !records[0].rights) {
          records.map((item,index) => {
-            item.rights = parentRights;
+            item.rights = _parentRights;
            _records.push(item);
            return _records;
          })
@@ -151,7 +158,7 @@ class FolderManage extends React.Component {
      showResultPage: true
    }, () => {
      // 根据关键字搜索结果页文件列表
-      this.handleFetchFolderList();
+      this.handleFetchFolderList({}, true);
    });
  }