dev_aliyun2
harry 5 years ago
parent 462433847c
commit 9276b40c72

@ -24,8 +24,8 @@ export default ({ current, defaultCurrent, total, pageSize, onChange = noop }) =
return ( return (
<div className="mini-pagination"> <div className="mini-pagination">
<a class={page === 1 ? 'disabled' : 'normal'} onClick={prev}>上一页</a> <a className={page === 1 ? 'disabled' : 'normal'} onClick={prev}>上一页</a>
<a class={page === maxPage ? 'disabled' : 'normal'} onClick={next} >下一页</a> <a className={page === maxPage ? 'disabled' : 'normal'} onClick={next} >下一页</a>
</div> </div>
) )

@ -1,19 +1,10 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import axios from 'axios'; import axios from 'axios';
import TPMIndexHOC from '../tpm/TPMIndexHOC'; import TPMIndexHOC from '../tpm/TPMIndexHOC';
import UpgradeModals from '../modals/UpgradeModals'; import UpgradeModals from '../modals/UpgradeModals';
import { SnackbarHOC, getImageUrl, configShareForIndex } from 'educoder'; import { SnackbarHOC, getImageUrl, configShareForIndex } from 'educoder';
import './home.css'; import './home.css';
import { Tooltip, Spin, Slider, Rate } from 'antd'; import { Tooltip, Spin, Slider, Rate } from 'antd';
const $ = window.$; const $ = window.$;
@ -246,7 +237,7 @@ class ShixunsHome extends Component {
{homedatalist === undefined ? "" : homedatalist.subjects.map((item, key) => { {homedatalist === undefined ? "" : homedatalist.subjects.map((item, key) => {
if (key < 8) if (key < 8)
return ( return (
<div className="square-Item" key={key} id={item.id} style={{ 'width': '286px', 'margin-right': '20px' }}> <div className="square-Item" key={key} id={item.id} style={{ 'width': '286px', 'marginRight': '20px' }}>
{item.excellent === false ? "" : {item.excellent === false ? "" :
<div className="tag-orange"> <div className="tag-orange">
@ -364,7 +355,7 @@ class ShixunsHome extends Component {
</style> </style>
{homedatalist === undefined ? "" : homedatalist.shixuns.map((item, key) => { {homedatalist === undefined ? "" : homedatalist.shixuns.map((item, key) => {
return ( return (
<div className="square-Item" key={key} id={item.id} style={{ 'width': '286px', 'margin-right': '20px' }}> <div className="square-Item" key={key} id={item.id} style={{ 'width': '286px', 'marginRight': '20px' }}>
<div className="tag-green taglistleft"> <div className="tag-green taglistleft">
<span className="tag-name"> {item.tag_name}</span> <span className="tag-name"> {item.tag_name}</span>

@ -29,9 +29,6 @@ class CheckBoxGroup extends Component {
this.options = options; this.options = options;
return ( return (
<Form.Item> <Form.Item>
<Checkbox.Group>
</Checkbox.Group>
{options.map((option, index) => { {options.map((option, index) => {
const val = itemValueFunction ? itemValueFunction(option, index) : option[newItemValueName]; const val = itemValueFunction ? itemValueFunction(option, index) : option[newItemValueName];
return (<Checkbox key={index} return (<Checkbox key={index}
@ -40,11 +37,7 @@ class CheckBoxGroup extends Component {
onChange={this.handleChange(index, val)} onChange={this.handleChange(index, val)}
color="primary" color="primary"
classes={{ >{itemLabelFunction ? itemLabelFunction(option, index) : option[newItemLabelName]}</Checkbox>)
root: this.props.classes.radio,
checked: this.props.classes.checked
}}
>itemLabelFunction ? itemLabelFunction(option, index) : option[newItemLabelName]</Checkbox>)
}) })
} }
</Form.Item> </Form.Item>

@ -8,7 +8,6 @@
*/ */
import './index.less'; import './index.less';
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Spin, Button } from 'antd';
function RightPane(props) { function RightPane(props) {
const { const {
status, status,
@ -18,17 +17,17 @@ function RightPane(props) {
loading loading
} = props; } = props;
const loadInit = (
<div className="jupyter_loading_init">
{/*<Spin tip="加载中..."></Spin>*/}
</div>
)
const [renderCtx, setRenderCtx] = useState(() => loadInit); const [renderCtx, setRenderCtx] = useState(() => loadInit);
// 重新获取 url // 重新获取 url
const handleClickReload = () => { const handleClickReload = () => {
onReloadUrl && onReloadUrl(); onReloadUrl && onReloadUrl();
} }
const loadInit = (
<div className="jupyter_loading_init">
{/*<Spin tip="加载中..."></Spin>*/}
</div>
);
const loadError = ( const loadError = (
<div className="jupyter_load_url_error"> <div className="jupyter_load_url_error">
@ -66,13 +65,6 @@ function RightPane(props) {
className='jupyter_iframe_style' className='jupyter_iframe_style'
></iframe> ></iframe>
</div> </div>
{/*<div className="jupyter_submit">*/}
{/* <Button*/}
{/* loading={loading}*/}
{/* type="primary"*/}
{/* onClick={handleClickSubmit}*/}
{/* >保存</Button>*/}
{/*</div>*/}
</div> </div>
)); ));

@ -61,8 +61,8 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
function overlayMenu(item, id) { function overlayMenu(item, id) {
return <Menu> return <Menu>
{ {
item.map((list, k) => <Menu.Item> item.map((list, k) => <Menu.Item key={list.id}>
<div className="mt5 subshaicontent-part" key={k}> <div className="mt5 subshaicontent-part" >
<a style={{ height: '20px' }} className={"mb15 shixun_repertoire color-dark"} name={list.id} id={id} onClick={getChildValue}>{list.name}</a> <a style={{ height: '20px' }} className={"mb15 shixun_repertoire color-dark"} name={list.id} id={id} onClick={getChildValue}>{list.name}</a>
<div className="sub-Item clearfix"> <div className="sub-Item clearfix">
{ {
@ -110,7 +110,7 @@ export default ({ StatusEnquiry, allUpdatashixunlist, Updatasearchlist }) => {
<div className="clearfix"> <div className="clearfix">
<span className="shaiTitle fl">筛选</span> <span className="shaiTitle fl">筛选</span>
<div className="fl pr shaiAllItem mt1"> <div className="fl pr shaiAllItem mt1">
{DiffObject.map(item => <A {...item} callback={diffSearch} activeId={diff} />)} {DiffObject.map(item => <A key={item.id} {...item} callback={diffSearch} activeId={diff} />)}
</div> </div>
</div> </div>

Loading…
Cancel
Save