fix:merge

src/modules/knowledge-base/components/KnowledgeBaseList.jsx

@@ -464,9 +464,13 @@ class KnowledgeBaseList extends React.Component {
     }
     KnowledgeAPI.delKnowledge(params).then((res) => {
       if (res.success) {
-        message.success("移出成功")
-        this.props.onChange()
-        this.props.updateCategoryTree()
+        const { onChange, updateCategoryTree, selectedRowKeys, onSelectChange } = this.props;
+        message.success("移出成功");
+        onChange();
+        updateCategoryTree();
+        if (selectedRowKeys.includes(item.id)) {
+          onSelectChange(_.reject(selectedRowKeys, value => value === item.id));
+        }
       }
     })
   }

src/modules/teach-tool/modal/MoveModal.jsx

@@ -48,7 +48,6 @@ class MoveModal extends React.Component {
               showSearch
               treeNodeFilterProp="title"
               style={{ width: 240 }}
-              dropdownStyle={{ maxHeight: 220 }}
               treeData={moveData}
               placeholder="请选择分类"
               allowClear

src/modules/teach-tool/paper-manage/components/PaperList.jsx

@@ -200,15 +200,21 @@ class PaperList extends Component {
     AidToolService.deletePaper(params).then((res) => {
       if (res.success) {
         message.success("删除成功");
-        const { query, total } = this.state;
+        const { query, total, selectedPaperKeys } = this.state;
         const { size, current } = query;
         const _query = query;
+        let data = {};
+        
         if (total / size < current) {
           if (total % size === 1) {
             _query.current = 1;
           }
         }
-        this.setState({ query: _query }, () => {
+        data.query = _query;
+        if (selectedPaperKeys.includes(record.paperId)) {
+          data.selectedPaperKeys = _.reject(selectedPaperKeys, item => item === record.paperId);
+        }
+        this.setState(data, () => {
           this.queryPaperPageList();
           Bus.trigger("queryCategoryTree", "remain");
         });

src/modules/teach-tool/question-manage/components/QuestionList.jsx

@@ -177,6 +177,8 @@ class QuestionList extends Component {
       order: "UPDATED_DESC", // 排序规则
       questionName: null, // 题目名称
       questionType: null, // 题目类型
+      updateDateStart: null,
+      updateDateEnd: null,
     };
     this.setState({ query: _query }, () => {
       this.queryQuestionPageList();