namirasoft-site-react 1.4.20 → 1.4.22
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/NSBoxCombo.d.ts +1 -1
- package/dist/components/NSBoxCombo.js +12 -1
- package/dist/components/NSBoxCombo.js.map +1 -1
- package/dist/components/NSBoxEnum.js +1 -1
- package/dist/components/NSBoxEnum.js.map +1 -1
- package/dist/components/NSLoading.module.css +2 -0
- package/dist/components/NSPagination.d.ts +0 -1
- package/dist/components/NSPagination.js +16 -13
- package/dist/components/NSPagination.js.map +1 -1
- package/package.json +1 -1
- package/src/components/NSBoxCombo.tsx +14 -2
- package/src/components/NSBoxEnum.tsx +1 -1
- package/src/components/NSLoading.module.css +2 -0
- package/src/components/NSPagination.tsx +17 -15
|
@@ -3,7 +3,6 @@ import { IBaseComponentProps } from "../props/IBaseComponentProps";
|
|
|
3
3
|
import { IValidationProps } from "../props/IValidationProps";
|
|
4
4
|
import { BaseOptionType } from "antd/es/select";
|
|
5
5
|
export interface INSBoxComboOption extends BaseOptionType {
|
|
6
|
-
desc: string;
|
|
7
6
|
value: string;
|
|
8
7
|
}
|
|
9
8
|
export interface INSBoxComboProps extends IBaseComponentProps, IValidationProps {
|
|
@@ -29,5 +28,6 @@ export declare class NSBoxCombo extends React.Component<INSBoxComboProps, INSBox
|
|
|
29
28
|
setValue(value: string | null): void;
|
|
30
29
|
setValues(values: string[]): void;
|
|
31
30
|
onChange(value: string | null | string[]): void;
|
|
31
|
+
componentDidMount(): void;
|
|
32
32
|
render(): import("react/jsx-runtime").JSX.Element;
|
|
33
33
|
}
|
|
@@ -60,8 +60,19 @@ export class NSBoxCombo extends React.Component {
|
|
|
60
60
|
else
|
|
61
61
|
this.setValue(value);
|
|
62
62
|
}
|
|
63
|
+
componentDidMount() {
|
|
64
|
+
if (this.props.defaultValue) {
|
|
65
|
+
let value = this.getValue(false);
|
|
66
|
+
if (!value) {
|
|
67
|
+
this.setState({ value: this.props.defaultValue });
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
63
71
|
render() {
|
|
64
|
-
return (_jsx(_Fragment, { children: _jsxs("div", { id: this.props.id, className: `${StyleNSBox.ns_input_parent} ${this.props.customClass}`, children: [_jsxs("span", { className: StyleNSBox.ns_input_title, children: [" ", this.props.required && _jsx("span", { style: { color: "red" }, children: "*" }), " ", this.props.title, " "] }), _jsx(Select, { showSearch: this.props.searchable, value: this.props.multiple ? (this.state.values) : (this.state.value), mode: this.props.multiple ? "multiple" : undefined, className: Styles.ns_input_select, placeholder: this.props.placeholder, onChange: this.onChange, optionLabelProp: "label", options: this.props.options, defaultValue: this.props.defaultValue, optionRender: (option) =>
|
|
72
|
+
return (_jsx(_Fragment, { children: _jsxs("div", { id: this.props.id, className: `${StyleNSBox.ns_input_parent} ${this.props.customClass}`, children: [_jsxs("span", { className: StyleNSBox.ns_input_title, children: [" ", this.props.required && _jsx("span", { style: { color: "red" }, children: "*" }), " ", this.props.title, " "] }), _jsx(Select, { showSearch: this.props.searchable, value: this.props.multiple ? (this.state.values) : (this.state.value), mode: this.props.multiple ? "multiple" : undefined, className: Styles.ns_input_select, placeholder: this.props.placeholder, onChange: this.onChange, optionLabelProp: "label", options: this.props.options, defaultValue: this.props.defaultValue, optionRender: (option) => {
|
|
73
|
+
var _a;
|
|
74
|
+
return (_jsx(Space, { className: StyleNSBox.ns_input_select_option, children: (_a = option.data.title) !== null && _a !== void 0 ? _a : "" }));
|
|
75
|
+
}, suffixIcon: _jsx("img", { src: "https://static.namirasoft.com/image/concept/arrow/down/blue.svg", width: 24, height: 24, alt: "SelectBox Icon" }) }), _jsx(NSBoxErrorNotifier, { error: this.state.error, clearError: () => this.setState({ error: "" }) })] }) }));
|
|
65
76
|
}
|
|
66
77
|
}
|
|
67
78
|
//# sourceMappingURL=NSBoxCombo.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSBoxCombo.js","sourceRoot":"","sources":["../../src/components/NSBoxCombo.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,MAAM,MAAM,yBAAyB,CAAC;AAC7C,OAAO,UAAU,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAGrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"NSBoxCombo.js","sourceRoot":"","sources":["../../src/components/NSBoxCombo.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSBoxEnum.js","sourceRoot":"","sources":["../../src/components/NSBoxEnum.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAuC,UAAU,EAAE,MAAM,cAAc,CAAC;AAO/E,MAAM,OAAO,SAAU,SAAQ,KAAK,CAAC,SAA0B;IAG9D,YAAY,KAAsB;QAEjC,KAAK,CAAC,KAAK,CAAC,CAAC;QAHP,eAAU,GAAG,SAAS,EAAc,CAAC;QAI3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,QAAQ,CAAC,KAAa;;QAErB,OAAO,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,CAAC,KAAK,CAAC,mCAAI,IAAI,CAAC;IACzD,CAAC;IACD,QAAQ,CAAI,OAA2B,EAAE,QAAW;;QAEnD,OAAO,IAAI,aAAa,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1F,CAAC;IACD,SAAS,CAAI,OAA2B,EAAE,QAAW;;QAEpD,IAAI,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,SAAS,EAAE,mCAAI,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,QAAQ,CAAC,KAAoB;;QAE5B,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,SAAS,CAAC,MAAgB;;QAEzB,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IACQ,MAAM;QAEd,IAAI,OAAO,GAAwB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAE5E,OAAO;gBACN,
|
|
1
|
+
{"version":3,"file":"NSBoxEnum.js","sourceRoot":"","sources":["../../src/components/NSBoxEnum.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAuC,UAAU,EAAE,MAAM,cAAc,CAAC;AAO/E,MAAM,OAAO,SAAU,SAAQ,KAAK,CAAC,SAA0B;IAG9D,YAAY,KAAsB;QAEjC,KAAK,CAAC,KAAK,CAAC,CAAC;QAHP,eAAU,GAAG,SAAS,EAAc,CAAC;QAI3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IACD,QAAQ,CAAC,KAAa;;QAErB,OAAO,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,CAAC,KAAK,CAAC,mCAAI,IAAI,CAAC;IACzD,CAAC;IACD,QAAQ,CAAI,OAA2B,EAAE,QAAW;;QAEnD,OAAO,IAAI,aAAa,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1F,CAAC;IACD,SAAS,CAAI,OAA2B,EAAE,QAAW;;QAEpD,IAAI,MAAM,GAAG,MAAA,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,SAAS,EAAE,mCAAI,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjF,CAAC;IACD,QAAQ,CAAC,KAAoB;;QAE5B,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,SAAS,CAAC,MAAgB;;QAEzB,MAAA,IAAI,CAAC,UAAU,CAAC,OAAO,0CAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IACQ,MAAM;QAEd,IAAI,OAAO,GAAwB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAE5E,OAAO;gBACN,KAAK,EAAE,GAAG;gBACV,KAAK,EAAE,GAAG;aACV,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CACN,KAAC,UAAU,kBAAC,GAAG,EAAE,IAAI,CAAC,UAAU,IAAM,IAAI,CAAC,KAAK,IAAE,OAAO,EAAE,OAAO,IAAe,CACjF,CAAC;IACH,CAAC;CACD"}
|
|
@@ -8,7 +8,6 @@ export interface INSPaginationProps extends IBaseComponentProps {
|
|
|
8
8
|
}
|
|
9
9
|
interface INSPaginationState {
|
|
10
10
|
currentPage: number;
|
|
11
|
-
pageSize: number;
|
|
12
11
|
}
|
|
13
12
|
export declare class NSPagination extends Component<INSPaginationProps, INSPaginationState> {
|
|
14
13
|
PageSize: React.RefObject<NSBoxCombo>;
|
|
@@ -8,17 +8,21 @@ export class NSPagination extends Component {
|
|
|
8
8
|
constructor(props) {
|
|
9
9
|
super(props);
|
|
10
10
|
this.PageSize = React.createRef();
|
|
11
|
-
this.state = { currentPage: 1
|
|
11
|
+
this.state = { currentPage: 1 };
|
|
12
12
|
}
|
|
13
13
|
getCurrentPage() {
|
|
14
14
|
return this.state.currentPage;
|
|
15
15
|
}
|
|
16
16
|
getPageSize() {
|
|
17
|
-
|
|
17
|
+
var _a;
|
|
18
|
+
let ans = (_a = this.PageSize.current) === null || _a === void 0 ? void 0 : _a.getValue(false);
|
|
19
|
+
if (!ans)
|
|
20
|
+
ans = pageSizes[0].toString();
|
|
21
|
+
return parseInt(ans);
|
|
18
22
|
}
|
|
19
23
|
render() {
|
|
20
24
|
var _a;
|
|
21
|
-
let pageSize = this.
|
|
25
|
+
let pageSize = this.getPageSize();
|
|
22
26
|
const { totalItems, onPageChange } = this.props;
|
|
23
27
|
const totalPages = Math.ceil(totalItems / pageSize);
|
|
24
28
|
const windowSize = 2;
|
|
@@ -31,8 +35,8 @@ export class NSPagination extends Component {
|
|
|
31
35
|
pages.push(_jsx("div", { className: `${Styles.ns_select_number_parent}`, children: _jsx("a", { href: "#", className: `${Styles.ns_paginate_link} ${page === this.state.currentPage ? Styles.ns_select_number : ''}`, onClick: (e) => {
|
|
32
36
|
e.preventDefault();
|
|
33
37
|
let currentPage = page;
|
|
34
|
-
|
|
35
|
-
|
|
38
|
+
this.setState({ currentPage }, () => {
|
|
39
|
+
let pageSize = this.getPageSize();
|
|
36
40
|
onPageChange(currentPage, pageSize);
|
|
37
41
|
});
|
|
38
42
|
}, children: page }) }, page));
|
|
@@ -41,8 +45,8 @@ export class NSPagination extends Component {
|
|
|
41
45
|
e.preventDefault();
|
|
42
46
|
if (this.state.currentPage > 1) {
|
|
43
47
|
let currentPage = this.state.currentPage - 1;
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
this.setState({ currentPage }, () => {
|
|
49
|
+
let pageSize = this.getPageSize();
|
|
46
50
|
onPageChange(currentPage, pageSize);
|
|
47
51
|
});
|
|
48
52
|
}
|
|
@@ -63,17 +67,16 @@ export class NSPagination extends Component {
|
|
|
63
67
|
e.preventDefault();
|
|
64
68
|
if (this.state.currentPage < totalPages) {
|
|
65
69
|
let currentPage = this.state.currentPage + 1;
|
|
66
|
-
|
|
67
|
-
|
|
70
|
+
this.setState({ currentPage }, () => {
|
|
71
|
+
let pageSize = this.getPageSize();
|
|
68
72
|
onPageChange(currentPage, pageSize);
|
|
69
73
|
});
|
|
70
74
|
}
|
|
71
75
|
}, children: _jsx("img", { style: { margin: "0 0 0 8px" }, src: "https://static.namirasoft.com/image/concept/arrow/right/white-blue.svg", width: 32, height: 32, alt: "right_vector" }) }) }, "next"));
|
|
72
|
-
return (_jsx(_Fragment, { children: _jsxs("div", { id: this.props.id, className: `${Styles.ns_pagination_container} ${(_a = this.props.classList) === null || _a === void 0 ? void 0 : _a.join(' ')}`, style: this.props.style, children: [pages, _jsxs("div", { className: Styles.ns_pagination_info, children: [_jsx("div", { className: Styles.ns_pagination_combobox, children: _jsx(NSBoxCombo, {
|
|
73
|
-
var _a, _b;
|
|
76
|
+
return (_jsx(_Fragment, { children: _jsxs("div", { id: this.props.id, className: `${Styles.ns_pagination_container} ${(_a = this.props.classList) === null || _a === void 0 ? void 0 : _a.join(' ')}`, style: this.props.style, children: [pages, _jsxs("div", { className: Styles.ns_pagination_info, children: [_jsx("div", { className: Styles.ns_pagination_combobox, children: _jsx(NSBoxCombo, { ref: this.PageSize, title: '', required: false, searchable: false, multiple: false, defaultValue: "25", options: pageSizes.map(pagesize => { return { title: pagesize.toString(), value: pagesize.toString() }; }), onChanged: () => {
|
|
74
77
|
let currentPage = this.state.currentPage;
|
|
75
|
-
|
|
76
|
-
|
|
78
|
+
this.setState({ currentPage }, () => {
|
|
79
|
+
let pageSize = this.getPageSize();
|
|
77
80
|
onPageChange(currentPage, pageSize);
|
|
78
81
|
});
|
|
79
82
|
} }) }), _jsx("h6", { children: `(${current_min} - ${current_max}) of ${totalItems}` })] })] }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSPagination.js","sourceRoot":"","sources":["../../src/components/NSPagination.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"NSPagination.js","sourceRoot":"","sources":["../../src/components/NSPagination.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -12,7 +12,6 @@ import { BaseOptionType } from "antd/es/select";
|
|
|
12
12
|
|
|
13
13
|
export interface INSBoxComboOption extends BaseOptionType
|
|
14
14
|
{
|
|
15
|
-
desc: string;
|
|
16
15
|
value: string;
|
|
17
16
|
}
|
|
18
17
|
|
|
@@ -105,6 +104,19 @@ export class NSBoxCombo extends React.Component<INSBoxComboProps, INSBoxComboSta
|
|
|
105
104
|
else
|
|
106
105
|
this.setValue(value as string | null);
|
|
107
106
|
}
|
|
107
|
+
override componentDidMount()
|
|
108
|
+
{
|
|
109
|
+
if (this.props.defaultValue)
|
|
110
|
+
{
|
|
111
|
+
let value = this.getValue(false);
|
|
112
|
+
if (!value)
|
|
113
|
+
{
|
|
114
|
+
// This set vlaue must call setState directly to avoid calling onChange event twice at the begining.
|
|
115
|
+
// DO NOT replace this setState with setValue
|
|
116
|
+
this.setState({ value: this.props.defaultValue });
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
108
120
|
override render()
|
|
109
121
|
{
|
|
110
122
|
return (
|
|
@@ -123,7 +135,7 @@ export class NSBoxCombo extends React.Component<INSBoxComboProps, INSBoxComboSta
|
|
|
123
135
|
defaultValue={this.props.defaultValue}
|
|
124
136
|
optionRender={(option) => (
|
|
125
137
|
<Space className={StyleNSBox.ns_input_select_option}>
|
|
126
|
-
{option.data.
|
|
138
|
+
{option.data.title ?? ""}
|
|
127
139
|
</Space>
|
|
128
140
|
)}
|
|
129
141
|
suffixIcon={<img src="https://static.namirasoft.com/image/concept/arrow/down/blue.svg" width={24} height={24} alt="SelectBox Icon" />}
|
|
@@ -13,7 +13,6 @@ export interface INSPaginationProps extends IBaseComponentProps
|
|
|
13
13
|
interface INSPaginationState
|
|
14
14
|
{
|
|
15
15
|
currentPage: number;
|
|
16
|
-
pageSize: number;
|
|
17
16
|
}
|
|
18
17
|
let pageSizes = [25, 50, 100, 200, 500];
|
|
19
18
|
|
|
@@ -23,7 +22,7 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
23
22
|
constructor(props: INSPaginationProps)
|
|
24
23
|
{
|
|
25
24
|
super(props);
|
|
26
|
-
this.state = { currentPage: 1
|
|
25
|
+
this.state = { currentPage: 1 };
|
|
27
26
|
}
|
|
28
27
|
getCurrentPage(): number
|
|
29
28
|
{
|
|
@@ -31,11 +30,14 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
31
30
|
}
|
|
32
31
|
getPageSize(): number
|
|
33
32
|
{
|
|
34
|
-
|
|
33
|
+
let ans = this.PageSize.current?.getValue(false);
|
|
34
|
+
if (!ans)
|
|
35
|
+
ans = pageSizes[0].toString();
|
|
36
|
+
return parseInt(ans);
|
|
35
37
|
}
|
|
36
38
|
override render()
|
|
37
39
|
{
|
|
38
|
-
let pageSize = this.
|
|
40
|
+
let pageSize = this.getPageSize();
|
|
39
41
|
const { totalItems, onPageChange } = this.props;
|
|
40
42
|
const totalPages = Math.ceil(totalItems / pageSize);
|
|
41
43
|
const windowSize = 2;
|
|
@@ -56,9 +58,9 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
56
58
|
{
|
|
57
59
|
e.preventDefault();
|
|
58
60
|
let currentPage = page;
|
|
59
|
-
|
|
60
|
-
this.setState({ currentPage, pageSize }, () =>
|
|
61
|
+
this.setState({ currentPage }, () =>
|
|
61
62
|
{
|
|
63
|
+
let pageSize = this.getPageSize();
|
|
62
64
|
onPageChange(currentPage, pageSize);
|
|
63
65
|
});
|
|
64
66
|
}}
|
|
@@ -78,9 +80,9 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
78
80
|
if (this.state.currentPage > 1)
|
|
79
81
|
{
|
|
80
82
|
let currentPage = this.state.currentPage - 1;
|
|
81
|
-
|
|
82
|
-
this.setState({ currentPage, pageSize }, () =>
|
|
83
|
+
this.setState({ currentPage }, () =>
|
|
83
84
|
{
|
|
85
|
+
let pageSize = this.getPageSize();
|
|
84
86
|
onPageChange(currentPage, pageSize);
|
|
85
87
|
});
|
|
86
88
|
}
|
|
@@ -132,9 +134,9 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
132
134
|
if (this.state.currentPage < totalPages)
|
|
133
135
|
{
|
|
134
136
|
let currentPage = this.state.currentPage + 1;
|
|
135
|
-
|
|
136
|
-
this.setState({ currentPage, pageSize }, () =>
|
|
137
|
+
this.setState({ currentPage }, () =>
|
|
137
138
|
{
|
|
139
|
+
let pageSize = this.getPageSize();
|
|
138
140
|
onPageChange(currentPage, pageSize);
|
|
139
141
|
});
|
|
140
142
|
}
|
|
@@ -161,19 +163,19 @@ export class NSPagination extends Component<INSPaginationProps, INSPaginationSta
|
|
|
161
163
|
<div className={Styles.ns_pagination_info}>
|
|
162
164
|
<div className={Styles.ns_pagination_combobox}>
|
|
163
165
|
<NSBoxCombo
|
|
164
|
-
searchable={false}
|
|
165
166
|
ref={this.PageSize}
|
|
166
|
-
multiple={false}
|
|
167
167
|
title=''
|
|
168
168
|
required={false}
|
|
169
|
+
searchable={false}
|
|
170
|
+
multiple={false}
|
|
169
171
|
defaultValue="25"
|
|
170
|
-
options={pageSizes.map(pagesize => { return {
|
|
172
|
+
options={pageSizes.map(pagesize => { return { title: pagesize.toString(), value: pagesize.toString() } })}
|
|
171
173
|
onChanged={() =>
|
|
172
174
|
{
|
|
173
175
|
let currentPage = this.state.currentPage;
|
|
174
|
-
|
|
175
|
-
this.setState({ currentPage, pageSize }, () =>
|
|
176
|
+
this.setState({ currentPage }, () =>
|
|
176
177
|
{
|
|
178
|
+
let pageSize = this.getPageSize();
|
|
177
179
|
onPageChange(currentPage, pageSize);
|
|
178
180
|
});
|
|
179
181
|
}}
|