|
@@ -1,7 +1,7 @@
|
|
|
import React, { Component } from 'react';
|
|
|
import style from './index.less';
|
|
|
import { Tab, ConfirmModal, Notify } from '@commonComp';
|
|
|
-import { tabChange, allChecked, changeVisible, keepPushData, allCheckedShow,allCheckedAdmin,allCheckedShowAdmin,whichTemp,floderSlide,floderAction,folderModal } from '@store/actions/tabTemplate';
|
|
|
+import { tabChange, allChecked, changeVisible, keepPushData, allCheckedShow,allCheckedAdmin,allCheckedShowAdmin,whichTemp,floderSlide,floderAction,folderModal,clearSearchTemplateNorms } from '@store/actions/tabTemplate';
|
|
|
import { initItemList,initAdminItemList, delItem,delItemAdmin, delBatchItem, delBatchItemAdmin,changeTitleAsync, setPageView,changeTitleAsyncAdmin,setPageViewAdmin,getFloderList,delFloder } from '@store/async-actions/tabTemplate';
|
|
|
import { connect } from "react-redux";
|
|
|
import store from '@store';
|
|
@@ -69,6 +69,7 @@ class PushContainer extends Component {
|
|
|
this.makeSure = this.makeSure.bind(this)
|
|
|
this.handleClose = this.handleClose.bind(this);
|
|
|
this.templateSearch = this.templateSearch.bind(this);
|
|
|
+ this.clearTemplateSearch = this.clearTemplateSearch.bind(this)
|
|
|
this.whichTemp = this.whichTemp.bind(this);
|
|
|
this.floderSlideToggle = this.floderSlideToggle.bind(this);
|
|
|
this.floderRename = this.floderRename.bind(this);
|
|
@@ -80,8 +81,12 @@ class PushContainer extends Component {
|
|
|
// const height = getWindowInnerHeight()-160;
|
|
|
// this.$cont.current.style.height = height+"px";
|
|
|
}
|
|
|
- templateSearch(name){
|
|
|
- store.dispatch(initItemList(1,name));
|
|
|
+
|
|
|
+ templateSearch(name,selectTemp){
|
|
|
+ store.dispatch(initItemList(1,name,selectTemp));
|
|
|
+ }
|
|
|
+ clearTemplateSearch(){
|
|
|
+ store.dispatch(clearSearchTemplateNorms());
|
|
|
}
|
|
|
/**
|
|
|
*
|
|
@@ -436,7 +441,7 @@ class PushContainer extends Component {
|
|
|
store.dispatch(folderModal(flg))
|
|
|
}
|
|
|
render() {
|
|
|
- const { activeId, checkItems,selectTemp,folderListContentArr, visible, showMsg,hasMore,current,floderListAdmin, items, allCheckShow,allCheckShowAdmin,adminItems,admin,checkItemsAdmin,clearSearch } = this.props;
|
|
|
+ const { activeId, checkItems,selectTemp,folderListContentArr, visible, showMsg,hasMore,current,floderListAdmin, items, allCheckShow,allCheckShowAdmin,adminItems,admin,checkItemsAdmin,clearSearch, templateNormsSearchList} = this.props;
|
|
|
const { type,okBorderColor,okColor,oKBg,okText,message,folderListShow } = this.state
|
|
|
return <div className={style["container"]} ref={this.$cont} >
|
|
|
<Tab tabs={this.state.tabs}
|
|
@@ -474,6 +479,8 @@ class PushContainer extends Component {
|
|
|
floderDelete={this.floderDelete}
|
|
|
floderRename={this.floderRename}
|
|
|
folderListContentArr={folderListContentArr}
|
|
|
+ templateNormsSearchList={templateNormsSearchList}
|
|
|
+ clearTemplateSearch={this.clearTemplateSearch}
|
|
|
></TemplateItems>
|
|
|
<MedicalInfoContainer></MedicalInfoContainer>
|
|
|
</TemplateContainer>
|
|
@@ -551,7 +558,7 @@ const mapStateToProps = (state) => {//console.log(state)
|
|
|
selectTemp:state.tabTemplate.selectTemp,
|
|
|
floderListAdmin:state.tabTemplate.floderListAdmin,
|
|
|
folderListContentArr:state.tabTemplate.folderListContentArr,
|
|
|
-
|
|
|
+ templateNormsSearchList: state.tabTemplate.templateNormsSearchList
|
|
|
}
|
|
|
}
|
|
|
|