namirasoft-site-react 1.4.203 → 1.4.205
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.
|
@@ -30,8 +30,14 @@ interface NSBoxBaseComboState<Data> {
|
|
|
30
30
|
};
|
|
31
31
|
data: Data | null;
|
|
32
32
|
data_list: Data[];
|
|
33
|
-
set_value: (
|
|
34
|
-
|
|
33
|
+
set_value: ({
|
|
34
|
+
value: string;
|
|
35
|
+
callback?: () => void;
|
|
36
|
+
}) | null;
|
|
37
|
+
set_values: ({
|
|
38
|
+
values: string[];
|
|
39
|
+
callback?: () => void;
|
|
40
|
+
}) | null;
|
|
35
41
|
open: boolean;
|
|
36
42
|
}
|
|
37
43
|
export declare class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Data, NSBoxBaseCombo<Data>>, NSBoxBaseComboState<Data>> implements INSBox {
|
|
@@ -80,7 +80,7 @@ export class NSBoxBaseCombo extends React.Component {
|
|
|
80
80
|
if (value) {
|
|
81
81
|
data = this.state.items_dict[value];
|
|
82
82
|
if (!data) {
|
|
83
|
-
this.setState({ set_value: value }
|
|
83
|
+
this.setState({ set_value: { value, callback } });
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
86
|
}
|
|
@@ -96,7 +96,7 @@ export class NSBoxBaseCombo extends React.Component {
|
|
|
96
96
|
let data_list = values.map(value => this.state.items_dict[value]);
|
|
97
97
|
if (values.length > 0)
|
|
98
98
|
if (data_list.length === 0) {
|
|
99
|
-
this.setState({ set_values: values });
|
|
99
|
+
this.setState({ set_values: { values, callback } });
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
this.setDataAll(data_list, callback);
|
|
@@ -105,7 +105,7 @@ export class NSBoxBaseCombo extends React.Component {
|
|
|
105
105
|
return NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.data);
|
|
106
106
|
}
|
|
107
107
|
setDataOne(data, callback) {
|
|
108
|
-
this.setState({ data
|
|
108
|
+
this.setState({ data }, () => {
|
|
109
109
|
var _a, _b;
|
|
110
110
|
(_b = (_a = this.props).onChanged) === null || _b === void 0 ? void 0 : _b.call(_a, this);
|
|
111
111
|
callback === null || callback === void 0 ? void 0 : callback();
|
|
@@ -116,7 +116,7 @@ export class NSBoxBaseCombo extends React.Component {
|
|
|
116
116
|
return (_a = NSBoxBaseLayout.checkGetValue(this, checkError, () => this.state.data_list)) !== null && _a !== void 0 ? _a : [];
|
|
117
117
|
}
|
|
118
118
|
setDataAll(data_list, callback) {
|
|
119
|
-
this.setState({ data_list
|
|
119
|
+
this.setState({ data_list }, () => {
|
|
120
120
|
var _a, _b;
|
|
121
121
|
(_b = (_a = this.props).onChanged) === null || _b === void 0 ? void 0 : _b.call(_a, this);
|
|
122
122
|
callback === null || callback === void 0 ? void 0 : callback();
|
|
@@ -160,9 +160,18 @@ export class NSBoxBaseCombo extends React.Component {
|
|
|
160
160
|
});
|
|
161
161
|
this.setState({ items: items.rows, items_list, items_dict }, () => {
|
|
162
162
|
if (this.state.set_value)
|
|
163
|
-
this.setValue(this.state.set_value)
|
|
164
|
-
|
|
165
|
-
|
|
163
|
+
this.setValue(this.state.set_value.value, () => {
|
|
164
|
+
var _a, _b;
|
|
165
|
+
(_b = (_a = this.state.set_value) === null || _a === void 0 ? void 0 : _a.callback) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
166
|
+
this.setState({ set_value: null });
|
|
167
|
+
});
|
|
168
|
+
else if (this.state.set_values) {
|
|
169
|
+
this.setValueAll(this.state.set_values.values, () => {
|
|
170
|
+
var _a, _b;
|
|
171
|
+
(_b = (_a = this.state.set_values) === null || _a === void 0 ? void 0 : _a.callback) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
172
|
+
this.setState({ set_values: null });
|
|
173
|
+
});
|
|
174
|
+
}
|
|
166
175
|
else if (this.props.defaultValue)
|
|
167
176
|
this.setValue(this.props.defaultValue);
|
|
168
177
|
if (this.props.onLoaded)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NSBoxBaseCombo.js","sourceRoot":"","sources":["../../src/components/NSBoxBaseCombo.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NSBoxBaseCombo.js","sourceRoot":"","sources":["../../src/components/NSBoxBaseCombo.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -41,8 +41,8 @@ interface NSBoxBaseComboState<Data>
|
|
|
41
41
|
items_dict: { [value: string]: Data };
|
|
42
42
|
data: Data | null;
|
|
43
43
|
data_list: Data[];
|
|
44
|
-
set_value: (string) | null;
|
|
45
|
-
set_values: (string[]) | null;
|
|
44
|
+
set_value: ({ value: string, callback?: () => void }) | null;
|
|
45
|
+
set_values: ({ values: string[], callback?: () => void }) | null;
|
|
46
46
|
open: boolean;
|
|
47
47
|
}
|
|
48
48
|
|
|
@@ -134,7 +134,7 @@ export class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Da
|
|
|
134
134
|
data = this.state.items_dict[value];
|
|
135
135
|
if (!data)
|
|
136
136
|
{
|
|
137
|
-
this.setState({ set_value: value }
|
|
137
|
+
this.setState({ set_value: { value, callback } });
|
|
138
138
|
return;
|
|
139
139
|
}
|
|
140
140
|
}
|
|
@@ -153,7 +153,7 @@ export class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Da
|
|
|
153
153
|
if (values.length > 0)
|
|
154
154
|
if (data_list.length === 0)
|
|
155
155
|
{
|
|
156
|
-
this.setState({ set_values: values });
|
|
156
|
+
this.setState({ set_values: { values, callback } });
|
|
157
157
|
return;
|
|
158
158
|
}
|
|
159
159
|
this.setDataAll(data_list, callback);
|
|
@@ -164,7 +164,7 @@ export class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Da
|
|
|
164
164
|
}
|
|
165
165
|
setDataOne(data: Data | null, callback?: () => void): void
|
|
166
166
|
{
|
|
167
|
-
this.setState({ data
|
|
167
|
+
this.setState({ data }, () =>
|
|
168
168
|
{
|
|
169
169
|
this.props.onChanged?.(this);
|
|
170
170
|
callback?.();
|
|
@@ -176,7 +176,7 @@ export class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Da
|
|
|
176
176
|
}
|
|
177
177
|
setDataAll(data_list: Data[], callback?: () => void): void
|
|
178
178
|
{
|
|
179
|
-
this.setState({ data_list
|
|
179
|
+
this.setState({ data_list }, () =>
|
|
180
180
|
{
|
|
181
181
|
this.props.onChanged?.(this);
|
|
182
182
|
callback?.();
|
|
@@ -229,9 +229,19 @@ export class NSBoxBaseCombo<Data> extends React.Component<NSBoxBaseComboProps<Da
|
|
|
229
229
|
this.setState({ items: items.rows, items_list, items_dict }, () =>
|
|
230
230
|
{
|
|
231
231
|
if (this.state.set_value)
|
|
232
|
-
this.setValue(this.state.set_value)
|
|
232
|
+
this.setValue(this.state.set_value.value, () =>
|
|
233
|
+
{
|
|
234
|
+
this.state.set_value?.callback?.();
|
|
235
|
+
this.setState({ set_value: null });
|
|
236
|
+
});
|
|
233
237
|
else if (this.state.set_values)
|
|
234
|
-
|
|
238
|
+
{
|
|
239
|
+
this.setValueAll(this.state.set_values.values, () =>
|
|
240
|
+
{
|
|
241
|
+
this.state.set_values?.callback?.();
|
|
242
|
+
this.setState({ set_values: null });
|
|
243
|
+
});
|
|
244
|
+
}
|
|
235
245
|
else if (this.props.defaultValue)
|
|
236
246
|
this.setValue(this.props.defaultValue);
|
|
237
247
|
if (this.props.onLoaded)
|