Skip to content

X
xiaomai-cloud-class-web
Commit ea911237 by guomingpang
Options

Merge branch 'feat/pangguoming/20210528/external_courses' into rc

parents 08db43e4 2499826b
Showing with 38 additions and 44 deletions
src/modules/course-manage/graphics-course/components/GraphicsCourseList.less
.video-course-list { .video-course-list {
margin-top: 12px; margin-top: 12px;
.video-list-table{ .video-list-table {
tbody { tbody {
tr{ tr {
&:nth-child(even){ &:nth-child(even) {
background: transparent !important; background: transparent !important;
td{ td {
background:#FFF !important; background: #fff !important;
} }
} }
&:nth-child(odd){ &:nth-child(odd) {
background: #FAFAFA !important; background: #fafafa !important;
td{ td {
background: #FAFAFA !important; background: #fafafa !important;
} }
} }
&:hover{ &:hover {
td{ td {
background:#F3f6fa !important; background: #f3f6fa !important;
} }
} }
} }
} }
} }
.watchUserCount{ .watchUserCount {
text-align:right; text-align: right;
padding:16px; padding: 16px;
} }
.operate-text { .operate-text {
color: #5289FA; color: #5289fa;
cursor: pointer; cursor: pointer;
} }
.operate { .operate {
display: flex; display: flex;
&__item { &__item {
color: #5289FA; color: #5289fa;
cursor: pointer; cursor: pointer;
&.split { &.split {
margin: 0 8px; margin: 0 8px;
color: #BFBFBF; color: #bfbfbf;
} }
} }
} }
.more-operate{ .more-operate {
line-height:20px; line-height: 20px;
} }
.record__item { .record__item {
display: flex; display: flex;
...@@ -56,21 +56,20 @@ ...@@ -56,21 +56,20 @@
height: 50px; height: 50px;
border-radius: 2px; border-radius: 2px;
margin-right: 8px; margin-right: 8px;
background-color: #666; // background-color: #666;
} }
.course-name { .course-name {
color: #666; color: #666;
width:188px; width: 188px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
height:48px; height: 48px;
} }
} }
} }
.video-course-more-menu { .video-course-more-menu {
...@@ -85,4 +84,4 @@ ...@@ -85,4 +84,4 @@
background: #f3f6fa; background: #f3f6fa;
} }
} }
} }
\ No newline at end of file
src/modules/course-manage/video-course/components/VideoCourseFilter.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-08-05 10:11:57 * @Date: 2020-08-05 10:11:57
* @LastEditors: fusanqiasng * @LastEditors: fusanqiasng
* @LastEditTime: 2021-05-28 15:38:11 * @LastEditTime: 2021-05-28 20:14:37
* @Description: 视频课-搜索模块 * @Description: 视频课-搜索模块
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -78,14 +78,7 @@ class VideoCourseFilter extends React.Component { ...@@ -78,14 +78,7 @@ class VideoCourseFilter extends React.Component {
renderTreeNodes = (data) => { renderTreeNodes = (data) => {
let newTreeData = data.map((item) => { let newTreeData = data.map((item) => {
item.title = ( item.title = <span>{item.categoryName}</span>
<span>
<span className='icon iconfont' style={{ color: '#FBD140' }}>
&#xe7f1;&nbsp;
</span>
{item.categoryName}
</span>
)
item.key = item.id item.key = item.id
if (item.sonCategoryList) { if (item.sonCategoryList) {
item.children = this.renderTreeNodes(item.sonCategoryList) item.children = this.renderTreeNodes(item.sonCategoryList)
...@@ -194,7 +187,6 @@ class VideoCourseFilter extends React.Component { ...@@ -194,7 +187,6 @@ class VideoCourseFilter extends React.Component {
categoryList, categoryList,
} = this.state } = this.state
console.log('categoryList', categoryList)
return ( return (
<div className='video-course-filter'> <div className='video-course-filter'>
<Row type='flex' justify='space-between' align='top'> <Row type='flex' justify='space-between' align='top'>
...@@ -276,8 +268,8 @@ class VideoCourseFilter extends React.Component { ...@@ -276,8 +268,8 @@ class VideoCourseFilter extends React.Component {
treeNodeFilterProp='categoryName' treeNodeFilterProp='categoryName'
showSearch showSearch
value={categoryId || null} value={categoryId || null}
style={{ width: 'calc(100% - 75px)' }} style={{ minWidth: 'calc(100% - 75px)' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownMatchSelectWidth={false}
treeData={categoryList} treeData={categoryList}
placeholder='请选择课程分类' placeholder='请选择课程分类'
allowClear allowClear
......
src/modules/course-manage/video-course/components/VideoCourseList.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2020-08-05 10:12:45 * @Date: 2020-08-05 10:12:45
* @LastEditors: fusanqiasng * @LastEditors: fusanqiasng
<<<<<<< HEAD <<<<<<< HEAD
* @LastEditTime: 2021-05-28 14:01:36 * @LastEditTime: 2021-05-28 16:17:35
======= =======
<<<<<<< Updated upstream <<<<<<< Updated upstream
* @LastEditTime: 2021-05-27 17:48:31 * @LastEditTime: 2021-05-27 17:48:31
...@@ -463,11 +463,11 @@ class VideoCourseList extends React.Component { ...@@ -463,11 +463,11 @@ class VideoCourseList extends React.Component {
) )
} }
render() { render() {
const { dataSource = [], totalCount, query } = this.props const { dataSource = [], totalCount, query, type } = this.props
const { current, size } = query const { current, size } = query
const { RelatedPlanModalVisible, selectPlanList, selectCourseId } = this.state const { RelatedPlanModalVisible, selectPlanList, selectCourseId } = this.state
return ( return (
<div className='video-course-list'> <div className={`video-course-list ${type !== 'internal' ? 'video-course-list-mt' : ''}`}>
<Table <Table
rowKey={(record) => record.id} rowKey={(record) => record.id}
dataSource={dataSource} dataSource={dataSource}
......
src/modules/course-manage/video-course/components/VideoCourseList.less
.video-course-list { .video-course-list {
margin-top: 12px; margin-top: 12px;
&.video-course-list-mt {
margin-top: 4px;
}
.video-list-table { .video-list-table {
tbody { tbody {
tr { tr {
...@@ -56,7 +59,7 @@ ...@@ -56,7 +59,7 @@
height: 50px; height: 50px;
border-radius: 2px; border-radius: 2px;
margin-right: 8px; margin-right: 8px;
background-color: #666; // background-color: #666;
} }
.course-name { .course-name {
......
src/modules/knowledge-base/modal/AddCourse.jsx
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: zangsuyun * @Author: zangsuyun
* @Date: 2021-03-13 09:54:26 * @Date: 2021-03-13 09:54:26
* @LastEditors: fusanqiasng * @LastEditors: fusanqiasng
* @LastEditTime: 2021-05-28 15:35:33 * @LastEditTime: 2021-05-28 20:19:06
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -890,7 +890,8 @@ class AddCourse extends React.Component { ...@@ -890,7 +890,8 @@ class AddCourse extends React.Component {
<TreeSelect <TreeSelect
treeNodeFilterProp='categoryName' treeNodeFilterProp='categoryName'
showSearch showSearch
style={{ width: 'calc(100% - 75px)' }} style={{ minWidth: 'calc(100% - 75px)' }}
dropdownMatchSelectWidth={false}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={videoCourseDivision === 'internal' ? categoryList : categoryListExternal} treeData={videoCourseDivision === 'internal' ? categoryList : categoryListExternal}
placeholder='请选择课程类型' placeholder='请选择课程类型'
......
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