Skip to content

B
biz.qingxiao.com
Commit 70240ceb authored by wangxuelai's avatar wangxuelai
Browse files
Options

'报错提示修改'

parent e7b53972
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 43 deletions
.eslintrc
View file @ 70240ceb
......@@ -64,6 +64,7 @@
"jsx-a11y/mouse-events-have-key-events": 0,
"prefer-object-spread": 0,
"react/jsx-props-no-spreading": 0,
"lines-between-class-members": 0
"lines-between-class-members": 0,
"react/no-array-index-key": 0
}
}
\ No newline at end of file
src/components/CourseChart.js
View file @ 70240ceb
......@@ -69,9 +69,9 @@ class CourseChart extends React.Component {
} = this.props;
const courseChartColumns = [{
title: '',
dataIndex: 'name',
dataIndex: 'time',
align: 'center',
key: 'name',
key: 'time',
render: () => (
<div>
<div className={pageStyle.timeitem}>6:00</div>
......@@ -104,8 +104,8 @@ class CourseChart extends React.Component {
</div>
),
align: 'center',
dataIndex: 'name',
key: 'name',
dataIndex: 'monday',
key: 'monday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[0] && scheduleList[0].length > 0 &&
......@@ -114,6 +114,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -192,9 +193,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[1] && showWeekDaysArr[1].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'tuesday',
align: 'center',
key: 'name',
key: 'tuesday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[1] && scheduleList[1].length > 0 &&
......@@ -203,6 +204,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -281,9 +283,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[2] && showWeekDaysArr[2].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'Wednesday',
align: 'center',
key: 'name',
key: 'Wednesday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[2] && scheduleList[2].length > 0 &&
......@@ -292,6 +294,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -370,9 +373,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[3] && showWeekDaysArr[3].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'Thursday',
align: 'center',
key: 'name',
key: 'Thursday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[3] && scheduleList[3].length > 0 &&
......@@ -381,6 +384,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -459,9 +463,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[4] && showWeekDaysArr[4].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'Friday',
align: 'center',
key: 'name',
key: 'Friday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[4] && scheduleList[4].length > 0 &&
......@@ -470,6 +474,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -548,9 +553,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[5] && showWeekDaysArr[5].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'Saturday',
align: 'center',
key: 'name',
key: 'Saturday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[5] && scheduleList[5].length > 0 &&
......@@ -559,6 +564,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -637,9 +643,9 @@ class CourseChart extends React.Component {
{showWeekDaysArr[6] && showWeekDaysArr[6].isToday && <div className={pageStyle.idtoday}>今</div>}
</div>
),
dataIndex: 'name',
dataIndex: 'Sunday',
align: 'center',
key: 'name',
key: 'Sunday',
render: () => (
<div className={pageStyle.scheduleplanbox}>
{scheduleList[6] && scheduleList[6].length > 0 &&
......@@ -648,6 +654,7 @@ class CourseChart extends React.Component {
placement="bottomLeft"
autoAdjustOverflow
overlayClassName={pageStyle.courseDetailStyle}
key={ele.id}
content={
<div>
<div className={pageStyle.timebox}>
......@@ -720,7 +727,7 @@ class CourseChart extends React.Component {
),
}];
const list = [{
id: 1,
}];
return (
<div className={`${pageStyle.coursechartbox} coursechartbox`}>
......@@ -737,7 +744,7 @@ class CourseChart extends React.Component {
<Select className={pageStyle.selectitem} value={scheduleListQueryParams.teacher_id} onChange={this.changeTeacher}>
<Option value="">全部老师</Option>
{teacherList.map(ele => (
<Option value={ele.id}>{ele.nickname}</Option>
<Option key={ele.id} value={ele.id}>{ele.nickname}</Option>
))
}
</Select>
......@@ -745,9 +752,10 @@ class CourseChart extends React.Component {
</div>
</div>
<Table
bordered={() => true}
bordered
columns={courseChartColumns}
dataSource={list}
rowKey="id"
pagination={false}
/>
</div>
......
src/components/PlanCourse.js
View file @ 70240ceb
......@@ -252,7 +252,7 @@ class classRoomMgt extends React.Component {
})(
<Select placeholder="请选择班级" onChange={this.classChange}>
<Option value="">请选择班级</Option>
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Form.Item>
}
......@@ -347,7 +347,7 @@ class classRoomMgt extends React.Component {
initialValue: rulePlanDetail.times,
})(
<Select mode="multiple" placeholder="请选择上课时间">
{timeArr.map(ele => <Option value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
{timeArr.map(ele => <Option key={ele.id} value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
</Select>)}
</Col>
<Col
......@@ -385,7 +385,7 @@ class classRoomMgt extends React.Component {
rules: [{ required: true, message: '请选择上课老师' }],
})(
<Select style={{ width: '100%' }} placeholder="请选择上课老师">
{teacherList.map(ele => <Option value={ele.id}>{ele.nickname}</Option>)}
{teacherList.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}
</Select>)}
</Col>
</Row>
......@@ -408,7 +408,7 @@ class classRoomMgt extends React.Component {
})(
<Select placeholder="请选择上课教室">
<Option value="">请选择上课教室</Option>
{classroomList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classroomList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Col>
<Col span={5} style={{ color: '#1890FF', cursor: 'pointer', fontSize: '14px' }} onClick={classroomMgt}>
......@@ -434,7 +434,7 @@ class classRoomMgt extends React.Component {
<TextArea
placeholder="请输入上课内容"
maxLength={150}
autosize={{ minRows: 2, maxRows: 6 }}
autoSize={{ minRows: 2, maxRows: 6 }}
/>)}
</Form.Item>
</Form>
......@@ -459,7 +459,7 @@ class classRoomMgt extends React.Component {
})(
<Select placeholder="请选择班级" onChange={this.classChange}>
<Option value="">请选择班级</Option>
{classList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Form.Item>
}
......@@ -500,10 +500,10 @@ class classRoomMgt extends React.Component {
<div className={pageStyle.weekday}>五</div>
<div className={pageStyle.weekday}>六</div>
</div>
{calendarData.targetTimeArr && calendarData.targetTimeArr.map((bigdat) => {
{calendarData.targetTimeArr && calendarData.targetTimeArr.map((bigdat, index) => {
return (
<div className={pageStyle.dayrow}>{bigdat.map((day) => {
return (<div onClick={() => this.selectPlanDay(day)} className={`${pageStyle.dayitem} ${day.open ? '' : pageStyle.notopen} ${day.type == 'current' ? pageStyle.current : ''} ${selectPlanDays.indexOf(day.date) != -1 ? pageStyle.dayselected : ''} ${day.istoday ? pageStyle.istoday : ''}`}>{day.day}</div>);
<div className={pageStyle.dayrow} key={index}>{bigdat.map((day) => {
return (<div key={day.date} onClick={() => this.selectPlanDay(day)} className={`${pageStyle.dayitem} ${day.open ? '' : pageStyle.notopen} ${day.type == 'current' ? pageStyle.current : ''} ${selectPlanDays.indexOf(day.date) != -1 ? pageStyle.dayselected : ''} ${day.istoday ? pageStyle.istoday : ''}`}>{day.day}</div>);
})}
</div>
);
......@@ -531,7 +531,7 @@ class classRoomMgt extends React.Component {
initialValue: datePlanDetail.times,
})(
<Select mode="multiple" placeholder="请选择上课时间">
{timeArr.map(ele => <Option value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
{timeArr.map(ele => <Option key={ele.id} value={`${ele.start_time}-${ele.end_time}`}>{`${ele.start_time}-${ele.end_time}`}</Option>)}
</Select>)}
</Col>
<Col
......@@ -570,7 +570,7 @@ class classRoomMgt extends React.Component {
})(
<Select style={{ width: '100%' }} placeholder="请选择上课老师">
<Option value="">请选择上课老师</Option>
{teacherList.map(ele => <Option value={ele.id}>{ele.nickname}</Option>)}
{teacherList.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}
</Select>)}
</Col>
</Row>
......@@ -593,7 +593,7 @@ class classRoomMgt extends React.Component {
})(
<Select placeholder="请选择上课教室">
<Option value="">请选择上课教室</Option>
{classroomList.map(ele => <Option value={ele.id}>{ele.title}</Option>)}
{classroomList.map(ele => <Option key={ele.id} value={ele.id}>{ele.title}</Option>)}
</Select>)}
</Col>
<Col span={5} style={{ color: '#1890FF', cursor: 'pointer', fontSize: '14px' }} onClick={classroomMgt}>
......@@ -618,7 +618,7 @@ class classRoomMgt extends React.Component {
})(
<TextArea
placeholder="请输入上课内容"
autosize={{ minRows: 2, maxRows: 6 }}
autoSize={{ minRows: 2, maxRows: 6 }}
/>)}
</Form.Item>
</Form>
......
src/pages/classdetail/ChangeCourse.js
View file @ 70240ceb
......@@ -206,7 +206,7 @@ class ChangeCourse extends React.Component {
})(
<TextArea
placeholder="请输入上课内容"
autosize={{ minRows: 2, maxRows: 6 }}
autoSize={{ minRows: 2, maxRows: 6 }}
/>)}
</Form.Item>
</Form>
......
src/pages/classdetail/CourseTimeList.js
View file @ 70240ceb
......@@ -46,7 +46,7 @@ class AddCourseTime extends React.Component {
</Col>
<Col lg={{ span: 19 }} md={{ span: 20 }} xs={{ span: 24 }} style={{ }}>
{timeArr && timeArr.map(ele => (
<div key={ele.start_time} className={pageStyle.timeitem}>
<div key={ele.id} className={pageStyle.timeitem}>
<span className={pageStyle.itemContent}>{ele.start_time}～{ele.end_time}</span>
<Icon onClick={() => delTime(ele)} type="close-circle" theme="twoTone" style={{ color: '#FF5252', fontSize: '12px' }} twoToneColor="#FF5252" />
</div>
......
src/pages/clockmgt/commenteditorbox.js
View file @ 70240ceb
......@@ -106,7 +106,7 @@ class CommentEditorBox extends React.Component {
</div>
</div>
<div className={pageStyle.textareabox}>
<TextArea autosize={() => true} maxlength={500} className={pageStyle.textareabox} value={commentParams.common.content} onChange={contentChange} style={{ minHeight: '100px' }} />
<TextArea autoSize={() => true} maxlength={500} className={pageStyle.textareabox} value={commentParams.common.content} onChange={contentChange} style={{ minHeight: '100px' }} />
<div className={pageStyle.wordcount}>{commentParams.common.content.length}/500</div>
</div>
<div className={pageStyle.shortwordbox}>
......@@ -183,7 +183,7 @@ class CommentEditorBox extends React.Component {
{privitecommentOpen &&
<div>
<div className={pageStyle.textareabox}>
<TextArea maxlength={500} autosize={() => true} value={commentParams.privite.content} className={pageStyle.textareabox} onChange={priviteContentChange} style={{ minHeight: '100px' }} />
<TextArea maxlength={500} autoSize={() => true} value={commentParams.privite.content} className={pageStyle.textareabox} onChange={priviteContentChange} style={{ minHeight: '100px' }} />
<div className={pageStyle.wordcount}>{commentParams.privite.content.length}/500</div>
</div>
{((commentParams.privite.audio && commentParams.privite.audio.length > 0) || commentParams.privite.audio.src) &&
......
src/pages/index/index.js
View file @ 70240ceb
......@@ -427,8 +427,8 @@ class StaticCenter extends React.Component {
<div style={{ width: '100%', height: '450px' }}>
<Chart
data={dv}
width="1000"
height="400"
width={1000}
height={400}
scale={cols}
padding="auto"
forceFit
......
src/pages/newtheme/ThemeEditor.js
View file @ 70240ceb
......@@ -55,7 +55,7 @@ class ThemeEditor extends React.Component {
case 'text':
return (
<div className={pageStyle.textWrap}>
<TextArea autosize={{ minRows: 4, maxRows: 10 }} value={item.value} onChange={e => editorChange(e, index)} placeholder="请输入内容" style={{ width: 560 }} maxLength={500} />
<TextArea autoSize={{ minRows: 4, maxRows: 10 }} value={item.value} onChange={e => editorChange(e, index)} placeholder="请输入内容" style={{ width: 560 }} maxLength={500} />
<div className={pageStyle.sizeNumber}>{item.value.length}/500</div>
<div className={pageStyle.toolList}>
{ index === 0 && <div aria-disabled="true" className={pageStyle.noup}><img src={upImg} alt="" /> </div> }
......
src/pages/officialweb/pagecomponent/SchoolInfoEditor.js
View file @ 70240ceb
......@@ -141,8 +141,8 @@ class SchoolInfoEditorForm extends React.Component {
onCancel={this.handleCancel}
cancelText="取消"
okText="确认"
width="1300px"
height="666px"
width={1300}
height={666}
bodyStyle={{ padding: '24px 0' }}
>
<ChoosePosition />
......
src/pages/register/user-info.js
View file @ 70240ceb
......@@ -192,7 +192,7 @@ class LoginForm extends React.Component {
{ required: true, message: '请输入您遇到的问题!' },
],
})(
<TextArea placeholder="请输入你遇到的问题" autosize />,
<TextArea placeholder="请输入你遇到的问题" autoSize />,
)}
</FormItem>}
<FormItem>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment