From 3eedd22ed0b71ebfeaa0ecfa5ec1b8c08c6573a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 23 Aug 2019 11:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8F=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/shared/main.css                 |  6 ++---
 public/react/src/index.css                    |  6 ++---
 .../courses/coursesPublic/AccessoryModal.js   |  1 +
 .../courses/coursesPublic/ModulationModal.js  | 23 +++++++++++++------
 .../src/modules/modals/WordNumberTextarea.css |  2 +-
 .../src/modules/modals/WordNumberTextarea.js  |  2 +-
 public/stylesheets/educoder/edu-main.css      |  6 ++---
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/templates/shared/main.css b/app/templates/shared/main.css
index 81b80cdf8..dfe6613bf 100644
--- a/app/templates/shared/main.css
+++ b/app/templates/shared/main.css
@@ -760,9 +760,9 @@ html>body #ajax-indicator { position: fixed; }
 
 .paddingLeft28{padding-left:28px;}
 
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 
 .color656565{
     color:#656565;
diff --git a/public/react/src/index.css b/public/react/src/index.css
index ee89ffc11..efd553bf3 100644
--- a/public/react/src/index.css
+++ b/public/react/src/index.css
@@ -25,9 +25,9 @@ body {
 .ant-message{
   z-index: 20000;
 }
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 .ant-upload-list-item-info .anticon-loading, .ant-upload-list-item-info .anticon-paper-clip{
   color: #29bd8b !important;
 }
diff --git a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
index f7c82fd23..d4124a606 100644
--- a/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
+++ b/public/react/src/modules/courses/coursesPublic/AccessoryModal.js
@@ -339,6 +339,7 @@ class AccessoryModal extends Component{
             </p>
 
 						<WordNumberTextarea
+							thisPlaceholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
 							thisInput={(e)=>this.settextarea(e)}
 							thisValue={description}
 							startFontLength={description===undefined?0:description.length}
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index 46dc3becf..37cf1cc5c 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import { Modal,Checkbox,Upload,Button,Icon,message,Input} from "antd";
-
+import { WordNumberTextarea } from 'educoder';
 
 class ModulationModal extends Component{
   constructor(props){
@@ -78,12 +78,21 @@ class ModulationModal extends Component{
 
 
             <div className="clearfix">
-              <textarea
-              className="winput-100-150"
-              placeholder="请填写您对作品调分的原因"
-              value={textareaval}
-              onInput={this.settextarea}
-              ></textarea>
+              {/*<textarea*/}
+              {/*className="winput-100-150"*/}
+              {/*placeholder="请填写您对作品调分的原因"*/}
+              {/*value={textareaval}*/}
+              {/*onInput={this.settextarea}*/}
+              {/*></textarea>*/}
+
+							<WordNumberTextarea
+								thisPlaceholder={"请填写您对作品调分的原因"}
+								thisInput={(e)=>this.settextarea(e)}
+								thisValue={textareaval}
+								startFontLength={textareaval===undefined?0:textareaval.length}
+								maxFontLength={100}
+							/>
+
               <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
             </div>
             <li>
diff --git a/public/react/src/modules/modals/WordNumberTextarea.css b/public/react/src/modules/modals/WordNumberTextarea.css
index 59ed95038..9bd8c820c 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.css
+++ b/public/react/src/modules/modals/WordNumberTextarea.css
@@ -39,4 +39,4 @@
     font-size: 0.28rem;
     color: #adadad;
     padding-right: 0.25rem;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/modals/WordNumberTextarea.js b/public/react/src/modules/modals/WordNumberTextarea.js
index 7f5a0288b..812ed3fd3 100644
--- a/public/react/src/modules/modals/WordNumberTextarea.js
+++ b/public/react/src/modules/modals/WordNumberTextarea.js
@@ -7,7 +7,7 @@ class WordNumberTextarea extends Component {
 render() {
     return(
 			<div className="WordNumbernote">
-					<textarea placeholder={`请在此输入补交附件的原因，最大限制${this.props.maxFontLength}个字符`}
+					<textarea placeholder={this.props.thisPlaceholder}
 										className="WordNumberTextarea"
 										value={this.props.thisValue}
 										onInput={(e)=>this.props.thisInput(e)}
diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css
index 4aa426192..f59827f45 100644
--- a/public/stylesheets/educoder/edu-main.css
+++ b/public/stylesheets/educoder/edu-main.css
@@ -761,9 +761,9 @@ html>body #ajax-indicator { position: fixed; }
 
 .paddingLeft28{padding-left:28px;}
 
-.ant-modal-header{
-    border-radius: 10px;
-}
+/*.ant-modal-header{*/
+    /*border-radius: 10px;*/
+/*}*/
 
 .color656565{
     color:#656565;