merge: 修改冲突

src/modules/teach-tool/question-manage/components/QuestionList.jsx

@@ -6,25 +6,10 @@
  * @Description: 助学工具-题库-题目列表数据
  * @Description: 助学工具-题库-题目列表数据
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
-import React, { Component } from "react";
-import {
-  Table,
-  ConfigProvider,
-  Empty,
-  Row,
-  Input,
-  Select,
-  Tooltip,
-  Space,
-  Button,
-  Modal,
-  message,
-  Menu,
-  Dropdown,
-  DatePicker,
-} from "antd";
-import _ from "underscore";
-import { Route, withRouter } from "react-router-dom";
+import React, { Component } from 'react';
+import { Table, ConfigProvider, Empty, Row, Input, Select, Tooltip, Space, Button, Modal, message, Menu, Dropdown, DatePicker } from 'antd';
+import _ from 'underscore';
+import { Route, withRouter } from 'react-router-dom';
 import { DownOutlined } from '@ant-design/icons';
 import { DownOutlined } from '@ant-design/icons';
 import { PageControl, XMTable } from '@/components';
 import { PageControl, XMTable } from '@/components';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
@@ -36,7 +21,7 @@ import Bus from '@/core/bus';
 import moment from 'moment';
 import moment from 'moment';
 import Service from '@/common/js/service';
 import Service from '@/common/js/service';
 import MoveModal from '../../modal/MoveModal';
 import MoveModal from '../../modal/MoveModal';
-import "./QuestionList.less";
+import './QuestionList.less';
 
 
 const { RangePicker } = DatePicker;
 const { RangePicker } = DatePicker;
 const { Search } = Input;
 const { Search } = Input;
@@ -686,9 +671,10 @@ class QuestionList extends Component {
             onChange={this.handleChangeTable}
             onChange={this.handleChangeTable}
             rowSelection={rowSelection}
             rowSelection={rowSelection}
             renderEmpty={{
             renderEmpty={{
-              description: <span style={{ display: 'block', paddingBottom: 24 }}><span>还没有题目</span>
-                {["CloudManager", "StoreManager"].includes(User.getUserRole()) &&
-                  categoryId && (
+              description: (
+                <span style={{ display: 'block', paddingBottom: 24 }}>
+                  <span>还没有题目</span>
+                  {['CloudManager', 'StoreManager'].includes(User.getUserRole()) && categoryId && (
                     <span>
                     <span>
                       ，快去
                       ，快去
                       <span
                       <span