bug处理代码提交

src/components/dashboardDesigner/viewLayout.jsx

@@ -49,7 +49,7 @@ class ViewLayout extends React.PureComponent {
                         }}/>}
                         {!isPreview && viewType !== 'richText' && <Icon className={iconCls} type="arrows-alt" onClick={() => this.showPreviewBox(item)}/>}
                         {editMode && !isPreview && item.creatorCode === currentUser.code && viewType !== 'richText' &&  <Icon className={iconCls} type='edit' onClick={() => {
-                            dispatch({ type: 'dashboard/remoteModify' });
+                            dispatch({ type: 'dashboard/remoteModify',hideMessage:true });
                             dispatch({ type: 'dashboardDesigner/reset' });
                             dispatch({ type: 'main/redirect', path: '/chart/' + chartCode });
                         }}/>}

src/components/homePage/sider.jsx

@@ -33,7 +33,7 @@ class MenuLayout extends React.Component {
     }
 
     render() {
-        const { home, dispatch } = this.props;
+        const { home, dispatch,dashboard } = this.props;
         const { menuFilterLabel } = home;
 
         return <Layout className='home-menu'>
@@ -41,11 +41,23 @@ class MenuLayout extends React.Component {
                 <Input.Search
                     className='search'
                     placeholder='搜索'
-                    defaultValue={menuFilterLabel}
-                    onSearch={this.onSearch}
+                    //onSearch={this.onSearch}
+                    value={menuFilterLabel}
+                    onChange={(e) => {
+                        const expandedKeys = this.findExpandedKeys(dashboard.menuTree, {code: '-1'}, e.target.value);
+                        dispatch({ type: 'home/setFields', fields: [
+                            { name: 'menuExpandedKeys', value: expandedKeys },
+                            { name: 'menuFilterLabel', value: e.target.value },
+                            { name: 'menuAutoExpandParent', value: true },
+                        ] });
+                    }}
                 />
                 <Button className='refresh' onClick={() => {
                     dispatch({ type: 'dashboard/remoteMenuTree', mandatory: true });
+                    dispatch({ type: 'home/setFields', fields: [
+                        { name: 'menuFilterLabel', value: '' },
+                        { name: 'menuAutoExpandParent', value: false },
+                    ] });
                     dispatch({ type: 'home/fetchCollectionDashboardList', mandatory: true });
                 }}><Icon type='sync' /></Button>
             </Header>

src/models/dashboard.js

@@ -239,6 +239,7 @@ export default {
             }
         },
         *remoteModify(action, { select, call, put }) {
+            const { hideMessage } = action
             try {
                 const dashboardDesigner = yield select(state => state.present.dashboardDesigner);
                 const { code, name, items, description, relationColumns, filters, chartCodes, shareCode } = dashboardDesigner;
@@ -259,12 +260,12 @@ export default {
                 if(!res.err && res.data.code > 0) {
                     yield put({ type: 'fetchList', mandatory: true });
                     yield put({ type: 'dashboardDesigner/silentSetField', name: 'dirty', value: false });
-                    message.success('保存成功');
+                    !hideMessage && message.success('保存成功');
                 }else {
-                    message.error('保存失败: ' + (res.err || res.data.msg));
+                    !hideMessage && message.error('保存失败: ' + (res.err || res.data.msg));
                 } 
             }catch(e) {
-                message.error('保存失败: ' + e.message);
+                !hideMessage && message.error('保存失败: ' + e.message);
             }
         },
         *remoteDelete(action, { select, call, put }) {
@@ -329,7 +330,7 @@ export default {
                     let menuTree = fun(resTree, '-1');
                     yield put({ type: 'setFields', fields: [
                         { name: 'menuList', value: menuList },
-                        { name: 'menuTree', value: menuTree },
+                        { name: 'menuTree', value: menuTree }
                     ] });
                 }else {
                     message.error('获取报表目录失败: ' + (res.err || res.data.msg));

src/models/dataSource.js

@@ -17,7 +17,7 @@ export default {
                 { name: 'description', label: '说明', type: 'string' },
                 { name: 'creatorName', label: '创建人', type: 'string' },
                 { name: 'createTime', label: '创建时间', type: 'date' },
-                { name: 'dbConfig.code', label: '数据连接', type: 'enum', options: () => {
+                { name: 'dbConfig.code', label: '数据链接', type: 'enum', options: () => {
                     return service.fetch({
                         url: URLS.DATACONNECT_LIST,
                         method: 'GET',