baha/skyline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix: Fix for select table init & LB listener download"

Browse Source
This commit is contained in:
Zuul 2021-09-03 02:35:05 +00:00 committed by Gerrit Code Review
commit 4eca73c6fd
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/FormItem/SelectTable/index.jsx
View File

@ -25,7 +25,7 @@ import styles from './index.less';
const getItemKey = (item) => item.key || item.id;
const getInitRows = (value, datas) => {
const getInitRows = (value, datas, backendPageStore) => {
const { selectedRowKeys = [], selectedRows = [] } = value;
if (!selectedRowKeys || selectedRowKeys.length === 0) {
return [];
@ -36,7 +36,8 @@ const getInitRows = (value, datas) => {
}
const rows = selectedRowKeys.map((key) => {
const item = (datas || []).find((it) => getItemKey(it) === key);
const findSourceData = !backendPageStore ? datas : selectedRows;
const item = (findSourceData || []).find((it) => getItemKey(it) === key);
return (
item || {
key,
@ -150,18 +151,18 @@ export default class SelectTable extends React.Component {
}
getInitValue(props) {
const { value = {}, initValue = {}, datas = [] } = props;
const { value = {}, initValue = {}, datas = [], backendPageStore } = props;
if (!isEmpty(initValue)) {
const { selectedRowKeys = [] } = initValue;
return {
selectedRowKeys,
selectedRows: getInitRows(initValue, datas),
selectedRows: getInitRows(initValue, datas, backendPageStore),
};
}
const { selectedRowKeys = [] } = value || {};
return {
selectedRowKeys,
selectedRows: getInitRows(value || {}, datas),
selectedRows: getInitRows(value || {}, datas, backendPageStore),
};
}
@ -195,7 +196,7 @@ export default class SelectTable extends React.Component {
}
if (!isEqual(initValue, prevState.initValue)) {
const { selectedRowKeys = [] } = initValue;
const selectedRows = getInitRows(initValue, datas);
const selectedRows = getInitRows(initValue, datas, backendPageStore);
newState.selectedRowKeys = selectedRowKeys;
newState.selectedRows = selectedRows;
newState.initValue = initValue;

1
src/pages/network/containers/LoadBalancers/Listener/index.jsx
View File

@ -23,6 +23,7 @@ import { actionConfigs, adminActions } from './Actions';
export default class Listeners extends Base {
init() {
this.store = new ListenerStore();
this.downloadStore = new ListenerStore();
}
updateFetchParamsByPage = (params) => {