zhuth 6 years ago
parent
commit
c829348c57

+ 1 - 1
src/components/authority/index.jsx

@@ -185,7 +185,7 @@ class MenuList extends React.Component {
             >
                 {list.filter(l => {
                     let reg = new RegExp('(' + filterLabel + '){1}', 'ig');
-                    return (l[displayField] || '').search(reg) !== -1;
+                    return ((l[displayField] || '').search(reg) !== -1 || l[valueField] === selectedKeys[0]);
                 }).slice(0, limit).map(l => (
                     <Menu.Item key={l[valueField]+''} onClick={() => {
                         typeof onItemClick === 'function' && onItemClick(l);

+ 2 - 1
src/components/common/dataPreview/dataPreview.jsx

@@ -63,7 +63,8 @@ class DataPreview extends React.Component {
                 bordered
                 columns={columns.map((c, i) => {
                     let obj = {
-                        ...c,
+                        title: c.label,
+                        dataIndex: c.name,
                         onCell: () => {
                             return {
                                 style: {

+ 0 - 1
src/components/dashboardDesigner/viewLayout.jsx

@@ -137,7 +137,6 @@ class ViewLayout extends React.PureComponent {
                 isResizable={editMode && !editingKey}
                 draggableHandle='.mover'
                 onLayoutChange={this.onLayoutChange}
-                onBreakpointChange={this.onBreakpointChange}
                 verticalCompact={true}
                 compactType='vertical'
             >

+ 10 - 0
src/components/homePage/index.jsx

@@ -12,6 +12,16 @@ const TabPane = Tabs.TabPane
 
 class Home extends React.Component {
 
+    componentWillUnmount() {
+        const { home, dispatch } = this.props;
+        const { tabs } = home;
+        // 离开页面后将报表中的图表配置移除,以保证下次进入时触发自动刷新
+        tabs.forEach(t => {
+            t.config = null;
+        });
+        dispatch({ type: 'home/setField', name: 'tabs', value: tabs });
+    }
+
     generateTabs() {
         const { home } = this.props;
         const { tabs } = home;

+ 3 - 0
src/models/dashboardDesigner.js

@@ -223,6 +223,9 @@ export default {
             const { layout } = action;
             let { items, dirty } = state;
             const ly = ['x', 'y', 'w', 'h'];
+            if(layout.length === 0 && layout[0].i === 'default-chartview') {
+                return state;
+            }
             for(let i = 0; i < items.length; i++) {
                 if(layout[i]) { // 非删除引起
                     for(let j = 0; j < ly.length; j ++) {

+ 3 - 2
src/models/home.js

@@ -120,8 +120,9 @@ export default {
             const { tabs } = home;
             const { code } = action;
             let idx = tabs.findIndex(t => t.code === code);
-            if(idx > -1) {
-                tabs[idx].config = { ...dashboardDesigner }
+            if(idx > -1 && !tabs[idx].config) {
+                // tabs[idx].config = { ...dashboardDesigner }
+                tabs[idx].config = JSON.parse(JSON.stringify(dashboardDesigner)) // 使用深复制
             }
             yield put({ type: 'setField', name: 'tabs', value: tabs });
         },

+ 1 - 1
src/models/logs.js

@@ -68,7 +68,7 @@ export default {
             const { pageNum, pageSize } = action;
             const body = {
                 pageNum: pageNum || 1,
-                pageSize: pageSize || 999
+                pageSize: pageSize || 99999999
             }
             try{
                 // const logs = yield select(state => state.present.logs);