Skip to content

X
xiaomai-cloud-class-web
Commit 35800da9 by maolipeng
Options

Merge branch 'feature/zhujian/0726/qwLiving' into rc

parents 25bfaae2 2dce78a9
Showing with 89 additions and 20 deletions
src/modules/common/CourseCatalogSelect.jsx
......@@ -42,6 +42,7 @@ function CourseCatalogSelect(props) {
return (
<TreeSelect
className={props.className}
treeNodeLabelProp='categoryName'
showSearch={showSearch}
treeNodeFilterProp={treeNodeFilterProp}
......
src/modules/course-manage/components/AddLiveBasic.jsx
......@@ -106,8 +106,8 @@ class AddLiveBasic extends React.Component {
<span className='label'>
<span className='require'>*</span>课程名称：
</span>
<div id="courseName" style={_.find(this.props.exItems,(item)=>{return item === "courseName"})?{border:"1px solid red",display:"inline-block"}:{display:"inline-block"}}>
<Input
className={_.find(this.props.exItems,(item)=>{return item === "courseName"})?"err":""}
value={courseName}
placeholder={`请输入直播名称(${this.state.courseNameLimit}字以内)`}
maxLength={this.state.courseNameLimit}
......@@ -116,7 +116,6 @@ class AddLiveBasic extends React.Component {
this.props.onChange('courseName', e.target.value)
}}
/>
</div>
</div>
<div className='course-cover'>
<span className='label'>封面图：</span>
......@@ -147,14 +146,13 @@ class AddLiveBasic extends React.Component {
<span className='label'>
<span className='require'>*</span>课程分类：
</span>
<div style={_.find(this.props.exItems,(item)=>{return item === "categoryId"})?{border:"1px solid red",display:"inline-block"}:{display:"inline-block"}}>
<CourseCatalogSelect
className={_.find(this.props.exItems,(item)=>{return item === "categoryId"})?"err":""}
value={categoryId}
onChange={(value, label) => {
this.handleChangeCatalogList(value, label)
}}
/>
</div>
</div>
{showSelectFileModal && (
<SelectPrepareFileModal
......
src/modules/course-manage/components/AddLiveBasic.less
......@@ -66,6 +66,30 @@
.course-catalog {
margin: 20px 0 0 14px;
}
//输入框异常项
.err.ant-input:hover {
border-color: #FF4F4F;
}
.err.ant-input:focus {
border-color: #FF4F4F !important;
box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
}
.err.ant-input {
border-color: #FF4F4F;
}
//下拉选择异常项
.err.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
border-color: #FF4F4F;
box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
}
.err.ant-select:not(.ant-select-disabled):hover {
.ant-select-selector {
border-color: #FF4F4F;
}
}
.err.ant-select:not(.ant-select-customize-input) .ant-select-selector {
border-color: #FF4F4F;
}
}
.ant-cascader-menu-item-active:not(.ant-cascader-menu-item-disabled) {
font-weight: normal !important;
......
src/modules/course-manage/components/AddLiveClassInfoWorkWX.jsx
......@@ -209,8 +209,9 @@ export default function AddLiveClassInfoWorkWX(props) {
<div className="AddLiveClassInfoWorkWX">
<div className="begin-time item">
<span className="label"><span className="require">*</span>开始时间：</span>
<div id="startTime" style={_.find(props.exItems,(item)=>{return item === "startTime"})?{border:"1px solid red",display:"inline-block"}:{display:"inline-block"}}>
<div id="startTime" style={{display:"inline-block"}}>
<DatePicker
className={_.find(props.exItems,(item)=>{return item === "startTime"})?"err":""}
placeholder="请选择开始日期"
value={beginDate===0?undefined:moment(beginDate)}
onChange={onBeginDateChange}
......@@ -219,6 +220,7 @@ export default function AddLiveClassInfoWorkWX(props) {
style={{width:"180px"}}
/>
<TimePicker
className={_.find(props.exItems,(item)=>{return item === "startTime"})?"err":""}
value={beginTime===0?undefined:moment(beginTime)}
onChange={onBeginTimeChange}
onOk={onBeginTimeOK}
......@@ -226,6 +228,7 @@ export default function AddLiveClassInfoWorkWX(props) {
format="HH:mm"
style={{width:"120px"}}
/>
<div style={{position:"absolute"}}></div>
</div>
</div>
......@@ -234,8 +237,9 @@ export default function AddLiveClassInfoWorkWX(props) {
cusTime || props.type === "edit" ? (
<>
<span className="label"><span className="require">*</span>结束时间：</span>
<div id="endTime" style={_.find(props.exItems,(item)=>{return item === "endTime"})?{border:"1px solid red",display:"inline-block"}:{display:"inline-block"}}>
<div id="endTime" style={{display:"inline-block"}}>
<DatePicker
className={_.find(props.exItems,(item)=>{return item === "endTime"})?"err":""}
placeholder="请选择结束日期"
value={endDate===0?undefined:moment(endDate)}
onChange={onEndDateChange}
......@@ -246,6 +250,7 @@ export default function AddLiveClassInfoWorkWX(props) {
style={{width:"180px"}}
/>
<TimePicker
className={_.find(props.exItems,(item)=>{return item === "endTime"})?"err":""}
value={endTime === 0?moment().add(5,'minutes'):moment(endTime)}
onChange={onEndTimeChange}
onOk={onEndTimeOK}
......@@ -258,7 +263,7 @@ export default function AddLiveClassInfoWorkWX(props) {
) : (
<>
<span className="label"><span className="require">*</span>时长：</span>
<Select onChange={onDurationChange} defaultValue={60} style={{width:"140px"}} getPopupContainer={()=> document.getElementById("odqboqwdq")}>
<Select onChange={onDurationChange} defaultValue={60} style={{width:"140px"}} getPopupContainer={()=> document.getElementById("odqboqwdq")} className="eerr">
<Option value={30}>0.5小时</Option>
<Option value={60}>1.0小时</Option>
<Option value={120}>2.0小时</Option>
......@@ -272,10 +277,11 @@ export default function AddLiveClassInfoWorkWX(props) {
</div>
<div className="teacher item" id="ieouwowerwe">
<span className="label"><span className="require">*</span>讲师：</span>
<div id="teacherId" style={{display:"inline-block"}}>
<Select
value={teacherId}
onChange={onTeacherChange}
style={_.find(props.exItems,(item)=>{return item === "teacherId"})?{width:"240px",border:"1px solid red"}:{width:"240px"}}
className={_.find(props.exItems,(item)=>{return item === "teacherId"})?"err":""}
placeholder="请选择讲师"
disabled={!props.isEdit ? true: false}
......@@ -314,6 +320,7 @@ export default function AddLiveClassInfoWorkWX(props) {
})
}
</Select>
</div>
</div>
<div className="remind-time item" id="jfjfiemc">
<span className="label"><span className="require">*</span>提醒时间：</span>
......
src/modules/course-manage/components/AddLiveClassInfoWorkWX.less
......@@ -17,9 +17,18 @@
color: red;
}
}
// .ant-picker:hover .ant-picker-focused {
// border-color: red;
// }
//日期时间选择异常项
.err.ant-picker-focused {
border-color: #FF4F4F;
box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
}
.err.ant-picker:hover {
border-color: #FF4F4F;
}
.err.ant-picker {
border-color: #FF4F4F;
}
}
.introduce {
display: flex;
......@@ -28,12 +37,41 @@
color: #2966FF;
}
// .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
// border-color: red;
// box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
// }
// .ant-select:not(.ant-select-disabled):hover .ant-select-selector {
// border-color: red;
// .eerr .ant-select-focused:not(.ant-select-disabled) .ant-select:not(.ant-select-customize-input) {
// .ant-select-selector {
// border-color: red;
// box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
// }
// }
// .eerr .ant-select:not(.ant-select-disabled):hover {
// .ant-select-selector {
// border-color: red;
// }
// }
//下拉选择异常项
.err.ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector {
border-color: #FF4F4F;
box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
}
.err.ant-select:not(.ant-select-disabled):hover {
.ant-select-selector {
border-color: #FF4F4F;
}
}
.err.ant-select:not(.ant-select-customize-input) .ant-select-selector {
border-color: #FF4F4F;
}
//输入框异常项
.err.ant-input:hover {
border-color: #FF4F4F;
}
.err.ant-input:focus {
border-color: #FF4F4F;
box-shadow: 0 0 0 2px rgba(255,0,0,0.2);
}
.err.ant-input {
border-color: #FF4F4F;
}
}
\ No newline at end of file
src/modules/course-manage/components/LiveCourseList.jsx
......@@ -217,7 +217,7 @@ class LiveCourseList extends React.Component {
},
{
title: '上课状态',
width: '10%',
width: '115px',
key: 'couseCatalog',
dataIndex: 'couseCatalog',
render: (val, item) => {
......@@ -301,7 +301,7 @@ class LiveCourseList extends React.Component {
</Tooltip>
</span>
),
width: '9%',
width: '100px',
key: 'shelfState',
dataIndex: 'shelfState',
render: (val, item, index) => {
......
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