筛选修复

feature/ecologyChart
Chengliang 3 years ago
parent f273ba49a8
commit 107c90ea45

@ -2,7 +2,7 @@
* @Author: Chengliang 1546584672@qq.com * @Author: Chengliang 1546584672@qq.com
* @Date: 2022-08-04 10:22:55 * @Date: 2022-08-04 10:22:55
* @LastEditors: Chengliang 1546584672@qq.com * @LastEditors: Chengliang 1546584672@qq.com
* @LastEditTime: 2022-12-02 11:42:11 * @LastEditTime: 2022-12-02 16:08:52
* @FilePath: /org-chart-frant/.umirc.ts * @FilePath: /org-chart-frant/.umirc.ts
* @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: ,`customMade`, koroFileHeader : https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
@ -26,7 +26,7 @@ export default defineConfig({
proxy: { proxy: {
'/api': { '/api': {
// 标识需要进行转换的请求的url // 标识需要进行转换的请求的url
target: 'http://192.168.0.152:8093/api', // 服务端域名 / http://localhost:8686 target: 'http://192.168.0.152:8093//api', // 服务端域名 / http://localhost:8686
changeOrigin: true, // 允许域名进行转换 changeOrigin: true, // 允许域名进行转换
pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉 pathRewrite: { '^/api': '' }, // 将请求url里的ci去掉
}, },

Binary file not shown.

@ -23,6 +23,7 @@ export class TopBar extends React.Component {
this.state = { this.state = {
fclasslist: [], fclasslist: [],
companylist: [], // companylist: [], //
treeExpandedKeys: [],
companyData: [], companyData: [],
departmentData: [], departmentData: [],
companyTreeData: [], companyTreeData: [],
@ -127,6 +128,7 @@ export class TopBar extends React.Component {
requestData, requestData,
departmentData: [], departmentData: [],
deptartmentTreeData: [], deptartmentTreeData: [],
treeExpandedKeys: [],
}); });
this.getDepartmentTreeList(company); this.getDepartmentTreeList(company);
}; };
@ -170,6 +172,12 @@ export class TopBar extends React.Component {
return arr.join(','); return arr.join(',');
}; };
onTreeExpand = (expandedKeys) => {
this.setState({
treeExpandedKeys: expandedKeys,
});
};
componentDidMount() { componentDidMount() {
fetch(this.props.url) fetch(this.props.url)
.then((res) => res.json()) .then((res) => res.json())
@ -199,7 +207,8 @@ export class TopBar extends React.Component {
); );
render() { render() {
const { companyTreeData, deptartmentTreeData } = this.state; const { companyTreeData, deptartmentTreeData, treeExpandedKeys } =
this.state;
return ( return (
<div className={style.topbarWrapper}> <div className={style.topbarWrapper}>
@ -248,6 +257,7 @@ export class TopBar extends React.Component {
treeDataSimpleMode treeDataSimpleMode
treeCheckable treeCheckable
treeCheckStrictly treeCheckStrictly
showCheckedStrategy={TreeSelect.SHOW_ALL}
style={{ width: '80%' }} style={{ width: '80%' }}
value={this.state.companyData} value={this.state.companyData}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
@ -265,6 +275,8 @@ export class TopBar extends React.Component {
allowClear allowClear
treeDataSimpleMode treeDataSimpleMode
treeCheckable treeCheckable
showCheckedStrategy={TreeSelect.SHOW_ALL}
treeExpandedKeys={treeExpandedKeys}
treeCheckStrictly treeCheckStrictly
style={{ width: '80%' }} style={{ width: '80%' }}
value={this.state.departmentData} value={this.state.departmentData}
@ -273,6 +285,7 @@ export class TopBar extends React.Component {
onChange={this.onDepartmentChange} onChange={this.onDepartmentChange}
loadData={this.onDepartmentLoadData} loadData={this.onDepartmentLoadData}
treeData={deptartmentTreeData} treeData={deptartmentTreeData}
onTreeExpand={this.onTreeExpand}
/> />
</Col> </Col>
</Row> </Row>

Loading…
Cancel
Save