调整

public/react/src/common/UrlTool.js

@@ -1,4 +1,8 @@
+import React from "react";
 import md5 from 'md5';
+import {Input} from "antd";
+const { Search } = Input;
+
 const $ = window.$;
 const isDev = window.location.port == 3007;
 export const TEST_HOST = "https://test-newweb.educoder.net"
@@ -144,3 +148,15 @@ export function htmlEncode(str) {
 	s = s.replace(/\"/g, """);
 	return s;
 }
+
+export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings) {
+	return(<Search
+		placeholder= { Placeholder || "请输入内容进行搜索" }
+		onSearch={onSearch}
+		// value={searchValue}
+		onInput={onInputs}
+		onChange={onChanges}
+		loading={loadings||false}
+		allowClear={true}
+	></Search>)
+}

public/react/src/common/educoder.js

@@ -2,7 +2,7 @@
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
-export { getImageUrl as getImageUrl, getUrl as getUrl, getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+export { getImageUrl as getImageUrl, getUrl as getUrl, publicSearchs as publicSearchs,getRandomcode as getRandomcode,getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
         , getUploadActionUrl as getUploadActionUrl,getUploadActionUrltwo as getUploadActionUrltwo ,getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
         , getTaskUrlById as getTaskUrlById, TEST_HOST ,htmlEncode as htmlEncode } from                './UrlTool';
 export { default as queryString } from                './UrlTool2';

public/react/src/modules/courses/busyWork/commonWork.js

@@ -1,28 +1,22 @@
 import React,{ Component } from "react";
 import { Input,Checkbox,Menu,Pagination,Spin} from "antd";
-import CourseLayoutcomponent from '../common/CourseLayoutComponent';
 import UseBank from './UseBank'
-
 import '../css/members.css'
 import '../css/busyWork.css'
-
-import CoursesListType from '../coursesPublic/CoursesListType'
 import CommonWorkItem from './CommonWorkItem'
 import PublishRightnow from './PublishRightnow'
 import ConnectProject from './ConnectProject'
-
 import { WordsBtn, on, off } from 'educoder'
 import Modals from '../../modals/Modals'
 import NoneData from "../coursesPublic/NoneData"
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection';
 import { RouteHOC } from './common'
-
 import axios from 'axios';
 import _ from 'lodash'
 
-const Search = Input.Search;
-const map={1:"普通作业",2:"",3:"分组作业"}
-const COMMON_WORK = 1
+// const Search = Input.Search;
+// const map={1:"普通作业",2:"",3:"分组作业"}
+// const COMMON_WORK = 1
 // const COMMON_WORK = 2
 class commonWork extends Component{
   constructor(props){
@@ -47,13 +41,12 @@ class commonWork extends Component{
   inputStudent=(e)=>{
     this.setState({
       search:e.target.value,
-      page:1
     })
   }
   //搜索查询
   searchStudent=()=>{
     let {page,search,order}=this.state;
-    this.getList(page,search,order);
+    this.getList(1,search,order);
   }
   openConnectionProject = (work) => {
     this.refs['connectProject'].openConnectionProject(work)
@@ -134,11 +127,14 @@ class commonWork extends Component{
           mainList:result.data,
           totalCount:result.data.task_count,
           isSpin:false,
+          page:page,
           ...result.data
         })
       }
     }).catch((error)=>{
-      console.log(error);
+      this.setState({
+        isSpin:false
+      })
     })
   }
   //筛选条件
@@ -396,7 +392,7 @@ class commonWork extends Component{
             // searchtype={this.props.isAdmin||this.props.isStudent ?true:false}
             onInputSearchChange={this.inputStudent}
             onPressEnter={this.searchStudent}
-
+            allowClearonChange={this.inputStudent}
             firstRowRight={
               <React.Fragment>
                 { isAdmin && <WordsBtn style="blue" className="fr" onClick={()=>this.createCommonWork(1)}>新建</WordsBtn>}

public/react/src/modules/courses/common/titleSearch/TitleSearchSection.js

@@ -1,8 +1,5 @@
 import React,{ Component } from "react";
-import { Input } from "antd";
-
-const Search = Input.Search;
-
+import {publicSearchs} from 'educoder';
 class Titlesearchsection extends Component{
   constructor(props){
     super(props);
@@ -14,7 +11,7 @@ class Titlesearchsection extends Component{
   render(){
     let { addGroup } = this.state;
     const { firstRowRight, secondRowLeft,firstRowMid, secondRowBotton,thirdRow, title, onInputSearchChange
-        , searchValue, onPressEnter, searchPlaceholder, showSearchInput } = this.props;
+        , searchValue, onPressEnter, searchPlaceholder, allowClearonChange } = this.props;
     return(
       <React.Fragment>
         <style>{`
@@ -79,12 +76,15 @@ class Titlesearchsection extends Component{
             
             {/* (searchValue || showSearchInput) &&  */}
             { <div className="fr mt16 mb16 searchView" >
-              <Search 
-                onSearch={onPressEnter}
-                value={searchValue}
-                placeholder= { searchPlaceholder || "请输入姓名进行搜索" }
-                onInput={onInputSearchChange}
-              ></Search>
+              {publicSearchs(searchPlaceholder || "请输入姓名进行搜索",onPressEnter,onInputSearchChange,allowClearonChange)}
+              {/*<Search */}
+              {/*  onSearch={onPressEnter}*/}
+              {/*  // value={searchValue}*/}
+              {/*  placeholder= { searchPlaceholder || "请输入姓名进行搜索" }*/}
+              {/*  onInput={onInputSearchChange}*/}
+              {/*  onChange={allowClearonChange}*/}
+              {/*  allowClear={true}*/}
+              {/*></Search>*/}
             </div> }
 
             {secondRowBotton}

public/react/src/modules/courses/exercise/Exercise.js

@@ -1,11 +1,10 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin } from "antd";
-import CourseLayoutcomponent from '../common/CourseLayoutComponent';
+import {Checkbox, Pagination,Menu,Spin } from "antd";
 import ExerciseListItem from './ExerciseListItem'
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import '../css/members.css'
-import { WordsBtn,on, off, trigger } from 'educoder'
+import { WordsBtn,on, publicSearchs } from 'educoder'
 import '../css/busyWork.css'
 import _ from 'lodash';
 import moment from 'moment'
@@ -14,8 +13,6 @@ import ImmediatelyPublish from "../poll/pollPublicBtn/ImmediatelyPublish";
 import ImmediatelyEnd from "../poll/pollPublicBtn/ImmediatelyEnd";
 import NoneData from "../coursesPublic/NoneData";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
-const Search = Input.Search;
-
 
 class Exercise extends Component{
     constructor(props){
@@ -93,17 +90,20 @@ class Exercise extends Component{
                     exercises:result.data.exercises,
                     checkAllValue:false,
                     checkBoxValues:[],
-                    isSpin:false
+                    isSpin:false,
+                    page:page
                 })
         }).catch((error)=>{
-            console.log(error);
+            this.setState({
+                isSpin:false,
+            })
         })
     }
 
 
     inputStudent=(e)=>{
         this.setState({
-            StudentList_value:e.target.value
+            StudentList_value:e.target.value,
         })
     }
     // 搜索
@@ -505,12 +505,13 @@ class Exercise extends Component{
                                 <span>未发布：{exercises_counts && exercises_counts.exercises_unpublish_counts}个</span> 
                             </p>
                             <div className="fr mt16 mb16 searchView">
-                                <Search
-                                    value={StudentList_value}
-                                    placeholder="请输入名称进行搜索"
-                                    onInput={this.inputStudent}
-                                    onSearch={this.searchInfo}
-                                ></Search>
+                                {publicSearchs("请输入名称进行搜索",this.searchInfo,this.inputStudent,this.inputStudent)}
+                                {/*<Search*/}
+                                {/*    value={StudentList_value}*/}
+                                {/*    placeholder="请输入名称进行搜索"*/}
+                                {/*    onInput={this.inputStudent}*/}
+                                {/*    onSearch={this.searchInfo}*/}
+                                {/*></Search>*/}
                             </div>
                         </div>
                         <div className="task_menu_ul pl30 pr30">

public/react/src/modules/courses/graduation/tasks/index.js

@@ -1,7 +1,6 @@
 import React,{ Component } from "react";
-import { Input, Checkbox, Menu,Pagination,Spin} from "antd";
+import { Checkbox, Menu,Pagination,Spin} from "antd";
 import {Link} from 'react-router-dom';
-import CourseLayoutcomponent from '../../common/CourseLayoutComponent';
 import Titlesearchsection from '../../common/titleSearch/TitleSearchSection';
 import HomeworkModal from "../../coursesPublic/HomeworkModal";
 import { WordsBtn } from 'educoder';
@@ -10,7 +9,6 @@ import moment from 'moment';
 import GraduateTaskItem from './GraduateTaskItem';
 import TaskPublishModal from "./TaskPublishModal";
 import Modals from '../../../modals/Modals';
-import UseBank from "../../busyWork/UseBank";
 import '../../css/members.css';
 import '../style.css';
 import NoneData from "../../coursesPublic/NoneData";
@@ -65,7 +63,9 @@ class GraduationTasks extends Component{
         })
       }
     }).catch(function (error) {
-      console.log(error);
+      this.setState({
+        isSpin:false
+      })
     });
 
   }
@@ -286,7 +286,7 @@ class GraduationTasks extends Component{
 
   onInputSearchChange = (e) => {
     this.setState({
-      searchValue:e.target.value
+      searchValue:e.target.value,
     })
 
     if (this.timeoutHandler) {
@@ -405,7 +405,8 @@ class GraduationTasks extends Component{
 
     let {page,order}=this.state;
     this.setState({
-      search:value
+      search:value,
+      isSpin:true
     })
     this.fetchAll(value,page,order);
 
@@ -662,6 +663,7 @@ class GraduationTasks extends Component{
           title="毕设任务"
           searchValue={searchValue}
           onInputSearchChange={this.onInputSearchChange}
+          allowClearonChange={this.onInputSearchChange}
           firstRowRight={
             <React.Fragment>
               {/*{this.props.isAdmin() ?<WordsBtn style="blue" className="mr30" onClick={() => this.addDir()}>题库选用</WordsBtn>:""}*/}

public/react/src/modules/courses/graduation/topics/index.js

@@ -1,7 +1,6 @@
 import React,{ Component } from "react";
 import {Checkbox, Menu, Pagination,Spin} from "antd";
 
-import CourseLayoutcomponent from '../../common/CourseLayoutComponent'
 import Titlesearchsection from '../../common/titleSearch/TitleSearchSection'
 import DownloadMessageysl from "../../../modals/DownloadMessageysl";
 
@@ -9,7 +8,6 @@ import { WordsBtn } from 'educoder'
 import NoneData from '../../coursesPublic/NoneData'
 import Modals from "../../../modals/Modals"
 import axios from 'axios'
-import UseBank from '../../busyWork/UseBank'
 
 import _ from 'lodash'
 
@@ -85,12 +83,15 @@ class Boards extends Component{
           topicList:response.data.graduation_topic,
           totalCount:response.data.graduation_topic_count,
           course_public:response.data.course_public,
-          isSpin:false
+          isSpin:false,
+          page:page
         })
       }
     })
     .catch(function (error) {
-      console.log(error);
+      this.setState({
+        isSpin:false
+      })
     });
   }
   componentDidMount = () => {
@@ -117,10 +118,11 @@ class Boards extends Component{
 
   onInputSearchChange = (e) => {
     this.setState({
-      searchValue:e.target.value
+      searchValue:e.target.value,
     })
   }
 
+
   // 全选or反选
   onCheckAll = (e) => {
     this.setState({
@@ -408,6 +410,7 @@ onBoardsNew=()=>{
             title="毕设选题"
             searchValue={ searchValue }
             onInputSearchChange={this.onInputSearchChange}
+            allowClearonChange={this.onInputSearchChange}
             firstRowRight=
             { isAdmin ?
               (<React.Fragment>

public/react/src/modules/courses/poll/Poll.js

@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip ,Spin} from "antd";
-import {WordsBtn, on, off, trigger } from 'educoder';
+import {Checkbox, Pagination,Menu ,Spin} from "antd";
+import {WordsBtn, on, off, publicSearchs } from 'educoder';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import AddcoursesNav from "../coursesPublic/AddcoursesNav";
 import ImmediatelyPublish from './pollPublicBtn/ImmediatelyPublish';
@@ -15,8 +15,6 @@ import Modals from '../../modals/Modals';
 import axios from 'axios';
 import moment from 'moment';
 
-const Search = Input.Search;
-
 
 class Poll extends Component{
   constructor(props){
@@ -66,7 +64,7 @@ class Poll extends Component{
 
   inputStudent=(e)=>{
     this.setState({
-      StudentList_value:e.target.value
+      StudentList_value:e.target.value,
     })
   }
 
@@ -125,7 +123,8 @@ class Poll extends Component{
           course_types:result.data.course_types,
           polls_counts:result.data.polls_counts,
           isSpin:false,
-					checkBoxValues: bank_checkValue ? bank_checkValue : []
+					checkBoxValues: bank_checkValue ? bank_checkValue : [],
+          page:page
         })
       }
     }).catch((error)=>{
@@ -524,12 +523,13 @@ class Poll extends Component{
               <span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span>
             </p>
             <div className="fr mt16 mb16 searchView">
-              <Search
-                value={StudentList_value}
-                placeholder="请输入名称进行搜索"
-                onInput={this.inputStudent}
-                onSearch={this.searchInfo}
-              ></Search>
+              {publicSearchs("请输入名称进行搜索",this.searchInfo,this.inputStudent,this.inputStudent)}
+              {/*<Search*/}
+              {/*  value={StudentList_value}*/}
+              {/*  placeholder="请输入名称进行搜索"*/}
+              {/*  onInput={this.inputStudent}*/}
+              {/*  onSearch={this.searchInfo}*/}
+              {/*></Search>*/}
             </div>
           </div>
           <div className="task_menu_ul pl30 pr30">

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
-import { Input,Checkbox, Pagination,Menu, AutoComplete,Spin,Icon } from "antd";
-import { WordsBtn,on, trigger } from 'educoder';
+import { Input,Checkbox, Pagination,Menu,Spin } from "antd";
+import { WordsBtn,on, trigger ,publicSearchs} from 'educoder';
 import {Link} from 'react-router-dom';
 import axios from'axios';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
@@ -14,8 +14,6 @@ import '../css/busyWork.css'
 import ShixunhomeWorkItem from "./ShixunhomeWorkItem";
 import NoneData from "../coursesPublic/NoneData";
 
-
-
 class ShixunHomework extends Component{
   constructor(props){
     super(props);
@@ -196,16 +194,20 @@ class ShixunHomework extends Component{
 				if(result.status===200){
 					this.setState({
 						datas:result.data,
-						isSpin:false
+						isSpin:false,
+            page:page
 					})
 				}
 			}else{
 				this.setState({
-					isSpin:false
+					isSpin:false,
 				})
 			}
     }).catch((error)=>{
       console.log(error);
+      this.setState({
+        isSpin:false
+      })
     })
   }
 
@@ -642,19 +644,21 @@ class ShixunHomework extends Component{
   }
 
   SearchCoursenames=(e)=>{
-
     this.setState({
-      Coursename:e.target.value
+      Coursename:e.target.value,
     })
-
   }
 
+
+
   SearchCoursename=(value)=>{
+
     let {page,order}=this.state;
     this.setState({
-      Coursename:value
+      Coursename:value,
+      isSpin:true,
     })
-    this.homeworkupdatalist(value,page,order);
+    this.homeworkupdatalist(value,1,order);
 
   }
 
@@ -1028,8 +1032,7 @@ class ShixunHomework extends Component{
     }=this.state;
 
 		let main_id=this.props.match.params.main_id;
-		let category_id=this.props.match.params.category_id;
-    const dataSource = ['12345', '23456', '34567'];
+
     return(
       <React.Fragment  >
       <div>
@@ -1210,27 +1213,15 @@ class ShixunHomework extends Component{
               </Menu>
             </div>
             <div className="fr mt16 mb16 searchView">
+              {publicSearchs("请输入名称进行搜索",value => this.SearchCoursename(value),this.SearchCoursenames,(e)=>this.SearchCoursenames(e))}
               {/*<Search*/}
-              {/*  value={Coursename}*/}
+              {/*  // value={Coursename}*/}
               {/*  placeholder="请输入名称进行搜索"*/}
               {/*  onInput={this.SearchCoursenames}*/}
               {/*  onSearch={value => this.SearchCoursename(value)}*/}
-              {/*  allowClear*/}
+              {/*  onChange={(e)=>this.allowClearonChange(e)}*/}
+              {/*  allowClear={true}*/}
               {/*></Search>*/}
-              <AutoComplete
-                allowClear
-                className="certain-category-search"
-                dropdownClassName="certain-category-search-dropdown"
-                dropdownMatchSelectWidth={false}
-                dropdownStyle={{ width: 300 }}
-                size="large"
-                style={{ width: '100%' }}
-                dataSource={dataSource}
-                placeholder="input here"
-                optionLabelProp="value"
-              >
-                <Input suffix={<Icon type="search" className="certain-category-icon" />} />
-              </AutoComplete>
             </div>
           </div>
         </div>
@@ -1393,14 +1384,3 @@ class ShixunHomework extends Component{
   }
 }
 export default ShixunHomework;
-// {/*<div className="alltask "*/}
-// {/*style={*/}
-// {/*{*/}
-// {/*display: datas===undefined?'none' :datas.task_count===0? 'block' : 'none'*/}
-// {/*}*/}
-// {/*}*/}
-// {/*>*/}
-// {/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
-// {/*<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />*/}
-// {/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
-// {/*</div>*/}