feat:处理助教显示一串id的问题

package.json

@@ -62,7 +62,7 @@
     "less-loader": "^6.2.0",
     "less-loader": "^6.2.0",
     "microevent": "^1.0.0",
     "microevent": "^1.0.0",
     "mini-css-extract-plugin": "0.9.0",
     "mini-css-extract-plugin": "0.9.0",
-    "moment": "^2.27.0",
+    "moment": "^2.20.1",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "optimize-css-assets-webpack-plugin": "5.0.3",
     "photoclip": "^3.4.8",
     "photoclip": "^3.4.8",
     "pnp-webpack-plugin": "1.6.4",
     "pnp-webpack-plugin": "1.6.4",

src/components/MultipleDatePicker.jsx

@@ -9,7 +9,6 @@ import React from 'react'
 import { message } from "antd";
 import { message } from "antd";
 import moment from 'moment';
 import moment from 'moment';
 require("./MultipleDatePicker.less");
 require("./MultipleDatePicker.less");
-
 class MultipleDatePicker extends React.Component {
 class MultipleDatePicker extends React.Component {
   constructor(props) {
   constructor(props) {
     super(props);
     super(props);

src/modules/course-manage/AddLive.jsx

@@ -226,14 +226,18 @@ handleChangeBasicInfo = (field, value) => {
 }
 }
 
 
   // 修改上课信息
   // 修改上课信息
-  handleChangeClassInfo = (field, value ,type, name) => {
+  handleChangeClassInfo = (field, value ,type, optionValue) => {
     const _value = value ? value.valueOf() : null;
     const _value = value ? value.valueOf() : null;
     const { teacherName } = this.state.addLiveClassInfo;
     const { teacherName } = this.state.addLiveClassInfo;
+    const { assistantNames } = this.state.addLiveClassInfo;
+    const { assistantStoreUserId } = this.state.addLiveClassInfo
     this.setState({
     this.setState({
       addLiveClassInfo: {
       addLiveClassInfo: {
         ...this.state.addLiveClassInfo,
         ...this.state.addLiveClassInfo,
         [field]: _value, 
         [field]: _value, 
-        teacherName:_teacherName?_teacherName:teacherName
+        teacherName:type==='teacherType'?optionValue:teacherName,
+        assistantNames:type==='assistantType'?_.pluck(optionValue, "children"):assistantNames,
+        assistantStoreUserId:type==='assistantType'?_.pluck(optionValue, "key"):assistantStoreUserId,
       }
       }
     });
     });
 
 

src/modules/course-manage/components/AddLiveClass.jsx

@@ -51,7 +51,7 @@ class AddLiveClass extends React.Component {
   componentWillReceiveProps(nextProps) {
   componentWillReceiveProps(nextProps) {
     if(nextProps.data.assistantStoreUserId.length > 0) {
     if(nextProps.data.assistantStoreUserId.length > 0) {
       // 获取助教老师列表
       // 获取助教老师列表
-      // this.getAssistantList(1, nextProps.data.assistant);
+      this.getAssistantList(1, nextProps.data.assistantStoreUserId);
     }
     }
   }
   }
   getTeacherList(current = 1, selectList){
   getTeacherList(current = 1, selectList){
@@ -59,7 +59,7 @@ class AddLiveClass extends React.Component {
     const _query = {
     const _query = {
       ...teacherQuery,
       ...teacherQuery,
       current,
       current,
-      size:10
+      size:15
     };
     };
     StoreService.getStoreUserBasicPage( _query).then((res) => {
     StoreService.getStoreUserBasicPage( _query).then((res) => {
         const { result = {} } = res;
         const { result = {} } = res;
@@ -74,12 +74,13 @@ class AddLiveClass extends React.Component {
   // 获取助教老师列表
   // 获取助教老师列表
   getAssistantList = (current = 1, selectList) => {
   getAssistantList = (current = 1, selectList) => {
     const { assistantQuery,assistantList} = this.state;
     const { assistantQuery,assistantList} = this.state;
-    const { teacherId, assistant } = this.props.data;
-    const idList = selectList;
+    const { assistantStoreUserId } = this.props.data;
+    const idList = selectList ? selectList : assistantStoreUserId;
     const _query = {
     const _query = {
       ...assistantQuery,
       ...assistantQuery,
       current,
       current,
-      size:10
+      idList,
+      size: idList.length <= 10 ? 10 : idList.length + 10
     };
     };
     StoreService.getStoreUserBasicPage( _query).then((res) => {
     StoreService.getStoreUserBasicPage( _query).then((res) => {
         const { result = {} } = res;
         const { result = {} } = res;
@@ -251,13 +252,13 @@ class AddLiveClass extends React.Component {
             
             
           </div>
           </div>
           }
           }
-          <div className="teacher">
+          <div className="teacher" id="teacher">
             <span className="label"><span className="require">* </span>讲师：</span>
             <span className="label"><span className="require">* </span>讲师：</span>
             <Select
             <Select
               placeholder="请选择讲师"
               placeholder="请选择讲师"
               // key={teacherName}
               // key={teacherName}
               // defaultValue={teacherName}
               // defaultValue={teacherName}
-              value={teacherId}
+              value={teacherName}
               style={{ width: 240, marginTop: 6 }}
               style={{ width: 240, marginTop: 6 }}
               disabled={!isEdit ? true: false}
               disabled={!isEdit ? true: false}
               showSearch
               showSearch
@@ -267,6 +268,7 @@ class AddLiveClass extends React.Component {
                 console.log("value",value);
                 console.log("value",value);
                 this.props.onChange('teacherId',value,'teacherType',option.children) 
                 this.props.onChange('teacherId',value,'teacherType',option.children) 
               }}
               }}
+
               onSearch={(value) => {
               onSearch={(value) => {
                 teacherQuery.nickName = value
                 teacherQuery.nickName = value
                 this.setState({
                 this.setState({
@@ -275,6 +277,9 @@ class AddLiveClass extends React.Component {
                   this.getTeacherList()
                   this.getTeacherList()
                 })
                 })
               }}
               }}
+              getPopupContainer={() =>
+                document.getElementById("teacher")
+              }
             >
             >
               {_.map(teacherList, (item, index) => {
               {_.map(teacherList, (item, index) => {
                 if( !assistant.includes(item.userId) ){
                 if( !assistant.includes(item.userId) ){
@@ -286,14 +291,14 @@ class AddLiveClass extends React.Component {
             </Select>
             </Select>
 
 
           </div>
           </div>
-          <div className="assistant-teacher">
+          <div className="assistant-teacher" id="assistant-teacher">
                 <span className="label">助教：</span>
                 <span className="label">助教：</span>
                 <Select
                 <Select
                   id="assistant"
                   id="assistant"
                   placeholder="请选择助教老师"
                   placeholder="请选择助教老师"
                   // key={assistantNames}
                   // key={assistantNames}
                   // defaultValue={assistantNames}
                   // defaultValue={assistantNames}
-                  value={assistantNames}
+                  value={assistant}
                   disabled={!isEdit ? true: false}
                   disabled={!isEdit ? true: false}
                   mode={'multiple'}
                   mode={'multiple'}
                   showSearch
                   showSearch
@@ -302,7 +307,8 @@ class AddLiveClass extends React.Component {
                   filterOption={(input, option) => option}
                   filterOption={(input, option) => option}
                   onPopupScroll={this.handleScrollAssistantList}
                   onPopupScroll={this.handleScrollAssistantList}
                   onChange={(value,option) => {
                   onChange={(value,option) => {
-                    this.props.onChange('assistant',value,'assistantType',option.children) 
+                    console.log('option',option);
+                    this.props.onChange('assistant',value,'assistantType',option) 
                   }}
                   }}
                   onSearch={(value) => {
                   onSearch={(value) => {
                     assistantQuery.nickName = value
                     assistantQuery.nickName = value
@@ -312,12 +318,14 @@ class AddLiveClass extends React.Component {
                       this.getAssistantList()
                       this.getAssistantList()
                     })
                     })
                   }}
                   }}
+                  getPopupContainer={() =>
+                    document.getElementById("assistant-teacher")
+                  }
                 >
                 >
-  
                 {_.map(assistantList, (item, index) => {
                 {_.map(assistantList, (item, index) => {
                   if(item.userId !== teacherId){
                   if(item.userId !== teacherId){
                     return (
                     return (
-                      <Select.Option value={item.userId} key={item.userId}>{item.nickName}</Select.Option>
+                      <Select.Option value={item.userId} key={item.id}>{item.nickName}</Select.Option>
                     );
                     );
                   }
                   }