assui 3.3.3 → 3.3.5
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.
|
@@ -4,9 +4,10 @@ export interface ModalAction {
|
|
|
4
4
|
open: () => void;
|
|
5
5
|
close: () => void;
|
|
6
6
|
}
|
|
7
|
-
export interface ButtonModalProps extends Omit<ModalProps, 'children'> {
|
|
7
|
+
export interface ButtonModalProps extends Omit<ModalProps, 'children' | 'onOk'> {
|
|
8
8
|
onClose?: () => void;
|
|
9
9
|
onOpen?: () => void;
|
|
10
|
+
onOk: ((v: React.MouseEvent<HTMLElement>) => void | Promise<void>);
|
|
10
11
|
trigger?: ((fun: () => void) => React.ReactElement) | React.ReactElement;
|
|
11
12
|
children: ((v: ModalAction) => React.ReactElement) | React.ReactElement;
|
|
12
13
|
}
|
package/es/button-modal/index.js
CHANGED
|
@@ -8,6 +8,117 @@ var __assign = this && this.__assign || function () {
|
|
|
8
8
|
};
|
|
9
9
|
return __assign.apply(this, arguments);
|
|
10
10
|
};
|
|
11
|
+
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
12
|
+
function adopt(value) {
|
|
13
|
+
return value instanceof P ? value : new P(function (resolve) {
|
|
14
|
+
resolve(value);
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
18
|
+
function fulfilled(value) {
|
|
19
|
+
try {
|
|
20
|
+
step(generator.next(value));
|
|
21
|
+
} catch (e) {
|
|
22
|
+
reject(e);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
function rejected(value) {
|
|
26
|
+
try {
|
|
27
|
+
step(generator["throw"](value));
|
|
28
|
+
} catch (e) {
|
|
29
|
+
reject(e);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function step(result) {
|
|
33
|
+
result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
34
|
+
}
|
|
35
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
36
|
+
});
|
|
37
|
+
};
|
|
38
|
+
var __generator = this && this.__generator || function (thisArg, body) {
|
|
39
|
+
var _ = {
|
|
40
|
+
label: 0,
|
|
41
|
+
sent: function sent() {
|
|
42
|
+
if (t[0] & 1) throw t[1];
|
|
43
|
+
return t[1];
|
|
44
|
+
},
|
|
45
|
+
trys: [],
|
|
46
|
+
ops: []
|
|
47
|
+
},
|
|
48
|
+
f,
|
|
49
|
+
y,
|
|
50
|
+
t,
|
|
51
|
+
g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
52
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
|
|
53
|
+
return this;
|
|
54
|
+
}), g;
|
|
55
|
+
function verb(n) {
|
|
56
|
+
return function (v) {
|
|
57
|
+
return step([n, v]);
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
function step(op) {
|
|
61
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
62
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
63
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
64
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
65
|
+
switch (op[0]) {
|
|
66
|
+
case 0:
|
|
67
|
+
case 1:
|
|
68
|
+
t = op;
|
|
69
|
+
break;
|
|
70
|
+
case 4:
|
|
71
|
+
_.label++;
|
|
72
|
+
return {
|
|
73
|
+
value: op[1],
|
|
74
|
+
done: false
|
|
75
|
+
};
|
|
76
|
+
case 5:
|
|
77
|
+
_.label++;
|
|
78
|
+
y = op[1];
|
|
79
|
+
op = [0];
|
|
80
|
+
continue;
|
|
81
|
+
case 7:
|
|
82
|
+
op = _.ops.pop();
|
|
83
|
+
_.trys.pop();
|
|
84
|
+
continue;
|
|
85
|
+
default:
|
|
86
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
87
|
+
_ = 0;
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
91
|
+
_.label = op[1];
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
95
|
+
_.label = t[1];
|
|
96
|
+
t = op;
|
|
97
|
+
break;
|
|
98
|
+
}
|
|
99
|
+
if (t && _.label < t[2]) {
|
|
100
|
+
_.label = t[2];
|
|
101
|
+
_.ops.push(op);
|
|
102
|
+
break;
|
|
103
|
+
}
|
|
104
|
+
if (t[2]) _.ops.pop();
|
|
105
|
+
_.trys.pop();
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
op = body.call(thisArg, _);
|
|
109
|
+
} catch (e) {
|
|
110
|
+
op = [6, e];
|
|
111
|
+
y = 0;
|
|
112
|
+
} finally {
|
|
113
|
+
f = t = 0;
|
|
114
|
+
}
|
|
115
|
+
if (op[0] & 5) throw op[1];
|
|
116
|
+
return {
|
|
117
|
+
value: op[0] ? op[1] : void 0,
|
|
118
|
+
done: true
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
};
|
|
11
122
|
var __rest = this && this.__rest || function (s, e) {
|
|
12
123
|
var t = {};
|
|
13
124
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
@@ -43,6 +154,7 @@ import isFunction from 'lodash/isFunction';
|
|
|
43
154
|
import Modal from "antd/es/modal";
|
|
44
155
|
import CloseOutlined from "a-icons/es/CloseOutlined";
|
|
45
156
|
import useControllableValue from "ahooks/es/useControllableValue";
|
|
157
|
+
import isPromise from "aa-utils/es/isPromise";
|
|
46
158
|
var ButtonModal = function ButtonModal(props, ref) {
|
|
47
159
|
var _a = __read(useControllableValue(props, {
|
|
48
160
|
valuePropName: 'open',
|
|
@@ -73,9 +185,25 @@ var ButtonModal = function ButtonModal(props, ref) {
|
|
|
73
185
|
return modalActionRef.current;
|
|
74
186
|
});
|
|
75
187
|
var handleModalOk = function handleModalOk(e) {
|
|
76
|
-
|
|
77
|
-
|
|
188
|
+
return __awaiter(void 0, void 0, void 0, function () {
|
|
189
|
+
var result;
|
|
190
|
+
return __generator(this, function (_a) {
|
|
191
|
+
switch (_a.label) {
|
|
192
|
+
case 0:
|
|
193
|
+
result = onOk === null || onOk === void 0 ? void 0 : onOk(e);
|
|
194
|
+
if (!isPromise(result)) return [3 /*break*/, 2];
|
|
195
|
+
return [4 /*yield*/, result];
|
|
196
|
+
case 1:
|
|
197
|
+
_a.sent();
|
|
198
|
+
_a.label = 2;
|
|
199
|
+
case 2:
|
|
200
|
+
closeModal();
|
|
201
|
+
return [2 /*return*/];
|
|
202
|
+
}
|
|
203
|
+
});
|
|
204
|
+
});
|
|
78
205
|
};
|
|
206
|
+
|
|
79
207
|
var handleModalCancel = function handleModalCancel(e) {
|
|
80
208
|
onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
|
|
81
209
|
closeModal();
|
|
@@ -4,9 +4,10 @@ export interface ModalAction {
|
|
|
4
4
|
open: () => void;
|
|
5
5
|
close: () => void;
|
|
6
6
|
}
|
|
7
|
-
export interface ButtonModalProps extends Omit<ModalProps, 'children'> {
|
|
7
|
+
export interface ButtonModalProps extends Omit<ModalProps, 'children' | 'onOk'> {
|
|
8
8
|
onClose?: () => void;
|
|
9
9
|
onOpen?: () => void;
|
|
10
|
+
onOk: ((v: React.MouseEvent<HTMLElement>) => void | Promise<void>);
|
|
10
11
|
trigger?: ((fun: () => void) => React.ReactElement) | React.ReactElement;
|
|
11
12
|
children: ((v: ModalAction) => React.ReactElement) | React.ReactElement;
|
|
12
13
|
}
|
|
@@ -41,6 +41,117 @@ var __importStar = this && this.__importStar || function (mod) {
|
|
|
41
41
|
__setModuleDefault(result, mod);
|
|
42
42
|
return result;
|
|
43
43
|
};
|
|
44
|
+
var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
|
|
45
|
+
function adopt(value) {
|
|
46
|
+
return value instanceof P ? value : new P(function (resolve) {
|
|
47
|
+
resolve(value);
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
51
|
+
function fulfilled(value) {
|
|
52
|
+
try {
|
|
53
|
+
step(generator.next(value));
|
|
54
|
+
} catch (e) {
|
|
55
|
+
reject(e);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function rejected(value) {
|
|
59
|
+
try {
|
|
60
|
+
step(generator["throw"](value));
|
|
61
|
+
} catch (e) {
|
|
62
|
+
reject(e);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function step(result) {
|
|
66
|
+
result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
67
|
+
}
|
|
68
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
69
|
+
});
|
|
70
|
+
};
|
|
71
|
+
var __generator = this && this.__generator || function (thisArg, body) {
|
|
72
|
+
var _ = {
|
|
73
|
+
label: 0,
|
|
74
|
+
sent: function sent() {
|
|
75
|
+
if (t[0] & 1) throw t[1];
|
|
76
|
+
return t[1];
|
|
77
|
+
},
|
|
78
|
+
trys: [],
|
|
79
|
+
ops: []
|
|
80
|
+
},
|
|
81
|
+
f,
|
|
82
|
+
y,
|
|
83
|
+
t,
|
|
84
|
+
g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
85
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function () {
|
|
86
|
+
return this;
|
|
87
|
+
}), g;
|
|
88
|
+
function verb(n) {
|
|
89
|
+
return function (v) {
|
|
90
|
+
return step([n, v]);
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
function step(op) {
|
|
94
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
95
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
96
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
97
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
98
|
+
switch (op[0]) {
|
|
99
|
+
case 0:
|
|
100
|
+
case 1:
|
|
101
|
+
t = op;
|
|
102
|
+
break;
|
|
103
|
+
case 4:
|
|
104
|
+
_.label++;
|
|
105
|
+
return {
|
|
106
|
+
value: op[1],
|
|
107
|
+
done: false
|
|
108
|
+
};
|
|
109
|
+
case 5:
|
|
110
|
+
_.label++;
|
|
111
|
+
y = op[1];
|
|
112
|
+
op = [0];
|
|
113
|
+
continue;
|
|
114
|
+
case 7:
|
|
115
|
+
op = _.ops.pop();
|
|
116
|
+
_.trys.pop();
|
|
117
|
+
continue;
|
|
118
|
+
default:
|
|
119
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
|
|
120
|
+
_ = 0;
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
|
|
124
|
+
_.label = op[1];
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
127
|
+
if (op[0] === 6 && _.label < t[1]) {
|
|
128
|
+
_.label = t[1];
|
|
129
|
+
t = op;
|
|
130
|
+
break;
|
|
131
|
+
}
|
|
132
|
+
if (t && _.label < t[2]) {
|
|
133
|
+
_.label = t[2];
|
|
134
|
+
_.ops.push(op);
|
|
135
|
+
break;
|
|
136
|
+
}
|
|
137
|
+
if (t[2]) _.ops.pop();
|
|
138
|
+
_.trys.pop();
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
op = body.call(thisArg, _);
|
|
142
|
+
} catch (e) {
|
|
143
|
+
op = [6, e];
|
|
144
|
+
y = 0;
|
|
145
|
+
} finally {
|
|
146
|
+
f = t = 0;
|
|
147
|
+
}
|
|
148
|
+
if (op[0] & 5) throw op[1];
|
|
149
|
+
return {
|
|
150
|
+
value: op[0] ? op[1] : void 0,
|
|
151
|
+
done: true
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
};
|
|
44
155
|
var __rest = this && this.__rest || function (s, e) {
|
|
45
156
|
var t = {};
|
|
46
157
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
@@ -84,6 +195,7 @@ var isFunction_1 = __importDefault(require("lodash/isFunction"));
|
|
|
84
195
|
var modal_1 = __importDefault(require("antd/lib/modal"));
|
|
85
196
|
var CloseOutlined_1 = __importDefault(require("a-icons/lib/CloseOutlined"));
|
|
86
197
|
var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
|
|
198
|
+
var isPromise_1 = __importDefault(require("aa-utils/lib/isPromise"));
|
|
87
199
|
var ButtonModal = function ButtonModal(props, ref) {
|
|
88
200
|
var _a = __read((0, useControllableValue_1["default"])(props, {
|
|
89
201
|
valuePropName: 'open',
|
|
@@ -114,9 +226,25 @@ var ButtonModal = function ButtonModal(props, ref) {
|
|
|
114
226
|
return modalActionRef.current;
|
|
115
227
|
});
|
|
116
228
|
var handleModalOk = function handleModalOk(e) {
|
|
117
|
-
|
|
118
|
-
|
|
229
|
+
return __awaiter(void 0, void 0, void 0, function () {
|
|
230
|
+
var result;
|
|
231
|
+
return __generator(this, function (_a) {
|
|
232
|
+
switch (_a.label) {
|
|
233
|
+
case 0:
|
|
234
|
+
result = onOk === null || onOk === void 0 ? void 0 : onOk(e);
|
|
235
|
+
if (!(0, isPromise_1["default"])(result)) return [3 /*break*/, 2];
|
|
236
|
+
return [4 /*yield*/, result];
|
|
237
|
+
case 1:
|
|
238
|
+
_a.sent();
|
|
239
|
+
_a.label = 2;
|
|
240
|
+
case 2:
|
|
241
|
+
closeModal();
|
|
242
|
+
return [2 /*return*/];
|
|
243
|
+
}
|
|
244
|
+
});
|
|
245
|
+
});
|
|
119
246
|
};
|
|
247
|
+
|
|
120
248
|
var handleModalCancel = function handleModalCancel(e) {
|
|
121
249
|
onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
|
|
122
250
|
closeModal();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "assui",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.5",
|
|
4
4
|
"description": "react ui library",
|
|
5
5
|
"author": "jason <usochen@gmail.com>",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@types/react-beautiful-dnd": "^13.1.2",
|
|
36
36
|
"@types/react-color": "^3.0.6",
|
|
37
37
|
"@types/react-resizable": "^3.0.0",
|
|
38
|
-
"a-icons": "^1.2.
|
|
38
|
+
"a-icons": "^1.2.70",
|
|
39
39
|
"aa-utils": "^2.1.35",
|
|
40
40
|
"ahooks": "^3.9.5",
|
|
41
41
|
"bignumber.js": "^9.0.1",
|
|
@@ -87,5 +87,5 @@
|
|
|
87
87
|
"node": ">=10.0.0"
|
|
88
88
|
},
|
|
89
89
|
"license": "MIT",
|
|
90
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "792ef2be137298410123129bf0d53537466d2150"
|
|
91
91
|
}
|