Commit dfc0b2b7 by chenshu

fix:修复

parent 7d18863f
...@@ -46,6 +46,10 @@ export default function KnowledgeBaseOpt({ ...@@ -46,6 +46,10 @@ export default function KnowledgeBaseOpt({
queryCategoryTree(); queryCategoryTree();
}, []); }, []);
useEffect(() => {
clearSelect();
}, [categoryId])
// 查询分类树 // 查询分类树
function queryCategoryTree() { function queryCategoryTree() {
let query = { let query = {
...@@ -201,12 +205,12 @@ export default function KnowledgeBaseOpt({ ...@@ -201,12 +205,12 @@ export default function KnowledgeBaseOpt({
return ( return (
<div className="knowledge-course-opt"> <div className="knowledge-course-opt">
{_.isEmpty(selectedRowKeys) ? {_.isEmpty(selectedRowKeys) ?
<Dropdown overlay={menu}> (categoryId !== '0' && <Dropdown overlay={menu}>
<Button type="primary" className="mr8"> <Button type="primary" className="mr8">
添加知识 添加知识
<DownOutlined /> <DownOutlined />
</Button> </Button>
</Dropdown> </Dropdown>)
: <div className="select-container"> : <div className="select-container">
<span className="con"> <span className="con">
<div> <div>
......
...@@ -78,7 +78,6 @@ export default class KnowledgeBase extends React.Component { ...@@ -78,7 +78,6 @@ export default class KnowledgeBase extends React.Component {
message.warning('最多只能选择50个题目'); message.warning('最多只能选择50个题目');
return null; return null;
} }
console.log(selectedRowKeys, 888888)
this.setState({ selectedRowKeys }); this.setState({ selectedRowKeys });
}; };
...@@ -112,13 +111,13 @@ export default class KnowledgeBase extends React.Component { ...@@ -112,13 +111,13 @@ export default class KnowledgeBase extends React.Component {
<KnowledgeBaseFilter onChange={this.handleFetchScheduleList} /> <KnowledgeBaseFilter onChange={this.handleFetchScheduleList} />
{/* 操作模块 */} {/* 操作模块 */}
{categoryId != 0 && <KnowledgeBaseOpt <KnowledgeBaseOpt
onChange={this.handleFetchScheduleList} onChange={this.handleFetchScheduleList}
updateCategoryTree={this.updateCategoryTree} updateCategoryTree={this.updateCategoryTree}
categoryId={categoryId} categoryId={categoryId}
selectedRowKeys={selectedRowKeys} selectedRowKeys={selectedRowKeys}
onChangeKeys={(keys) => this.setState({ selectedRowKeys: keys })} onChangeKeys={(keys) => this.setState({ selectedRowKeys: keys })}
/>} />
{/* 知识库列表模块 */} {/* 知识库列表模块 */}
<KnowledgeBaseList <KnowledgeBaseList
......
...@@ -17,8 +17,8 @@ class MoveModal extends React.Component { ...@@ -17,8 +17,8 @@ class MoveModal extends React.Component {
filterData = (data, id) => { filterData = (data, id) => {
let newTreeData = data.map((item) => { let newTreeData = data.map((item) => {
(id === item.id) && (item.disabled = true); (id === item.id) && (item.disabled = true);
if (item.sonCategoryList) { if (item.children) {
item.children = this.filterData(item.sonCategoryList); item.children = this.filterData(item.children);
} }
return item; return item;
}); });
......
...@@ -63,6 +63,7 @@ class PaperList extends Component { ...@@ -63,6 +63,7 @@ class PaperList extends Component {
Bus.bind("queryPaperPageList", (selectedCategoryId, count) => { Bus.bind("queryPaperPageList", (selectedCategoryId, count) => {
selectedCategoryId = selectedCategoryId =
selectedCategoryId === "null" ? null : selectedCategoryId; selectedCategoryId === "null" ? null : selectedCategoryId;
this.clearSelect();
this.setState({ loading: true }); this.setState({ loading: true });
if (count >= 100) { if (count >= 100) {
setTimeout(() => { setTimeout(() => {
...@@ -560,10 +561,10 @@ class PaperList extends Component { ...@@ -560,10 +561,10 @@ class PaperList extends Component {
</div> </div>
</Row> </Row>
</div> </div>
{this.props.type !== "modal-select" && isPermiss && categoryId && ( {this.props.type !== "modal-select" && isPermiss && (
<div className="select-box"> <div className="select-box">
{_.isEmpty(selectedPaperKeys) ? {_.isEmpty(selectedPaperKeys) ?
<Button (!!categoryId && <Button
type="primary" type="primary"
className="mr8" className="mr8"
onClick={() => { onClick={() => {
...@@ -573,7 +574,7 @@ class PaperList extends Component { ...@@ -573,7 +574,7 @@ class PaperList extends Component {
}} }}
> >
新建试卷 新建试卷
</Button> </Button>)
: <div className="select-container"> : <div className="select-container">
<span className="con"> <span className="con">
<div> <div>
......
...@@ -99,6 +99,7 @@ class QuestionList extends Component { ...@@ -99,6 +99,7 @@ class QuestionList extends Component {
Bus.bind("queryQuestionPageList", (selectedCategoryId) => { Bus.bind("queryQuestionPageList", (selectedCategoryId) => {
selectedCategoryId = selectedCategoryId =
selectedCategoryId === "null" ? null : selectedCategoryId; selectedCategoryId === "null" ? null : selectedCategoryId;
this.clearSelect();
this.InitSearch(selectedCategoryId); this.InitSearch(selectedCategoryId);
}); });
} }
...@@ -681,15 +682,15 @@ class QuestionList extends Component { ...@@ -681,15 +682,15 @@ class QuestionList extends Component {
</Row> </Row>
</div> </div>
{["CloudManager", "StoreManager"].includes(User.getUserRole()) && {["CloudManager", "StoreManager"].includes(User.getUserRole()) &&
categoryId && ( (
<Space size={16}> <Space size={16}>
{_.isEmpty(selectedRowKeys) ? {_.isEmpty(selectedRowKeys) ?
[ (!!categoryId && [
<Button key="1" type="primary" onClick={this.handleCreateQuestion}> <Button key="1" type="primary" onClick={this.handleCreateQuestion}>
新建题目 新建题目
</Button>, </Button>,
<Button key="2" onClick={this.batchImportQuestion}>批量导入</Button> <Button key="2" onClick={this.batchImportQuestion}>批量导入</Button>
] ])
: <div className="select-container"> : <div className="select-container">
<span className="con"> <span className="con">
<div> <div>
......
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