feat:联调云盘保存和列表相关接口

60e3ec46 · zhangleyuan · 6beed531 · 60e3ec46 · 60e3ec46 · 60e3ec46
Commit 60e3ec46 authored Dec 17, 2020 by zhangleyuan
10 changed files
--- a/src/bu-components/CopyFileModal.jsx
+++ b/src/bu-components/CopyFileModal.jsx
@@ -18,7 +18,7 @@ window.currentUserInstInfo = {adminId: "1224977437688578050", adminName: "吴帆
 const { instId } = window.currentUserInstInfo;     // 机构Id
 const folder_list_url = {                          // 文件夹url                     
-  'MYSELF': 'public/apollo/folderList',               
+  'MYSELF': 'public/hadesStore/folderList',               
  'COMMON': 'public/hadesStore/folderList'
 }
 const defaultQuery = {                             // 默认请求参数
@@ -173,12 +173,13 @@ class CopyFileModal extends React.Component {
    // 如果不是文件夹，直接return
    if (folderType !== 'FOLDER') return;
    const _params = {
-      instId,
      disk,
      parentId,
      current,
      size,
-      folderIdType : folderType
+      folderIdType : folderType,
+      storeId:User.getStoreId(),
+      createId:User.getUserId()
    }
    // 是否切换盘符
    if (folderPathList[0].disk !== disk){

--- a/src/bu-components/SelectPrepareFileModal.jsx
+++ b/src/bu-components/SelectPrepareFileModal.jsx
@@ -27,6 +27,7 @@ import UploadProgressModal from '@/bu-components/UploadProgressModal';
 import NonCompliantFileModal from './NonCompliantFileModal';
 import './SelectPrepareFileModal.less';
+import User from '@/common/js/user';
 const defaultQuery = {
  size: 10,
@@ -41,9 +42,9 @@ const defaultRootDisk = {
 }
 const FOLDERLIST_URL_MAP = {
-  'MYSELF': 'public/apollo/folderList',
+  'MYSELF': 'public/hadesStore/folderList',
  'COMMON': 'public/hadesStore/folderList',
-  'EMPLOYEE': 'public/apollo/employeeFolderList'
+  'EMPLOYEE': 'public/hadesStore/employeeFolderList'
 };
 // 支持本地上传的文件类型
@@ -100,8 +101,9 @@ class SelectPrepareFileModal extends React.Component {
    const _params = {
      ...query,
      ...params,
-      instId: instId,
      disk: params.disk || currentRootDisk.disk,
+      storeId:User.getStoreId(),
+      createId:User.getUserId()
    }
    if (selectType === 'video') {
@@ -393,6 +395,17 @@ class SelectPrepareFileModal extends React.Component {
      type = getFileTypeByName(name)
    }
+    // const params = {
+    //   name,
+    //   resourceId,
+    //   folderSize: size,
+    //   folderFormat: type,
+    //   folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
+    //   disk: currentRootDisk.disk,
+    //   instId: instId,
+    //   createUser: teacherId ? "TEACHER" : "ADMIN",
+    //   parentId: id
+    // }
    const params = {
      name,
      resourceId,
@@ -400,9 +413,10 @@ class SelectPrepareFileModal extends React.Component {
      folderFormat: type,
      folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
      disk: currentRootDisk.disk,
-      instId: instId,
+      createUser:"STORE_USER",
-      createUser: teacherId ? "TEACHER" : "ADMIN",
+      parentId: id,
-      parentId: id
+      storeId:User.getStoreId(),
+      createId:User.getUserId()
    }
    Service.Hades('public/hadesStore/saveFolder', params).then((res) => {

--- 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_yrrfx4j2qlq.eot');
+  src: url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.eot');
-  src: url('//at.alicdn.com/t/font_2223403_yrrfx4j2qlq.eot?#iefix') format('embedded-opentype'),
+  src: url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.eot?#iefix') format('embedded-opentype'),
-  url('//at.alicdn.com/t/font_2223403_yrrfx4j2qlq.woff2') format('woff2'),
+  url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.woff2') format('woff2'),
-  url('//at.alicdn.com/t/font_2223403_yrrfx4j2qlq.woff') format('woff'),
+  url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.woff') format('woff'),
-  url('//at.alicdn.com/t/font_2223403_yrrfx4j2qlq.ttf') format('truetype'),
+  url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.ttf') format('truetype'),
-  url('//at.alicdn.com/t/font_2223403_yrrfx4j2qlq.svg#iconfont') format('svg');
+  url('//at.alicdn.com/t/font_2223403_0r4evvgermkp.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: wufan
+ * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-17 17:15:50
+ * @LastEditTime: 2020-12-17 19:17:39
 * @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_yrrfx4j2qlq.css">
+    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_0r4evvgermkp.css">
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.

--- a/src/modules/course-manage/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/course-manage/modal/SelectPrepareFileModal.jsx
@@ -411,6 +411,17 @@ class SelectPrepareFileModal extends React.Component {
      type = getFileTypeByName(name)
    }
+    // const params = {
+    //   name,
+    //   resourceId,
+    //   folderSize: size,
+    //   folderFormat: type,
+    //   folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
+    //   disk: currentRootDisk.disk,
+    //   instId: instId || LS.get('instId'),
+    //   createUser: teacherId ? "TEACHER" : "ADMIN",
+    //   parentId: id
+    // }
    const params = {
      name,
      resourceId,
@@ -418,11 +429,11 @@ class SelectPrepareFileModal extends React.Component {
      folderFormat: type,
      folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
      disk: currentRootDisk.disk,
-      instId: instId || LS.get('instId'),
+      createUser:"STORE_USER",
-      createUser: teacherId ? "TEACHER" : "ADMIN",
+      parentId: id,
-      parentId: id
+      storeId:User.getStoreId(),
+      createId:User.getUserId()
    }
    Service.Hades('public/hadesStore/saveFolder', params).then((res) => {
      const { query, selectedFileList, currentRootDisk } = this.state;
      const _query = _.clone(query);

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -245,11 +245,11 @@ class FolderList extends React.Component {
        title: '操作',
        key: 'operate',
        render: (value, record) => {
-          if (!(currentRootDisk.disk === 'EMPLOYEE' && (folderPathList.length === 1 || record.folderType === 'FOLDER')) ||
+          if (!(currentRootDisk.disk === 'COMMON' && (folderPathList.length === 1 || record.folderType === 'FOLDER')) ||
            hasManagementAuthority) {
            return (
              <Dropdown overlay={this.renderMenu(record)} trigger={['hover']}>
-                <span className="icon iconfont">&#xe756;</span>
+                <span className="icon iconfont">&#xe62c;</span>
              </Dropdown>
            )
          }
@@ -565,13 +565,11 @@ class FolderList extends React.Component {
    const hasManagementAuthority = currentRootDisk.uploadPower;
    // 公共文件权限和复制权限
    const { folderType, rights } = record;
-    // 判断当前版本
+    console.log("rights",rights);
-    if (rights) {
      const menu = (
        <Menu>
-          {/* ----------------- 5.0公共文件 --------------------*/}
          {
-            rights === "EDIT" && !record.parentId && 
+            rights === "EDIT" && 
            [
              <Menu.Item key="administration">
                <span onClick={() => this.handleShowManagingModal(record)}>权限管理</span>
@@ -609,34 +607,7 @@ class FolderList extends React.Component {
        </Menu>
      );
      return menu;
-    } else {
-      const menu = (
-        <Menu>
-        {/* ----------------- 4.0公共文件或5.0我的文件 --------------------*/}
-          {
-            folderType === 'FILE' && 
-            <Menu.Item key="download">
-              <span onClick={() => { this.handleDownload(record) }}>下载</span>
-            </Menu.Item>
-          }
-          { 
-            hasManagementAuthority && 
-            [
-              <Menu.Item key="move">
-                <span onClick={() => this.handleShowSelectFileModal(record)}>移动到</span>
-              </Menu.Item>,
-              <Menu.Item key="rename">
-                <span onClick={() => this.handleRename(record)}>重命名</span>
-              </Menu.Item>,
-              <Menu.Item key="delete">
-                <span onClick={() => this.handleDeleteFolder(record)}>删除</span>
-              </Menu.Item>
-            ]
-          }
-        </Menu>
-      )
-      return menu;
-    }
  }

--- a/src/modules/resource-disk/components/FolderManage.jsx
+++ b/src/modules/resource-disk/components/FolderManage.jsx
@@ -17,11 +17,12 @@ import { SUFFIX_MAP } from '@/domains/resource-disk/constants';
 import OperateArea from './OperateArea';
 import FolderList from './FolderList';
+import User from '@/common/js/user';
 const FOLDERLIST_URL_MAP = {
-  'MYSELF': 'public/apollo/folderList',
+  'MYSELF': 'public/hadesStore/folderList',
  'COMMON': 'public/hadesStore/folderList',
-  'EMPLOYEE': 'public/apollo/employeeFolderList'
+  'EMPLOYEE': 'public/hadesStore/employeeFolderList'
 };
 export const getFileTypeByName = (name) => {
@@ -75,6 +76,9 @@ class FolderManage extends React.Component {
  componentDidMount() {
    // 校验余额（欠费的情况下限制上传文件）
    this.handleCheckBalance();
+    //TODO
+    this.handleFetchFolderList();
  }
  // 请求当前目录下的文件列表
@@ -85,13 +89,14 @@ class FolderManage extends React.Component {
      const { parentRights } = params;
      const { showResultPage, searchName } = this.state;
      const { currentRootDisk: { disk } } = this.props;
-      const { instId } = window.currentUserInstInfo;
+      console.log('1111');
      const _params = {
        ...this.state.query,
        ...params,
        disk,
-        instId,
        searchName: showResultPage ? searchName : null,
+        storeId:User.getStoreId(),
+        createId:User.getUserId()
      }
      if (parentRights) {
        this.setState({ _parentRights: parentRights });
@@ -168,7 +173,7 @@ class FolderManage extends React.Component {
    const { currentRootDisk } = this.props;
    const { folderPathList } = this.state;
-    const { teacherId, instId } = window.currentUserInstInfo;
+    // const { teacherId, instId } = window.currentUserInstInfo;
    const currentFolder = folderPathList[folderPathList.length - 1];
    const { id = null } = uploadFolderPath || currentFolder;
    let { size, type, name } = file;
@@ -179,16 +184,16 @@ class FolderManage extends React.Component {
    const params = {
      name,
-      instId,
      resourceId,
      folderSize: size,
      folderFormat: type,
      folderTypeEnum: resourceId ? 'FILE' : 'FOLDER',
      disk: currentRootDisk.disk,
-      createUser: teacherId ? "TEACHER" : "ADMIN",
+      createUser:"STORE_USER",
-      parentId: id
+      parentId: id,
+      storeId:User.getStoreId(),
+      createId:User.getUserId()
    }
    Service.Hades('public/hadesStore/saveFolder', params).then((res) => {
      const query = _.clone(this.state.query);
      query.current = 1;
@@ -318,7 +323,7 @@ class FolderManage extends React.Component {
    } = this.state;
    const { currentRootDisk } = this.props;
+    console.log("folderList",folderList);
    return (
      <Spin spinning={loading} style={{width: '100%'}}>
        <div className="folder-manage">

--- a/src/modules/resource-disk/components/OperateArea.jsx
+++ b/src/modules/resource-disk/components/OperateArea.jsx
@@ -21,7 +21,7 @@ import SelectPrepareFileModal from '@/bu-components/SelectPrepareFileModal';
 import CopyFileModal from '@/bu-components/CopyFileModal';
 import NonCompliantFileModal from '@/bu-components/NonCompliantFileModal';
 import CreateFolderModal from '../modal/CreateFolderModal';
+import User from '@/common/js/user';
 const { Search } = Input;
 const DEL_FOLDER_URL_MAP = {
@@ -98,14 +98,14 @@ class OperateArea extends React.Component {
    const currentFolder = folderPathList[folderPathList.length - 1];
    const { instId } = window.currentUserInstInfo;
    const params = {
-      instId,
+      createId:User.getUserId(),
      name: folderName,
      disk: currentRootDisk.disk,
      parentId: currentFolder.id,
      folderType: 'FOLDER',
    }
-    const res = await Service.Hades('public/apollo/sameNameFile', params);
+    const res = await Service.Hades('public/hadesStore/sameNameFile', params);
    const { result } = res;
    return (!!result) || (result && Object.keys(result).length);
  }
@@ -158,17 +158,17 @@ class OperateArea extends React.Component {
  handleChooseFile = async () => {
    // 判断是否欠费，旗舰版用户不需要校验余额
-    const { balance } = this.props;
+    // const { balance } = this.props;
-    const { instId } = window.currentUserInstInfo;
+    // const { instId } = window.currentUserInstInfo;
-    const ultimateRes = await Service.Business('public/inst/checkInstProduct', {
+    // const ultimateRes = await Service.Business('public/inst/checkInstProduct', {
-      instId,
+    //   instId,
-      productCodeList: ['ULTIMATESELL', 'PIP_TO_ULTIMATE', 'HIGH_TO_ULTIMATE']
+    //   productCodeList: ['ULTIMATESELL', 'PIP_TO_ULTIMATE', 'HIGH_TO_ULTIMATE']
-    });
+    // });
-    if (balance <= 0 && !ultimateRes.result) {
+    // if (balance <= 0 && !ultimateRes.result) {
-      this.handleShowNoticeModal();
+    //   this.handleShowNoticeModal();
-      return;
+    //   return;
-    }
+    // }
    const dom = document.querySelector('#detailFileInput');
    dom.click();

--- a/src/modules/resource-disk/index.jsx
+++ b/src/modules/resource-disk/index.jsx
@@ -8,7 +8,7 @@ import './index.less';
 const defaultRootDisk = {
  folderName: '公共文件',
-  disk: '',
+  disk: 'COMMON',
  uploadPower: true
 }
@@ -56,7 +56,7 @@ class PrepareLessonPage extends React.Component {
  render() {
    const { currentRootDisk, diskList } = this.state;
+    console.log('currentRootDisk',currentRootDisk);
    return (
      <div className="prepare-lesson-page page">
        <div className="content-header">资料云盘</div>

--- a/src/modules/resource-disk/modal/CreateFolderModal.jsx
+++ b/src/modules/resource-disk/modal/CreateFolderModal.jsx
@@ -40,7 +40,7 @@ class CreateFolderModal extends React.Component {
  }
  handleOk = () => {
-    this.props.form.validateFields((err) => {
+    // this.props.form.validateFields((err) => {
      const { folderName, validate } = this.state;
      if (!folderName) {
        this.setState({
@@ -58,7 +58,7 @@ class CreateFolderModal extends React.Component {
          message.success('创建文件夹成功');
        }
      });
-    });
+    // });
  }
  handleCancel = () => {