liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!8 1 

Merge pull request !8 from reset/feature/cl
This commit is contained in:
reset 2022-05-18 07:57:00 +00:00 committed by Gitee
parent aba9ee3840 8eb704e23d
commit 6e7e5fa991
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/organization/components/company/company.js
View File

@ -326,7 +326,8 @@ export default class Company extends React.Component {
company
} = this.props;
const {
isPanelShow, companyName, conditionNum, visible, condition, form, tableStore, dataSource, columns
isPanelShow, companyName, conditionNum, visible, condition, form,
tableStore, dataSource, columns,loading
} = company;
@ -373,6 +374,7 @@ export default class Company extends React.Component {
rowSelection={rowSelection}
indentSize={15}
defaultExpandedRowKeys={[1,2]}
loading={loading}
/>
</WeaTop>
</WeaRightMenu>

7
pc4mobx/organization/stores/company.js
View File

@ -29,6 +29,7 @@ export class CompanyStore {
@observable dataSource = [];
@observable columns = [];
@observable tableStore = new TableStore();
@observable loading = true;
@observable searchCondition = [];
@observable isPanelShow = false; //高级搜索面板
@observable form = new WeaForm();
@ -43,6 +44,7 @@ export class CompanyStore {
@observable date = '';
@action
getTableInfo() {
let params;
@ -62,6 +64,7 @@ export class CompanyStore {
if (res.code === 200) {
res.data.pageInfo.list && this.setDataSource(res.data.pageInfo.list);
res.data.pageInfo.columns && this.setColumns(res.data.pageInfo.columns);
this.setLoading(false);
} else {
message.warning(res.msg);
}
@ -228,4 +231,8 @@ export class CompanyStore {
this.selectedRowKeys = selectedRowKeys;
}
setLoading(bool) {
this.loading = bool;
}
}