feat:外部课程相关 merge master

src/modules/knowledge-base/index.jsx

@@ -2,24 +2,19 @@
  * @Description:
  * @Description:
  * @Author: zangsuyun
  * @Author: zangsuyun
  * @Date: 2021-03-12 10:43:10
  * @Date: 2021-03-12 10:43:10
-<<<<<<< HEAD
  * @LastEditors: fusanqiasng
  * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-28 13:33:07
-=======
- * @LastEditors: fusanqiasng
- * @LastEditTime: 2021-05-27 13:51:42
->>>>>>> 4399d60 (fix:修复外部课程相关模块bug)
+ * @LastEditTime: 2021-05-30 19:46:49
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
-import React from 'react'
+import React from "react"
 
 
-import KnowledgeBaseFilter from './components/KnowledgeBaseFilter'
-import KnowledgeBaseOpt from './components/KnowledgeBaseOpt'
-import KnowledgeBaseList from './components/KnowledgeBaseList'
-import Classification from './components/Classification'
+import KnowledgeBaseFilter from "./components/KnowledgeBaseFilter"
+import KnowledgeBaseOpt from "./components/KnowledgeBaseOpt"
+import KnowledgeBaseList from "./components/KnowledgeBaseList"
+import Classification from "./components/Classification"
 
 
-import KnowledgeAPI from '@/data-source/knowledge/request-api'
-import User from '@/common/js/user'
+import KnowledgeAPI from "@/data-source/knowledge/request-api"
+import User from "@/common/js/user"
 
 
 export default class KnowledgeBase extends React.Component {
 export default class KnowledgeBase extends React.Component {
   constructor(props) {
   constructor(props) {
@@ -29,12 +24,12 @@ export default class KnowledgeBase extends React.Component {
         size: 10,
         size: 10,
         current: 1,
         current: 1,
         storeId: User.getStoreId(),
         storeId: User.getStoreId(),
-        categoryId: 0,
+        categoryId: 0
       },
       },
       dataSource: [], // 知识库列表
       dataSource: [], // 知识库列表
       totalCount: 0, // 知识库数据总条数
       totalCount: 0, // 知识库数据总条数
-      categoryId: '0',
-      updateCategoryFlag: false,
+      categoryId: "0",
+      updateCategoryFlag: false
     }
     }
   }
   }
 
 
@@ -45,7 +40,7 @@ export default class KnowledgeBase extends React.Component {
   }
   }
   getSelectedCategoryId = (categoryId) => {
   getSelectedCategoryId = (categoryId) => {
     this.setState({
     this.setState({
-      categoryId,
+      categoryId
     })
     })
     this.handleFetchScheduleList({ categoryId, current: 1 })
     this.handleFetchScheduleList({ categoryId, current: 1 })
   }
   }
@@ -53,14 +48,14 @@ export default class KnowledgeBase extends React.Component {
   // 更新分类树
   // 更新分类树
   updateCategoryTree = () => {
   updateCategoryTree = () => {
     this.setState({
     this.setState({
-      updateCategoryFlag: !this.state.updateCategoryFlag,
+      updateCategoryFlag: !this.state.updateCategoryFlag
     })
     })
   }
   }
   // 获取知识库列表
   // 获取知识库列表
   handleFetchScheduleList = (_query = {}, flag = true) => {
   handleFetchScheduleList = (_query = {}, flag = true) => {
     const query = {
     const query = {
       ...this.state.query,
       ...this.state.query,
-      ..._query,
+      ..._query
     }
     }
 
 
     // 更新请求参数
     // 更新请求参数
@@ -73,7 +68,7 @@ export default class KnowledgeBase extends React.Component {
         const { records = [], total = 0 } = result
         const { records = [], total = 0 } = result
         this.setState({
         this.setState({
           dataSource: records,
           dataSource: records,
-          totalCount: Number(total),
+          totalCount: Number(total)
         })
         })
       })
       })
   }
   }
@@ -84,17 +79,17 @@ export default class KnowledgeBase extends React.Component {
       <div className='page'>
       <div className='page'>
         <div className='content-header'>知识库</div>
         <div className='content-header'>知识库</div>
 
 
-        <div className='box' style={{ display: 'flex' }}>
+        <div className='box' style={{ display: "flex" }}>
           {/* 搜索模块 */}
           {/* 搜索模块 */}
           <div className='left' style={{ width: 245 }}>
           <div className='left' style={{ width: 245 }}>
             <Classification updateCategoryFlag={updateCategoryFlag} categoryId={categoryId} getSelectedCategoryId={this.getSelectedCategoryId} />
             <Classification updateCategoryFlag={updateCategoryFlag} categoryId={categoryId} getSelectedCategoryId={this.getSelectedCategoryId} />
           </div>
           </div>
-          <div className='liner' style={{ backgroundColor: 'rgb(238, 238, 238)', width: 0.5, margin: '1px 16px 1px 2px' }}></div>
-          <div className='right' style={{ width: 'calc(100% - 285px)' }}>
+          <div className='liner' style={{ backgroundColor: "rgb(238, 238, 238)", width: 0.5, margin: "1px 16px 1px 2px" }}></div>
+          <div className='right' style={{ width: "calc(100% - 285px)" }}>
             <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
             <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
 
 
             {/* 操作模块 */}
             {/* 操作模块 */}
-            {categoryId !== '0' && (
+            {categoryId !== "0" && (
               <KnowledgeBaseOpt onChange={this.handleFetchScheduleList} updateCategoryTree={this.updateCategoryTree} categoryId={categoryId} />
               <KnowledgeBaseOpt onChange={this.handleFetchScheduleList} updateCategoryTree={this.updateCategoryTree} categoryId={categoryId} />
             )}
             )}