|
@@ -88,20 +88,7 @@ const defaultState = fromJS({
|
|
|
],
|
|
|
});
|
|
|
|
|
|
-function refreshColumns(columnsVisible,columns){
|
|
|
- let columnsBak=[];
|
|
|
- columnsBak.push(columns[1]);
|
|
|
- for (var i = 0; i < columnsVisible.length; i++) {
|
|
|
- if(columnsVisible[i].columnsValue){
|
|
|
- columnsBak.push({
|
|
|
- title: columnsVisible[i].columnsName,
|
|
|
- dataIndex: columnsVisible[i].dataKey,
|
|
|
- key: columnsVisible[i].dataKey,
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- return columnsBak;
|
|
|
-};
|
|
|
+
|
|
|
|
|
|
export default (state = defaultState, action) => {
|
|
|
let columns = state.get('columns').toJS();
|
|
@@ -124,7 +111,6 @@ export default (state = defaultState, action) => {
|
|
|
var isAccept = localStorage.getItem("contact_company_Column_" + i);
|
|
|
if (isAccept === 'false') {
|
|
|
columnsVisible[i].columnsValue = false;
|
|
|
- //columns.splice(ci,1);
|
|
|
}
|
|
|
}
|
|
|
var columnsBak=refreshColumns(columnsVisible,columns);
|
|
@@ -133,7 +119,6 @@ export default (state = defaultState, action) => {
|
|
|
columnsVisible: fromJS(columnsVisible),
|
|
|
columns: fromJS(columnsBak)
|
|
|
});
|
|
|
- //return state.set('columnsVisible', fromJS(columnsVisible));
|
|
|
//读取锁定-获得客户data
|
|
|
case constants.CHANGE_COMPANY_LOADING:
|
|
|
return state.set('loading', action.data);
|
|
@@ -156,24 +141,20 @@ export default (state = defaultState, action) => {
|
|
|
default:
|
|
|
return state;
|
|
|
}
|
|
|
- // switch(action.type) {
|
|
|
- // case constants.SEARCH_FOCUS:
|
|
|
- // return state.set('focused', true);
|
|
|
- // case constants.SEARCH_BLUR:
|
|
|
- // return state.set('focused', false);
|
|
|
- // case constants.CHANGE_LIST:
|
|
|
- // return state.merge({
|
|
|
- // list: action.data,
|
|
|
- // totalPage: action.totalPage
|
|
|
- // });
|
|
|
- // case constants.MOUSE_ENTER:
|
|
|
- // return state.set('mouseIn', true);
|
|
|
- // case constants.MOUSE_LEAVE:
|
|
|
- // return state.set('mouseIn', false);
|
|
|
- // case constants.CHANGE_PAGE:
|
|
|
- // return state.set('page', action.page);
|
|
|
- // default:
|
|
|
- // return state;
|
|
|
- // }
|
|
|
+}
|
|
|
|
|
|
-}
|
|
|
+
|
|
|
+function refreshColumns(columnsVisible,columns){
|
|
|
+ let columnsBak=[];
|
|
|
+ columnsBak.push(columns[1]);
|
|
|
+ for (var i = 0; i < columnsVisible.length; i++) {
|
|
|
+ if(columnsVisible[i].columnsValue){
|
|
|
+ columnsBak.push({
|
|
|
+ title: columnsVisible[i].columnsName,
|
|
|
+ dataIndex: columnsVisible[i].dataKey,
|
|
|
+ key: columnsVisible[i].dataKey,
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return columnsBak;
|
|
|
+};
|