Commit dfc0b2b7 by chenshu

fix:修复

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