bug修改

src/components/dashboard/menu.jsx

@@ -250,7 +250,7 @@ class DashboardMenu extends React.Component {
     }
 
     render() {
-        const { dashboard, dispatch, hideHeader, editable, model } = this.props;
+        const { dashboard, dispatch, hideHeader, editable, model, onSearch: propsOnSearch } = this.props;
         const { visibleDeleteBox, selectedMenu } = this.state;
         const { menuTree } = dashboard;
         const { menuFilterLabel, menuExpandedKeys, menuSelectedKeys, menuAutoExpandParent } = model;
@@ -261,12 +261,27 @@ class DashboardMenu extends React.Component {
             
             {!hideHeader && <div className='menu-search'>
                 <Search
-                    defaultValue={menuFilterLabel}
+                    value={menuFilterLabel}
                     placeholder='搜索'
-                    onSearch={this.onSearch}
+                    //onSearch={this.onSearch}
+                    onChange={(e) => {
+                        // 获得需要展开的目录（存在包含关键字的报表或目录）
+                        const expandedMenus = this.findExpandedKeys(dashboard.menuTree, {code: '-1'}, e.target.value);
+                        if(typeof propsOnSearch === 'function') {
+                            propsOnSearch(e.target.value, expandedMenus);
+                        }
+                        dispatch({ type: 'dashboard/setFields', fields: [
+                            { name: 'menuFilterLabel', value: e.target.value },
+                            { name: 'menuAutoExpandParent', value: true },
+                        ] });
+                    }}
                 />
                 <Button onClick={() => {
                     dispatch({ type: 'dashboard/remoteMenuTree', mandatory: true });
+                    dispatch({ type: 'dashboard/setFields', fields: [
+                        { name: 'menuFilterLabel', value: '' },
+                        { name: 'menuAutoExpandParent', value: false },
+                    ] });
                 }}><Icon type='sync' /></Button>
             </div>}
             <div className='menu-content'>

src/models/chart.js

@@ -38,6 +38,27 @@ export default {
                         message.error('获取数据源下拉列表失败: ' + e.message);
                     });
                 } },
+                { name: 'dataConnectCode', label: '数据链接', type: 'enum', options: () => {
+                    return service.fetch({
+                        url: URLS.DATACONNECT_LIST,
+                        method: 'GET',
+                        body: {
+                            pageNum: 1,
+                            pageSize: 999
+                        }
+                    }).then(res => {
+                        if(!res.error && res.data.code > 0) {
+                            return res.data.data.list.map(l => ({
+                                name: l.id,
+                                label: l.name,
+                            }));
+                        }else {
+                            message.error('获取数据链接下拉列表失败: ' + res.data.msg);
+                        }
+                    }).catch(e => {
+                        message.error('获取数据链接下拉列表失败: ' + e.message);
+                    });
+                } }
             ],
             filterItem: { name: 'name', label: '图表名称', type: 'string' }, // 已选过滤字段
         },