From 85b73a531324d82ea94800e133ab192667f88f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 2 Jan 2020 09:54:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E5=A0=82=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/busyWork/CommonWorkList.js        | 54 +++++++++++--------
 .../modules/courses/coursesPublic/NoneData.js |  2 +-
 .../shixunHomework/Listofworksstudentone.js   |  5 +-
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index ca93833bb..d60f68b22 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -1,28 +1,17 @@
 import React,{Component} from "react";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
-import {Link} from 'react-router-dom';
-import locale from 'antd/lib/date-picker/locale/zh_CN';
-import {WordsBtn, ConditionToolTip, queryString, getImageUrl, on, off, NoneData, sortDirections} from 'educoder';
+import {WordsBtn, ConditionToolTip, queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
 import axios from 'axios';
-import Modals from '../../modals/Modals';
-import CoursesListType from '../coursesPublic/CoursesListType';
-import HomeworkModal from "../coursesPublic/HomeworkModal";
 import CheckAllGroup from '../common/button/CheckAllGroup'
 import moment from 'moment';
 import CheckCodeModal from '../coursesPublic/modal/CheckCodeModal'
-import '../css/Courses.css'
-import WorkDetailPageHeader from './common/WorkDetailPageHeader'
+import '../css/Courses.css';
 import PublishRightnow from './PublishRightnow'
 import ModulationModal from "../coursesPublic/ModulationModal";
 import AccessoryModal from "../coursesPublic/AccessoryModal";
 import LeaderIcon from './common/LeaderIcon'
-const { Option} = Select;
-const CheckboxGroup = Checkbox.Group;
-const confirm = Modal.confirm;
-let GraduationTasksnewtype=true;
 const $ = window.$;
 const Search = Input.Search;
-const RadioGroup = Radio.Group;
 
 function renderScore(score, content) {
   let color = '#747A7F'
@@ -414,6 +403,7 @@ class CommonWorkList extends Component{
       left_time: {},
       category: {},
 			b_order: 'desc',
+      searchtypes:false
     }
   }
   onTablePagination = (page) => {
@@ -423,10 +413,26 @@ class CommonWorkList extends Component{
 
   }
   onSearchValue = (val) => {
+    if (val === ""||val===undefined) {
+      this.setState({
+        search: undefined,
+        searchtypes:false
+      })
+    }else{
+      this.setState({
+        searchtypes:true
+      })
+    }
     this.fetchList()
   }
   onSearchValueInput = (e) => {
-    this.setState({search: e.target.value})
+    if (e.target.value === ""||e.target.value===undefined) {
+      this.setState({
+        search: undefined,
+      })
+    } else {
+      this.setState({search: e.target.value})
+    }
   }
 
   componentDidMount() {
@@ -789,13 +795,14 @@ class CommonWorkList extends Component{
 
               {/*   value={search} */}
               <div className="fr search-new mr8" style={{marginBottom:'1px'}}>
-                <Search
-                  placeholder="请输入姓名或学号搜索"
-                  id="subject_search_input"
-                  onInput={this.onSearchValueInput}
-                  onSearch={this.onSearchValue}
-                  autoComplete="off"
-                ></Search>
+                {/*<Search*/}
+                {/*  placeholder="请输入姓名或学号搜索1"*/}
+                {/*  id="subject_search_input"*/}
+                {/*  onInput={this.onSearchValueInput}*/}
+                {/*  onSearch={this.onSearchValue}*/}
+                {/*  autoComplete="off"*/}
+                {/*></Search>*/}
+                {publicSearchs("请输入姓名或学号搜索",this.onSearchValue,this.onSearchValueInput,this.onSearchValueInput)}
               </div>
             </ul> }
 
@@ -859,7 +866,10 @@ class CommonWorkList extends Component{
 									<div id="forum_list" className="forum_table">
 										<div className="mh650 edu-back-white">
 
-											<NoneData></NoneData>
+											<NoneData
+                        {...this.props}
+                        {...this.state}
+                      ></NoneData>
 										</div>
 									</div>
 								</Spin>
diff --git a/public/react/src/modules/courses/coursesPublic/NoneData.js b/public/react/src/modules/courses/coursesPublic/NoneData.js
index 825ca5832..6f0422f67 100644
--- a/public/react/src/modules/courses/coursesPublic/NoneData.js
+++ b/public/react/src/modules/courses/coursesPublic/NoneData.js
@@ -24,7 +24,7 @@ class NoneData extends Component{
           `}
         </style>
         <img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
-        <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
+        <p className="edu-nodata-p mb20">{searchtypes===true?"抱歉没有您要搜索的内容，请换个词语试试看":"暂时还没有相关数据哦!"}</p>
       </div>
     )
   }
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 84a04687e..8c73793f1 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -2961,10 +2961,9 @@ class Listofworksstudentone extends Component {
 	}
 	//搜索学生 文字输入
 	inputSearchValuest = (e) => {
-		// console.log(e.target.value)
-		if (e.target.value === "") {
+		if (e.target.value === ""||e.target.value===undefined) {
 			this.setState({
-				searchtext: undefined
+				searchtext: undefined,
 			})
 		} else {
 			this.setState({