|
@@ -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,clearSearchTemplateNorms } from '@store/actions/tabTemplate';
|
|
|
+import { tabChange, allChecked, changeVisible, keepPushData, allCheckedShow,allCheckedAdmin,allCheckedShowAdmin,whichTemp,floderSlide,floderAction,folderModal,clearSearchTemplateNorms,folderOrder } from '@store/actions/tabTemplate';
|
|
|
import { initItemList,initAdminItemList, delItem,delItemAdmin, delBatchItem, delBatchItemAdmin,changeTitleAsync, setPageView,changeTitleAsyncAdmin,setPageViewAdmin,getFloderList,delFloder,addTemplateQuote } from '@store/async-actions/tabTemplate';
|
|
|
import { connect } from "react-redux";
|
|
|
import store from '@store';
|
|
@@ -76,7 +76,8 @@ class PushContainer extends Component {
|
|
|
this.floderRename = this.floderRename.bind(this);
|
|
|
this.handleInputFloder = this.handleInputFloder.bind(this);
|
|
|
this.setFolderId = this.setFolderId.bind(this);
|
|
|
- this.floderDelete = this.floderDelete.bind(this)
|
|
|
+ this.floderDelete = this.floderDelete.bind(this);
|
|
|
+ this.folderManage = this.folderManage.bind(this);
|
|
|
}
|
|
|
componentDidMount() {
|
|
|
// const height = getWindowInnerHeight()-160;
|
|
@@ -455,6 +456,9 @@ class PushContainer extends Component {
|
|
|
newFolder(flg){
|
|
|
store.dispatch(folderModal(flg))
|
|
|
}
|
|
|
+ folderManage(flg) {
|
|
|
+ store.dispatch(folderOrder(flg))
|
|
|
+ }
|
|
|
render() {
|
|
|
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
|
|
@@ -507,7 +511,7 @@ class PushContainer extends Component {
|
|
|
title={type==5?'重命名文件夹':type==3?'修改模板':null}
|
|
|
cancel={this.handleClose}
|
|
|
okText={okText}
|
|
|
- width={type==5||type==3?500:300}
|
|
|
+ width={type==5 ? 500: type==3?580:300}
|
|
|
height={type==3&&admin?280:200}
|
|
|
okBorderColor={okBorderColor}
|
|
|
okColor={okColor}
|
|
@@ -542,7 +546,7 @@ class PushContainer extends Component {
|
|
|
</ul>
|
|
|
}
|
|
|
<span className={style.newFolder} onClick={()=>this.newFolder(true)}>新建文件夹</span>
|
|
|
- {/* <span className={style.mangerFolder}>管理文件夹</span> */}
|
|
|
+ <span className={style.mangerFolder} onClick={()=>this.folderManage(true)}>管理文件夹</span>
|
|
|
</div>:null
|
|
|
}
|
|
|
</ConfirmModal>
|