feat:modal加点击蒙层不关闭属性

c034db0a · wufan · ce2f8a60 · c034db0a · c034db0a · c034db0a
Commit c034db0a authored Dec 22, 2020 by wufan
39 changed files
--- a/src/bu-components/ChooseMembersModal.jsx
+++ b/src/bu-components/ChooseMembersModal.jsx
@@ -289,6 +289,7 @@ class ChooseMembersModal extends React.Component {
          onOk={this.addMember}
          title={title}
          width={560}
+          maskClosable={false}
        >
          <div className='choose-container'>
            {/* 拥有文件夹权限的成员列表 */}

--- a/src/bu-components/CopyFileModal.jsx
+++ b/src/bu-components/CopyFileModal.jsx
@@ -242,6 +242,7 @@ class CopyFileModal extends React.Component {
        title={title}
        width={560}
        onCancel={this.handleClose}
+        maskClosable={false}
        footer={[
          <Button key="back" onClick={this.handleClose}>
            取消

--- a/src/bu-components/ManagingMembersModal.jsx
+++ b/src/bu-components/ManagingMembersModal.jsx
@@ -292,6 +292,7 @@ class ManagingMembersModal extends React.Component {
            onCancel={this.handleClose}
            title={title} 
            width={560}
+            maskClosable={false}
          >
            <div className='managing-header'>
              <div className='managing-left'>

--- a/src/bu-components/NonCompliantFileModal.jsx
+++ b/src/bu-components/NonCompliantFileModal.jsx
@@ -30,6 +30,7 @@ class NonCompliantFileModal extends React.Component {
        cancelText="放弃上传"
        onCancel={this.props.onClose}
        onOk={this.props.onOk}
+        maskClosable={false}
        className="prepare-lesson__non-compliant-file-modal"
      >
        <div className="file-list">

--- a/src/bu-components/PreviewCourseModal.jsx
+++ b/src/bu-components/PreviewCourseModal.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-07-23 14:54:16
- * @LastEditors: 吴文洁
+ * @LastEditors: wufan
- * @LastEditTime: 2020-08-24 13:05:09
+ * @LastEditTime: 2020-12-22 20:29:39
 * @Description: 大班直播课预览弹窗
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */ 
@@ -80,6 +80,7 @@ class PreviewCourseModal extends React.Component {
        width={680}
        onCancel={this.props.close}
        footer={null}
+        maskClosable={false}
        className="preview-live-course-modal"
      >
        <div className="container__wrap">

--- a/src/bu-components/ShareLiveModal.jsx
+++ b/src/bu-components/ShareLiveModal.jsx
@@ -106,6 +106,7 @@ class ShareLiveModal extends React.Component {
        width={680}
        visible={true}
        footer={null}
+        maskClosable={false}
        className="share-live-modal"
        onCancel={this.props.close}
      >

--- a/src/components/CropperModal.tsx
+++ b/src/components/CropperModal.tsx
@@ -100,6 +100,7 @@ const CropperModal = (props: CropperModalProps) => {
      width={600}
      title={title || '设置头像'}
      visible={true}
+      maskClosable={false}
      footer={[
        <Button
          id='cancel_avatar_btn'
@@ -110,7 +111,6 @@ const CropperModal = (props: CropperModalProps) => {
          确定
          </Button>,
      ]}
-      maskClosable={false}
      onCancel={close}>
      <Row>
        <Col span={14}>

--- a/src/components/DownloadLiveModal.jsx
+++ b/src/components/DownloadLiveModal.jsx
@@ -42,6 +42,7 @@ class DownloadLiveModal extends React.Component {
    const { image, tip, text, type } = this.state;
    return <Modal
      visible={true}
+      maskClosable={false}
      title="下载客户端"
      className="download-live-modal"
      footer={null}

--- a/src/components/ImgCutModal.jsx
+++ b/src/components/ImgCutModal.jsx
@@ -116,6 +116,7 @@ class ImgCutModal extends React.Component {
        width={width}
        visible={visible}
        onCancel={onClose}
+        maskClosable={false}
        footer={[
          <Choose>
            <When condition={!needReUpload}>

--- a/src/components/ImgCutModalNew.jsx
+++ b/src/components/ImgCutModalNew.jsx
@@ -144,6 +144,7 @@ class ImgCutModalNew extends React.Component {
        width={width}
        visible={visible}
        onCancel={onClose}
+        maskClosable={false}
        footer={[
          !needReUpload ?
            <Button

--- a/src/modules/course-manage/components/AddLiveBasic.jsx
+++ b/src/modules/course-manage/components/AddLiveBasic.jsx
@@ -288,6 +288,7 @@ class AddLiveBasic extends React.Component {
          title="设置图片"
          width={1080}
          visible={visible}
+          maskClosable={false}
          onCancel={() => {
            this.setState({ visible: false });
          }}

--- a/src/modules/course-manage/modal/AbnormalModal.jsx
+++ b/src/modules/course-manage/modal/AbnormalModal.jsx
@@ -54,6 +54,7 @@ class AbnormalModal extends React.Component {
          visible={true}
          footer={null}
          onCancel={onClose}
+          maskClosable={false}
          className="abnormal-modal"
        >
          { content }

--- a/src/modules/course-manage/modal/AccountChargeModal.jsx
+++ b/src/modules/course-manage/modal/AccountChargeModal.jsx
@@ -2,8 +2,8 @@
 * @Description: 云课堂充值
 * @Author: zhangyi
 * @Date: 2020-05-09 15:02:39
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-09 16:55:25
+ * @LastEditTime: 2020-12-22 20:30:26
 */
 import React from 'react';
 import { Modal, message, Form, InputNumber, Row, Col, Button } from "antd";
@@ -286,6 +286,7 @@ class AccountChargeModal extends React.Component {
        visible={true}
        width={550}
        footer={null}
+        maskClosable={false}
        className="account-charge-modal"
        onCancel={() => {
          this.handleCancel();

--- a/src/modules/course-manage/modal/AccountChargeRecords.jsx
+++ b/src/modules/course-manage/modal/AccountChargeRecords.jsx
@@ -78,6 +78,7 @@ class AccountChargeRecords extends React.Component{
        visible={true}
        width={680}
        footer={null}
+        maskClosable={false}
        onCancel={() => {
          this.props.close();
        }}

--- a/src/modules/course-manage/modal/ChargeArgeement.jsx
+++ b/src/modules/course-manage/modal/ChargeArgeement.jsx
@@ -46,6 +46,7 @@ class ChargeArgeement extends React.Component {
        width={800}
        className="charge-agreement-modal"
        footer={null}
+        maskClosable={false}
        onCancel={() => {
          this.props.close();
        }}

--- a/src/modules/course-manage/modal/ChargeExplainModal.jsx
+++ b/src/modules/course-manage/modal/ChargeExplainModal.jsx
@@ -2,8 +2,8 @@
 * @Description: 计费说明
 * @Author: zhangyi
 * @Date: 2020-05-09 15:21:22
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-11 14:01:32
+ * @LastEditTime: 2020-12-22 20:30:54
 */
 import React from 'react'
 import { Modal, Button, Table } from "antd";
@@ -30,6 +30,7 @@ function ChargeExplainModal(props) {
      visible={true}
      className="charge-explain-modal"
      width={880}
+      maskClosable={false}
      onCancel={() => {
        props.close();
      }}

--- a/src/modules/course-manage/modal/ChargingDetailModal.jsx
+++ b/src/modules/course-manage/modal/ChargingDetailModal.jsx
@@ -106,6 +106,7 @@ class ChargingDetailModal extends React.Component {
        title="计费人数详情"
        visible={true}
        width={680}
+        maskClosable={false}
        className="charging-detail-modal"
        footer={null}
        onCancel={() => {

--- a/src/modules/course-manage/modal/CheckBalanceModal.jsx
+++ b/src/modules/course-manage/modal/CheckBalanceModal.jsx
@@ -2,8 +2,8 @@
 * @Description: 直播开始上课之前对余额的校验
 * @Author: zhangyi
 * @Date: 2020-05-18 13:47:42
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-09 16:36:33
+ * @LastEditTime: 2020-12-22 20:31:04
 */
 import React from 'react';
 import { Modal, Button } from "antd";
@@ -46,6 +46,7 @@ class CheckBalanceModal extends React.Component {
        footer={null}
        width={550}
        title="余额不足"
+        maskClosable={false}
        onCancel={() => {
          this.props.close();
        }}

--- a/src/modules/course-manage/modal/ClassRecordModal.jsx
+++ b/src/modules/course-manage/modal/ClassRecordModal.jsx
@@ -234,6 +234,7 @@ class ClassRecordModal extends React.Component {
        visible={true}
        footer={null}
        width={680}
+        maskClosable={false}
        className="class-record-modal"
        onCancel={() => {
          this.props.close();

--- a/src/modules/course-manage/modal/LackConsumeStudentModal.jsx
+++ b/src/modules/course-manage/modal/LackConsumeStudentModal.jsx
@@ -23,6 +23,7 @@ class LackConsumeStudentModal extends React.Component {
        visible={true}
        okText="继续保存"
        onOk={onOk}
+        maskClosable={false}
        onCancel={onClose}
        className="lack-consume-student-modal"
      >

--- a/src/modules/course-manage/modal/LiveStudentListModal.jsx
+++ b/src/modules/course-manage/modal/LiveStudentListModal.jsx
@@ -288,6 +288,7 @@ class LiveStudentListModal extends React.Component {
        visible={true}
        width={680}
        footer={null}
+        maskClosable={false}
        className="live-student-list-modal"
        onCancel={this.props.close}
      >

--- a/src/modules/course-manage/modal/ManageCoursewareModal.jsx
+++ b/src/modules/course-manage/modal/ManageCoursewareModal.jsx
@@ -342,12 +342,12 @@ class ManageCoursewareModal extends React.Component {
        visible={true}
        title="课件管理"
        footer={null}
+        maskClosable={false}
        className="manage-courseware-modal"
        width={_.isEmpty(_list) ? 680 : 800}
        onCancel={() => {
          this.props.onCancel()
        }}
-        maskClosable={false}
      >
        {_.isEmpty(_list) ? 
          <div className="empty-body">

--- a/src/modules/course-manage/modal/PlayBackRecordModal.jsx
+++ b/src/modules/course-manage/modal/PlayBackRecordModal.jsx
@@ -178,6 +178,7 @@ class PlayBackRecordModal extends React.Component {
        className="play-back-modal"
        width={680}
        visible={true}
+        maskClosable={false}
        footer={null}
        onCancel={() => {
          this.props.close();

--- a/src/modules/course-manage/modal/PreviewCourseModal.jsx
+++ b/src/modules/course-manage/modal/PreviewCourseModal.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-07-23 14:54:16
- * @LastEditors: zhangleyuan
+ * @LastEditors: wufan
- * @LastEditTime: 2020-12-11 14:04:08
+ * @LastEditTime: 2020-12-22 20:31:31
 * @Description: 大班直播课预览弹窗
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */ 
@@ -79,6 +79,7 @@ class PreviewCourseModal extends React.Component {
        width={680}
        onCancel={this.props.close}
        footer={null}
+        maskClosable={false}
        className="preview-live-course-modal"
      >
        <div className="container__wrap">

--- a/src/modules/course-manage/modal/ShareLiveModal.jsx
+++ b/src/modules/course-manage/modal/ShareLiveModal.jsx
@@ -101,6 +101,7 @@ class ShareLiveModal extends React.Component {
        width={680}
        visible={true}
        footer={null}
+        maskClosable={false}
        className="share-live-modal"
        onCancel={this.props.close}
      >

--- a/src/modules/course-manage/modal/StartLiveModal.jsx
+++ b/src/modules/course-manage/modal/StartLiveModal.jsx
@@ -75,6 +75,7 @@ class StartLiveModal extends React.Component {
        visible={true}
        width={550}
        footer={null}
+        maskClosable={false}
        onCancel={this.props.close}
      >
        <div className="live-start-modal">

--- a/src/modules/course-manage/modal/TeacherLiveModal.jsx
+++ b/src/modules/course-manage/modal/TeacherLiveModal.jsx
@@ -45,6 +45,7 @@ class TeacherLiveModal extends React.Component {
        width={740}
        onCancel={this.props.close}
        footer={null}
+        maskClosable={false}
      >
        <TeacherTip isXiaomai={isXiaomai} />
      </Modal>

--- a/src/modules/course-manage/modal/select-student/index.jsx
+++ b/src/modules/course-manage/modal/select-student/index.jsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-08-07 16:23:27
- * @LastEditors: 吴文洁
+ * @LastEditors: wufan
- * @LastEditTime: 2020-09-27 19:33:20
+ * @LastEditTime: 2020-12-22 20:31:52
 * @Description: 选择学员组件
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -376,6 +376,7 @@ class SelectStudent extends React.Component {
        visible={true}
        width={720}
        onCancel={this.props.close}
+        maskClosable={false}
        className="livecourse__select-student-modal"
        onOk={this.handleSelectDone}
      >

--- a/src/modules/personalInfo/ChangePhoneModal.tsx
+++ b/src/modules/personalInfo/ChangePhoneModal.tsx
@@ -113,9 +113,9 @@ function ChangePhoneModal(props: changePhoneModalProps) {
            visible={true}
            title="更换手机号"
            width={448}
+            maskClosable={false}
            onCancel={onClose}
            className="change-phone-modal"
-            maskClosable={false}
            footer={[
                <Button
                    id='cancel_allot_btn'

--- a/src/modules/personalInfo/IdentificationModal.tsx
+++ b/src/modules/personalInfo/IdentificationModal.tsx
@@ -88,6 +88,7 @@ function IdentificationModal(props: IdentificationModalProps) {
            title="身份验证"
            width={448}
            onCancel={onClose}
+            maskClosable={false}
            className="identification-modal"
            footer={[
                <Button
@@ -103,7 +104,6 @@ function IdentificationModal(props: IdentificationModalProps) {
                  确认
                </Button>
              ]}
-              maskClosable={false}
        >
        <div className="desc">为了你的账户安全，请验证身份。验证成功后进行下一步操作</div>

--- a/src/modules/prepare-lesson/modal/CreateFolderModal.jsx
+++ b/src/modules/prepare-lesson/modal/CreateFolderModal.jsx
@@ -78,6 +78,7 @@ class CreateFolderModal extends React.Component {
        visible={isOpen}
        onCancel={this.handleCancel}
        onOk={this.handleOk}
+        maskClosable={false}
        width={448}
        className="create-folder-modal"
      >

--- a/src/modules/prepare-lesson/modal/NonCompliantFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/NonCompliantFileModal.jsx
@@ -28,6 +28,7 @@ class NonCompliantFileModal extends React.Component {
        visible={isOpen}
        okText="继续上传"
        cancelText="放弃上传"
+        maskClosable={false}
        onCancel={this.props.onClose}
        onOk={this.props.onOk}
        className="prepare-lesson__non-compliant-file-modal"

--- a/src/modules/prepare-lesson/modal/ScanFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/ScanFileModal.jsx
@@ -25,6 +25,7 @@ class ScanFileModal extends React.Component {
        footer={null}
        width={680}
        className="scan-file-modal"
+        maskClosable={false}
      >
        <div className="scan-file-modal" style={{ width: 632 }}>
          {(fileType === "JPG" || fileType === 'PNG') && (

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
+++ b/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
@@ -567,6 +567,7 @@ class SelectPrepareFileModal extends React.Component {
        title={title}
        footer={footer}
        width={560}
+        maskClosable={false}
        onCancel={this.handleClose}
        className="select-prepare-file-modal"
      >

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -146,6 +146,10 @@ class FolderList extends React.Component {
      id: folder.id,
      folderName: folder.folderName
    });
+    console.log("folder.rights---",folder.rights);
+    this.setState({
+      parentRights: folder.rights,
+    })
    this.props.onChangeFolderPath(folderPathList);
    this.props.onRefresh({
      parentId: folder.id,

--- a/src/modules/resource-disk/modal/CreateFolderModal.jsx
+++ b/src/modules/resource-disk/modal/CreateFolderModal.jsx
@@ -85,6 +85,7 @@ class CreateFolderModal extends React.Component {
        onCancel={this.handleCancel}
        onOk={this.handleOk}
        width={448}
+        maskClosable={false}
        className="create-folder-modal"
      >
        <Form>

--- a/src/modules/resource-disk/modal/ScanFileModal.jsx
+++ b/src/modules/resource-disk/modal/ScanFileModal.jsx
@@ -23,6 +23,7 @@ class ScanFileModal extends React.Component {
        title="查看文件"
        footer={null}
        width={680}
+        maskClosable={false}
        className="scan-file-modal"
      >
        <div className="scan-file-modal" style={{ width: 632 }}>

--- a/src/modules/store-manage/StoreH5DecorationTab.jsx
+++ b/src/modules/store-manage/StoreH5DecorationTab.jsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
 * @LastEditors: wufan
- * @LastEditTime: 2020-12-22 13:48:59
+ * @LastEditTime: 2020-12-22 20:32:53
 * @Description: web店铺banner页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -385,6 +385,7 @@ class StoreWebDecoration extends React.Component {
          onCancel={() => {
            this.setState({ visible: false });
          }}
+          maskClosable={false}
          footer={[
            <Button
              key="back"

--- a/src/modules/store-manage/StoreWebDecorationTab.jsx
+++ b/src/modules/store-manage/StoreWebDecorationTab.jsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
 * @LastEditors: wufan
- * @LastEditTime: 2020-12-22 13:49:20
+ * @LastEditTime: 2020-12-22 20:29:02
 * @Description: web店铺banner页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -242,6 +242,7 @@ class StoreWebDecoration extends React.Component {
            },
            fail: (failInfo) => {
              console.log("failInfo-----", failInfo);
+              message.error("图片上传失败了，请重新上传");
            },
            loadComplete: (img) => {
              this.refs.headPicModal.click();
@@ -287,6 +288,7 @@ class StoreWebDecoration extends React.Component {
    StoreService.editStoreBanner(params).then((res) => {
      message.success("设置成功");
      this.getStoreDecorationList();
+      this.state.photoclip.clear();
    });
  };
@@ -301,6 +303,7 @@ class StoreWebDecoration extends React.Component {
      this.getStoreDecorationList();
    });
  };
  addStoreBanner = () => {
    const { previewUrl, addBannerPath } = this.state;
    const params = {
@@ -311,6 +314,7 @@ class StoreWebDecoration extends React.Component {
    StoreService.addStoreBanner(params).then((res) => {
      message.success("设置成功");
      this.getStoreDecorationList();
+      this.state.photoclip.clear();
    });
  };
@@ -394,6 +398,7 @@ class StoreWebDecoration extends React.Component {
          onCancel={() => {
            this.setState({ visible: false });
          }}
+          maskClosable={false}
          footer={[
            <Button
              key="back"