bug

src/components/PushContainer/index.jsx

@@ -2,7 +2,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,clearSearchTemplateNorms } from '@store/actions/tabTemplate';
-import { initItemList,initAdminItemList, delItem,delItemAdmin, delBatchItem, delBatchItemAdmin,changeTitleAsync, setPageView,changeTitleAsyncAdmin,setPageViewAdmin,getFloderList,delFloder,addTemplateQuote } from '@store/async-actions/tabTemplate';
+import { initItemList,initAdminItemList, delItem,delItemAdmin, delBatchItem, delBatchItemAdmin,changeTitleAsync, setPageView,changeTitleAsyncAdmin,setPageViewAdmin,getFloderList,delFloder,addTemplateQuote,findTemplateNorms } from '@store/async-actions/tabTemplate';
 import { connect } from "react-redux";
 import store from '@store';
 import { billing } from '@store/async-actions/pushMessage';
@@ -429,9 +429,13 @@ class PushContainer extends Component {
       hasCalcIndex: false
     })
   }
-  whichTemp(tab){
+  whichTemp(tab,name){
+    if(tab!=2||!name){
+      store.dispatch(initAdminItemList(1,true))
+    }else{
+      this.templateSearch(name,2)
+    }
     store.dispatch(whichTemp(tab))
-    store.dispatch(initAdminItemList(1,true))
   }
   floderSlideToggle(id){
     store.dispatch(floderSlide(id))

src/components/TemplateItems/index.jsx

@@ -342,7 +342,7 @@ class TemplateItems extends React.Component {
                                     {
                                         !admin?!allCheckShowAdmin&&<div 
                                             className={`${style.personalTmp} ${style.personalTmpStatand} ${selectTemp==2?style.personalTmpOwn:''}`} 
-                                            onClick={()=>{whichTemp(2);allCheckShow&&handleMangerTemplate()}}
+                                            onClick={()=>{whichTemp(2,(this.state.val).trim());allCheckShow&&handleMangerTemplate(2)}}
                                             >标准模板 {selectTemp==2&&<img src={tempTip} className={style.tempTip} alt="" onMouseEnter={this.showTipContent} onMouseLeave={this.showTipContent}/>}
                                             {
                                                 showTipContent&&<div className={style.tempTipContent}>

src/store/async-actions/tabTemplate.js

@@ -26,7 +26,7 @@ import {
   didPushParamChange
 } from '@utils/tools';
 import { billing } from '@store/async-actions/pushMessage';
-import { func } from 'prop-types';
+
 
 export const initItemList = (current,name,selectTemp) => {
   let admin = store.getState().homePage.admin;
@@ -473,7 +473,7 @@ export const getDepartments = (value) => { //获取模板结构化数据
     })
   }
 };
-export const findTemplateNorms = (name) => {
+export const findTemplateNorms = (name) => {//标准模板搜索
     return (dispatch) => {
       if(!name) {
         dispatch(setSearchTemplateNorms([]));
@@ -496,17 +496,17 @@ export const findTemplateNorms = (name) => {
 }
 
 export const getFloderListAll = () => {
-  return (dispatch) => {
-    axios.json('/templateAdmin/getTemplateNorms').then((res) => {
-      const data = res.data;
-      if (data.code == 0) {
-        // data.data.flg = flg||false  //获取下一页，暂时不用
-        dispatch(initAdminItems(data.data));
-      } else {
-        Notify.error(data.msg)
-      }
-    })
-  }
+    return (dispatch) => {
+      axios.json('/templateAdmin/getTemplateNorms').then((res) => {
+        const data = res.data;
+        if (data.code == 0) {
+          // data.data.flg = flg||false  //获取下一页，暂时不用
+          dispatch(initAdminItems(data.data));
+        } else {
+          Notify.error(data.msg)
+        }
+      })
+    }
 }
 
 export const addTemplateQuote = (templateId) => {