react-hook-core 0.4.5 → 0.4.7
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/lib/com.js +33 -11
- package/lib/core.js +103 -157
- package/lib/diff.js +28 -30
- package/lib/edit.js +54 -112
- package/lib/error.js +53 -0
- package/lib/formutil.js +58 -72
- package/lib/index.js +110 -95
- package/lib/input.js +31 -32
- package/lib/merge.js +26 -16
- package/lib/reflect.js +140 -147
- package/lib/route.js +45 -53
- package/lib/search.js +233 -475
- package/lib/state.js +159 -168
- package/lib/update.js +69 -64
- package/lib/useEdit.js +421 -348
- package/lib/useMessage.js +20 -20
- package/lib/useSearch.js +437 -246
- package/lib/useView.js +127 -120
- package/lib/util.js +74 -85
- package/package.json +1 -1
- package/src/com.ts +44 -30
- package/src/core.ts +147 -321
- package/src/diff.ts +54 -24
- package/src/edit.ts +42 -121
- package/src/error.ts +55 -0
- package/src/formutil.ts +51 -62
- package/src/index.ts +129 -114
- package/src/input.ts +44 -38
- package/src/merge.ts +16 -13
- package/src/reflect.ts +100 -101
- package/src/route.ts +40 -40
- package/src/search.ts +130 -316
- package/src/state.ts +135 -124
- package/src/update.ts +41 -41
- package/src/useEdit.ts +450 -319
- package/src/useMessage.ts +21 -21
- package/src/useSearch.ts +493 -277
- package/src/useView.ts +122 -97
- package/src/util.ts +67 -66
package/lib/useEdit.js
CHANGED
|
@@ -1,463 +1,533 @@
|
|
|
1
|
-
"use strict"
|
|
2
|
-
var __assign =
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict"
|
|
2
|
+
var __assign =
|
|
3
|
+
(this && this.__assign) ||
|
|
4
|
+
function () {
|
|
5
|
+
__assign =
|
|
6
|
+
Object.assign ||
|
|
7
|
+
function (t) {
|
|
8
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
9
|
+
s = arguments[i]
|
|
10
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]
|
|
11
|
+
}
|
|
12
|
+
return t
|
|
13
|
+
}
|
|
14
|
+
return __assign.apply(this, arguments)
|
|
15
|
+
}
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true })
|
|
17
|
+
var react_1 = require("react")
|
|
18
|
+
var react_router_1 = require("react-router")
|
|
19
|
+
var core_1 = require("./core")
|
|
20
|
+
var edit_1 = require("./edit")
|
|
21
|
+
var error_1 = require("./error")
|
|
22
|
+
var formutil_1 = require("./formutil")
|
|
23
|
+
var merge_1 = require("./merge")
|
|
24
|
+
var reflect_1 = require("./reflect")
|
|
25
|
+
var state_1 = require("./state")
|
|
26
|
+
var update_1 = require("./update")
|
|
27
|
+
function build(attributes, name) {
|
|
28
|
+
if (!attributes) {
|
|
29
|
+
return undefined
|
|
30
|
+
}
|
|
31
|
+
if (core_1.resources.cache && name && name.length > 0) {
|
|
32
|
+
var meta = core_1.resources._cache[name]
|
|
33
|
+
if (!meta) {
|
|
34
|
+
meta = buildMetaModel(attributes)
|
|
35
|
+
core_1.resources._cache[name] = meta
|
|
36
|
+
}
|
|
37
|
+
return meta
|
|
38
|
+
} else {
|
|
39
|
+
return buildMetaModel(attributes)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
exports.build = build
|
|
43
|
+
function buildMetaModel(attributes) {
|
|
44
|
+
if (!attributes) {
|
|
45
|
+
return {}
|
|
46
|
+
}
|
|
47
|
+
var md = {}
|
|
48
|
+
var pks = new Array()
|
|
49
|
+
var keys = Object.keys(attributes)
|
|
50
|
+
for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
|
|
51
|
+
var key = keys_1[_i]
|
|
52
|
+
var attr = attributes[key]
|
|
53
|
+
if (attr) {
|
|
54
|
+
if (attr.version) {
|
|
55
|
+
md.version = key
|
|
56
|
+
}
|
|
57
|
+
if (attr.key === true) {
|
|
58
|
+
pks.push(key)
|
|
59
|
+
}
|
|
8
60
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
return
|
|
12
|
-
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
var
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
61
|
+
}
|
|
62
|
+
md.keys = pks
|
|
63
|
+
return md
|
|
64
|
+
}
|
|
65
|
+
function handleVersion(obj, version) {
|
|
66
|
+
if (obj && version && version.length > 0) {
|
|
67
|
+
var v = obj[version]
|
|
68
|
+
if (v && typeof v === "number") {
|
|
69
|
+
obj[version] = v + 1
|
|
70
|
+
} else {
|
|
71
|
+
obj[version] = 1
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
exports.handleVersion = handleVersion
|
|
23
76
|
exports.useEdit = function (refForm, initialState, service, p2, p) {
|
|
24
|
-
var params = react_router_1.useParams()
|
|
25
|
-
var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p)
|
|
77
|
+
var params = react_router_1.useParams()
|
|
78
|
+
var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p)
|
|
26
79
|
react_1.useEffect(function () {
|
|
27
80
|
if (refForm) {
|
|
28
|
-
var registerEvents =
|
|
29
|
-
core_1.initForm(baseProps.refForm.current, registerEvents)
|
|
30
|
-
}
|
|
31
|
-
var n = baseProps.getModelName(refForm.current)
|
|
32
|
-
var obj = {}
|
|
33
|
-
obj[n] = baseProps.createModel()
|
|
34
|
-
baseProps.setState(obj)
|
|
35
|
-
var keys
|
|
81
|
+
var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
|
|
82
|
+
core_1.initForm(baseProps.refForm.current, registerEvents)
|
|
83
|
+
}
|
|
84
|
+
var n = baseProps.getModelName(refForm.current)
|
|
85
|
+
var obj = {}
|
|
86
|
+
obj[n] = baseProps.createModel()
|
|
87
|
+
baseProps.setState(obj)
|
|
88
|
+
var keys
|
|
36
89
|
if (p && !p.keys && service && service.metadata) {
|
|
37
|
-
var metadata =
|
|
90
|
+
var metadata = p.metadata ? p.metadata : service.metadata()
|
|
38
91
|
if (metadata) {
|
|
39
|
-
var meta =
|
|
40
|
-
keys =
|
|
41
|
-
var version =
|
|
42
|
-
p.keys = keys
|
|
43
|
-
p.version = version
|
|
92
|
+
var meta = build(metadata)
|
|
93
|
+
keys = p.keys ? p.keys : meta ? meta.keys : undefined
|
|
94
|
+
var version = p.version ? p.version : meta ? meta.version : undefined
|
|
95
|
+
p.keys = keys
|
|
96
|
+
p.version = version
|
|
44
97
|
}
|
|
45
98
|
}
|
|
46
|
-
var id = core_1.buildId(params, keys)
|
|
99
|
+
var id = core_1.buildId(params, keys)
|
|
47
100
|
if (p && p.initialize) {
|
|
48
|
-
p.initialize(id, baseProps.load, baseProps.setState, p.callback)
|
|
49
|
-
}
|
|
50
|
-
else {
|
|
101
|
+
p.initialize(id, baseProps.load, baseProps.setState, p.callback)
|
|
102
|
+
} else {
|
|
51
103
|
try {
|
|
52
|
-
baseProps.load(id, p ? p.callback : undefined)
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
p2.
|
|
56
|
-
core_1.hideLoading(p2.loading);
|
|
104
|
+
baseProps.load(id, p ? p.callback : undefined)
|
|
105
|
+
} catch (error) {
|
|
106
|
+
p2.showError(error)
|
|
107
|
+
core_1.hideLoading(p2.loading)
|
|
57
108
|
}
|
|
58
109
|
}
|
|
59
|
-
}, [])
|
|
60
|
-
return __assign({}, baseProps)
|
|
61
|
-
}
|
|
110
|
+
}, [])
|
|
111
|
+
return __assign({}, baseProps)
|
|
112
|
+
}
|
|
62
113
|
exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
|
|
63
|
-
var params = react_router_1.useParams()
|
|
64
|
-
var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p, props)
|
|
114
|
+
var params = react_router_1.useParams()
|
|
115
|
+
var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p, props)
|
|
65
116
|
react_1.useEffect(function () {
|
|
66
117
|
if (refForm) {
|
|
67
|
-
var registerEvents =
|
|
68
|
-
core_1.initForm(baseProps.refForm.current, registerEvents)
|
|
69
|
-
}
|
|
70
|
-
var n = baseProps.getModelName(refForm.current)
|
|
71
|
-
var obj = {}
|
|
72
|
-
obj[n] = baseProps.createModel()
|
|
73
|
-
baseProps.setState(obj)
|
|
74
|
-
var keys
|
|
118
|
+
var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
|
|
119
|
+
core_1.initForm(baseProps.refForm.current, registerEvents)
|
|
120
|
+
}
|
|
121
|
+
var n = baseProps.getModelName(refForm.current)
|
|
122
|
+
var obj = {}
|
|
123
|
+
obj[n] = baseProps.createModel()
|
|
124
|
+
baseProps.setState(obj)
|
|
125
|
+
var keys
|
|
75
126
|
if (p && !p.keys && service && service.metadata) {
|
|
76
|
-
var metadata =
|
|
127
|
+
var metadata = p.metadata ? p.metadata : service.metadata()
|
|
77
128
|
if (metadata) {
|
|
78
|
-
var meta =
|
|
79
|
-
keys =
|
|
80
|
-
var version =
|
|
81
|
-
p.keys = keys
|
|
82
|
-
p.version = version
|
|
129
|
+
var meta = build(metadata)
|
|
130
|
+
keys = p.keys ? p.keys : meta ? meta.keys : undefined
|
|
131
|
+
var version = p.version ? p.version : meta ? meta.version : undefined
|
|
132
|
+
p.keys = keys
|
|
133
|
+
p.version = version
|
|
83
134
|
}
|
|
84
135
|
}
|
|
85
|
-
var id = core_1.buildId(params, keys)
|
|
136
|
+
var id = core_1.buildId(params, keys)
|
|
86
137
|
if (p && p.initialize) {
|
|
87
|
-
p.initialize(id, baseProps.load, baseProps.setState, p.callback)
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
baseProps.load(id, p ? p.callback : undefined);
|
|
138
|
+
p.initialize(id, baseProps.load, baseProps.setState, p.callback)
|
|
139
|
+
} else {
|
|
140
|
+
baseProps.load(id, p ? p.callback : undefined)
|
|
91
141
|
}
|
|
92
|
-
}, [])
|
|
93
|
-
return __assign({}, baseProps)
|
|
94
|
-
}
|
|
142
|
+
}, [])
|
|
143
|
+
return __assign({}, baseProps)
|
|
144
|
+
}
|
|
95
145
|
exports.useEditOneProps = function (p) {
|
|
96
|
-
return exports.useEditProps(p.props, p.refForm, p.initialState, p.service, p, p)
|
|
97
|
-
}
|
|
146
|
+
return exports.useEditProps(p.props, p.refForm, p.initialState, p.service, p, p)
|
|
147
|
+
}
|
|
98
148
|
exports.useEditOne = function (p) {
|
|
99
|
-
return exports.useEdit(p.refForm, p.initialState, p.service, p, p)
|
|
100
|
-
}
|
|
149
|
+
return exports.useEdit(p.refForm, p.initialState, p.service, p, p)
|
|
150
|
+
}
|
|
101
151
|
exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
|
|
102
|
-
var navigate = react_router_1.useNavigate()
|
|
103
|
-
var _a = react_1.useState(),
|
|
152
|
+
var navigate = react_router_1.useNavigate()
|
|
153
|
+
var _a = react_1.useState(),
|
|
154
|
+
running = _a[0],
|
|
155
|
+
setRunning = _a[1]
|
|
104
156
|
var getModelName = function (f) {
|
|
105
157
|
if (p && p.name && p.name.length > 0) {
|
|
106
|
-
return p.name
|
|
158
|
+
return p.name
|
|
107
159
|
}
|
|
108
|
-
return core_1.getModelName(f)
|
|
109
|
-
}
|
|
110
|
-
var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale)
|
|
111
|
-
var state = baseProps.state,
|
|
160
|
+
return core_1.getModelName(f)
|
|
161
|
+
}
|
|
162
|
+
var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale)
|
|
163
|
+
var state = baseProps.state,
|
|
164
|
+
setState = baseProps.setState
|
|
112
165
|
var _b = merge_1.useMergeState({
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
166
|
+
newMode: false,
|
|
167
|
+
setBack: false,
|
|
168
|
+
readOnly: p ? p.readOnly : undefined,
|
|
169
|
+
originalModel: undefined,
|
|
170
|
+
}),
|
|
171
|
+
flag = _b[0],
|
|
172
|
+
setFlag = _b[1]
|
|
118
173
|
var showModel = function (model) {
|
|
119
|
-
var n = getModelName(refForm.current)
|
|
120
|
-
var objSet = {}
|
|
121
|
-
objSet[n] = model
|
|
122
|
-
setState(objSet)
|
|
174
|
+
var n = getModelName(refForm.current)
|
|
175
|
+
var objSet = {}
|
|
176
|
+
objSet[n] = model
|
|
177
|
+
setState(objSet)
|
|
123
178
|
if (p && p.readOnly) {
|
|
124
|
-
var f = refForm.current
|
|
125
|
-
formutil_1.setReadOnly(f)
|
|
179
|
+
var f = refForm.current
|
|
180
|
+
formutil_1.setReadOnly(f)
|
|
126
181
|
}
|
|
127
|
-
}
|
|
182
|
+
}
|
|
128
183
|
var resetState = function (newMode, model, originalModel) {
|
|
129
|
-
setFlag({ newMode: newMode, originalModel: originalModel })
|
|
130
|
-
showModel(model)
|
|
131
|
-
}
|
|
184
|
+
setFlag({ newMode: newMode, originalModel: originalModel })
|
|
185
|
+
showModel(model)
|
|
186
|
+
}
|
|
132
187
|
var _handleNotFound = function (form) {
|
|
133
|
-
var msg =
|
|
188
|
+
var msg = error_1.message(p1.resource.value, "error_404", "error")
|
|
134
189
|
if (form) {
|
|
135
|
-
formutil_1.setReadOnly(form)
|
|
136
|
-
}
|
|
137
|
-
p1.showError(
|
|
138
|
-
|
|
139
|
-
|
|
190
|
+
formutil_1.setReadOnly(form)
|
|
191
|
+
}
|
|
192
|
+
p1.showError(
|
|
193
|
+
msg.message,
|
|
194
|
+
function () {
|
|
195
|
+
return window.history.back
|
|
196
|
+
},
|
|
197
|
+
msg.title,
|
|
198
|
+
)
|
|
199
|
+
}
|
|
200
|
+
var handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
|
|
140
201
|
var _getModel = function () {
|
|
141
|
-
var n = getModelName(refForm.current)
|
|
202
|
+
var n = getModelName(refForm.current)
|
|
142
203
|
if (props) {
|
|
143
|
-
return props[n] || state[n]
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
return state[n];
|
|
204
|
+
return props[n] || state[n]
|
|
205
|
+
} else {
|
|
206
|
+
return state[n]
|
|
147
207
|
}
|
|
148
|
-
}
|
|
149
|
-
var getModel =
|
|
208
|
+
}
|
|
209
|
+
var getModel = p && p.getModel ? p.getModel : _getModel
|
|
150
210
|
var back = function (event) {
|
|
151
211
|
if (event) {
|
|
152
|
-
event.preventDefault()
|
|
212
|
+
event.preventDefault()
|
|
153
213
|
}
|
|
154
214
|
if (flag.newMode === true) {
|
|
155
|
-
navigate(-1)
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
var
|
|
159
|
-
var
|
|
160
|
-
var objKeys = Object.keys(diffObj);
|
|
215
|
+
navigate(-1)
|
|
216
|
+
} else {
|
|
217
|
+
var obj = getModel()
|
|
218
|
+
var diffObj = reflect_1.makeDiff(flag.originalModel, obj)
|
|
219
|
+
var objKeys = Object.keys(diffObj)
|
|
161
220
|
if (objKeys.length === 0) {
|
|
162
|
-
navigate(-1)
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
221
|
+
navigate(-1)
|
|
222
|
+
} else {
|
|
223
|
+
var msg = error_1.message(p1.resource.value, "msg_confirm_back", "confirm", "yes", "no")
|
|
224
|
+
p1.confirm(
|
|
225
|
+
msg.message,
|
|
226
|
+
function () {
|
|
227
|
+
navigate(-1)
|
|
228
|
+
},
|
|
229
|
+
msg.title,
|
|
230
|
+
msg.no,
|
|
231
|
+
msg.yes,
|
|
232
|
+
)
|
|
169
233
|
}
|
|
170
234
|
}
|
|
171
|
-
}
|
|
235
|
+
}
|
|
172
236
|
var _createModel = function () {
|
|
173
|
-
var metadata =
|
|
237
|
+
var metadata = p && p.metadata ? p.metadata : service.metadata ? service.metadata() : undefined
|
|
174
238
|
if (metadata) {
|
|
175
|
-
var obj = edit_1.createModel(metadata)
|
|
176
|
-
return obj
|
|
177
|
-
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
var createModel = (p && p.createModel ? p.createModel : _createModel);
|
|
239
|
+
var obj = edit_1.createModel(metadata)
|
|
240
|
+
return obj
|
|
241
|
+
} else {
|
|
242
|
+
var obj = {}
|
|
243
|
+
return obj
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
var createModel = p && p.createModel ? p.createModel : _createModel
|
|
184
247
|
var create = function (event) {
|
|
185
|
-
event.preventDefault()
|
|
186
|
-
var obj = createModel()
|
|
187
|
-
resetState(true, obj, undefined)
|
|
188
|
-
var u = p1.ui
|
|
248
|
+
event.preventDefault()
|
|
249
|
+
var obj = createModel()
|
|
250
|
+
resetState(true, obj, undefined)
|
|
251
|
+
var u = p1.ui
|
|
189
252
|
if (u) {
|
|
190
253
|
setTimeout(function () {
|
|
191
|
-
u.removeFormError(refForm.current)
|
|
192
|
-
}, 100)
|
|
254
|
+
u.removeFormError(refForm.current)
|
|
255
|
+
}, 100)
|
|
193
256
|
}
|
|
194
|
-
}
|
|
257
|
+
}
|
|
195
258
|
var _onSave = function (isBack) {
|
|
196
259
|
if (p && p.readOnly) {
|
|
197
260
|
if (flag.newMode === true) {
|
|
198
|
-
var m =
|
|
199
|
-
p1.showError(m.message, undefined, m.title)
|
|
261
|
+
var m = error_1.message(p1.resource.value, "error_permission_add", "error_permission")
|
|
262
|
+
p1.showError(m.message, undefined, m.title)
|
|
263
|
+
} else {
|
|
264
|
+
var msg = error_1.message(p1.resource.value, "error_permission_edit", "error_permission")
|
|
265
|
+
p1.showError(msg.message, undefined, msg.title)
|
|
200
266
|
}
|
|
201
|
-
|
|
202
|
-
var msg = core_1.message(p1.resource.value, 'error_permission_edit', 'error_permission');
|
|
203
|
-
p1.showError(msg.message, undefined, msg.title);
|
|
204
|
-
}
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
267
|
+
} else {
|
|
207
268
|
if (running === true) {
|
|
208
|
-
return
|
|
269
|
+
return
|
|
209
270
|
}
|
|
210
|
-
var obj_1 = getModel()
|
|
211
|
-
var metadata =
|
|
212
|
-
var keys = void 0
|
|
213
|
-
var version_1
|
|
271
|
+
var obj_1 = getModel()
|
|
272
|
+
var metadata = p && p.metadata ? p.metadata : service.metadata ? service.metadata() : undefined
|
|
273
|
+
var keys = void 0
|
|
274
|
+
var version_1
|
|
214
275
|
if (p && metadata && (!p.keys || !p.version)) {
|
|
215
|
-
var meta =
|
|
216
|
-
keys =
|
|
217
|
-
version_1 =
|
|
276
|
+
var meta = build(metadata)
|
|
277
|
+
keys = p.keys ? p.keys : meta ? meta.keys : undefined
|
|
278
|
+
version_1 = p.version ? p.version : meta ? meta.version : undefined
|
|
218
279
|
}
|
|
219
280
|
if (flag.newMode) {
|
|
220
281
|
validate(obj_1, function () {
|
|
221
|
-
var msg =
|
|
222
|
-
p1.confirm(
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
282
|
+
var msg = error_1.message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
|
|
283
|
+
p1.confirm(
|
|
284
|
+
msg.message,
|
|
285
|
+
function () {
|
|
286
|
+
doSave(obj_1, undefined, version_1, isBack)
|
|
287
|
+
},
|
|
288
|
+
msg.title,
|
|
289
|
+
msg.no,
|
|
290
|
+
msg.yes,
|
|
291
|
+
)
|
|
292
|
+
})
|
|
293
|
+
} else {
|
|
294
|
+
var diffObj_1 = reflect_1.makeDiff(flag.originalModel, obj_1, keys, version_1)
|
|
295
|
+
var objKeys = Object.keys(diffObj_1)
|
|
230
296
|
if (objKeys.length === 0) {
|
|
231
|
-
p1.showMessage(p1.resource.value(
|
|
232
|
-
}
|
|
233
|
-
else {
|
|
297
|
+
p1.showMessage(p1.resource.value("msg_no_change"))
|
|
298
|
+
} else {
|
|
234
299
|
validate(obj_1, function () {
|
|
235
|
-
var msg =
|
|
236
|
-
p1.confirm(
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
300
|
+
var msg = error_1.message(p1.resource.value, "msg_confirm_save", "confirm", "yes", "no")
|
|
301
|
+
p1.confirm(
|
|
302
|
+
msg.message,
|
|
303
|
+
function () {
|
|
304
|
+
doSave(obj_1, diffObj_1, version_1, isBack)
|
|
305
|
+
},
|
|
306
|
+
msg.title,
|
|
307
|
+
msg.no,
|
|
308
|
+
msg.yes,
|
|
309
|
+
)
|
|
310
|
+
})
|
|
240
311
|
}
|
|
241
312
|
}
|
|
242
313
|
}
|
|
243
|
-
}
|
|
244
|
-
var onSave =
|
|
314
|
+
}
|
|
315
|
+
var onSave = p && p.onSave ? p.onSave : _onSave
|
|
245
316
|
var save = function (event) {
|
|
246
|
-
event.preventDefault()
|
|
247
|
-
event.persist()
|
|
248
|
-
onSave()
|
|
249
|
-
}
|
|
317
|
+
event.preventDefault()
|
|
318
|
+
event.persist()
|
|
319
|
+
onSave()
|
|
320
|
+
}
|
|
250
321
|
var _validate = function (obj, callback) {
|
|
251
322
|
if (p1.ui) {
|
|
252
|
-
var valid = p1.ui.validateForm(refForm.current, state_1.localeOf(undefined, p1.getLocale))
|
|
323
|
+
var valid = p1.ui.validateForm(refForm.current, state_1.localeOf(undefined, p1.getLocale))
|
|
253
324
|
if (valid) {
|
|
254
|
-
callback(obj)
|
|
325
|
+
callback(obj)
|
|
255
326
|
}
|
|
327
|
+
} else {
|
|
328
|
+
callback(obj)
|
|
256
329
|
}
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
}
|
|
260
|
-
};
|
|
261
|
-
var validate = (p && p.validate ? p.validate : _validate);
|
|
330
|
+
}
|
|
331
|
+
var validate = p && p.validate ? p.validate : _validate
|
|
262
332
|
var _succeed = function (msg, origin, version, isBack, model) {
|
|
263
333
|
if (model) {
|
|
264
|
-
setFlag({ newMode: false })
|
|
334
|
+
setFlag({ newMode: false })
|
|
265
335
|
if (model && flag.setBack === true) {
|
|
266
|
-
resetState(false, model, reflect_1.clone(model))
|
|
267
|
-
}
|
|
268
|
-
|
|
269
|
-
edit_1.handleVersion(origin, version);
|
|
336
|
+
resetState(false, model, reflect_1.clone(model))
|
|
337
|
+
} else {
|
|
338
|
+
handleVersion(origin, version)
|
|
270
339
|
}
|
|
340
|
+
} else {
|
|
341
|
+
handleVersion(origin, version)
|
|
271
342
|
}
|
|
272
|
-
|
|
273
|
-
edit_1.handleVersion(origin, version);
|
|
274
|
-
}
|
|
275
|
-
p1.showMessage(msg);
|
|
343
|
+
p1.showMessage(msg)
|
|
276
344
|
if (isBack) {
|
|
277
|
-
back(undefined)
|
|
345
|
+
back(undefined)
|
|
278
346
|
}
|
|
279
|
-
}
|
|
280
|
-
var succeed =
|
|
347
|
+
}
|
|
348
|
+
var succeed = p && p.succeed ? p.succeed : _succeed
|
|
281
349
|
var _fail = function (result) {
|
|
282
|
-
var f = refForm.current
|
|
283
|
-
var u = p1.ui
|
|
350
|
+
var f = refForm.current
|
|
351
|
+
var u = p1.ui
|
|
284
352
|
if (u && f) {
|
|
285
|
-
var unmappedErrors = u.showFormError(f, result)
|
|
286
|
-
formutil_1.focusFirstError(f)
|
|
353
|
+
var unmappedErrors = u.showFormError(f, result)
|
|
354
|
+
formutil_1.focusFirstError(f)
|
|
287
355
|
if (unmappedErrors && unmappedErrors.length > 0) {
|
|
288
|
-
var t = p1.resource.value(
|
|
356
|
+
var t = p1.resource.value("error")
|
|
289
357
|
if (p1.ui && p1.ui.buildErrorMessage) {
|
|
290
|
-
var msg = p1.ui.buildErrorMessage(unmappedErrors)
|
|
291
|
-
p1.showError(msg, undefined, t)
|
|
292
|
-
}
|
|
293
|
-
|
|
294
|
-
p1.showError(unmappedErrors[0].field + ' ' + unmappedErrors[0].code + ' ' + unmappedErrors[0].message, undefined, t);
|
|
358
|
+
var msg = p1.ui.buildErrorMessage(unmappedErrors)
|
|
359
|
+
p1.showError(msg, undefined, t)
|
|
360
|
+
} else {
|
|
361
|
+
p1.showError(unmappedErrors[0].field + " " + unmappedErrors[0].code + " " + unmappedErrors[0].message, undefined, t)
|
|
295
362
|
}
|
|
296
363
|
}
|
|
297
|
-
}
|
|
298
|
-
|
|
299
|
-
var t = p1.resource.value('error');
|
|
364
|
+
} else {
|
|
365
|
+
var t = p1.resource.value("error")
|
|
300
366
|
if (result.length > 0) {
|
|
301
|
-
p1.showError(result[0].field +
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
p1.showError(t, undefined, t);
|
|
367
|
+
p1.showError(result[0].field + " " + result[0].code + " " + result[0].message, undefined, t)
|
|
368
|
+
} else {
|
|
369
|
+
p1.showError(t, undefined, t)
|
|
305
370
|
}
|
|
306
371
|
}
|
|
307
|
-
}
|
|
308
|
-
var fail =
|
|
372
|
+
}
|
|
373
|
+
var fail = p && p.fail ? p.fail : _fail
|
|
309
374
|
var _handleError = function (err) {
|
|
310
375
|
if (err) {
|
|
311
|
-
setRunning(false)
|
|
312
|
-
core_1.hideLoading(p1.loading)
|
|
313
|
-
var errHeader = p1.resource.value(
|
|
314
|
-
var errMsg = p1.resource.value(
|
|
315
|
-
var data =
|
|
376
|
+
setRunning(false)
|
|
377
|
+
core_1.hideLoading(p1.loading)
|
|
378
|
+
var errHeader = p1.resource.value("error")
|
|
379
|
+
var errMsg = p1.resource.value("error_internal")
|
|
380
|
+
var data = err && err.response ? err.response : err
|
|
316
381
|
if (data.status === 400) {
|
|
317
|
-
var errMsg_1 = p1.resource.value(
|
|
318
|
-
p1.showError(errMsg_1, undefined, errHeader)
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
p1.showError(errMsg, undefined, errHeader);
|
|
382
|
+
var errMsg_1 = p1.resource.value("error_400")
|
|
383
|
+
p1.showError(errMsg_1, undefined, errHeader)
|
|
384
|
+
} else {
|
|
385
|
+
p1.showError(errMsg, undefined, errHeader)
|
|
322
386
|
}
|
|
323
387
|
}
|
|
324
|
-
}
|
|
325
|
-
var handleError =
|
|
388
|
+
}
|
|
389
|
+
var handleError = p && p.handleError ? p.handleError : _handleError
|
|
326
390
|
var _postSave = function (r, origin, version, isPatch, backOnSave) {
|
|
327
|
-
setRunning(false)
|
|
328
|
-
core_1.hideLoading(p1.loading)
|
|
329
|
-
var x = r
|
|
330
|
-
var successMsg = p1.resource.value(
|
|
331
|
-
var newMod = flag.newMode
|
|
391
|
+
setRunning(false)
|
|
392
|
+
core_1.hideLoading(p1.loading)
|
|
393
|
+
var x = r
|
|
394
|
+
var successMsg = p1.resource.value("msg_save_success")
|
|
395
|
+
var newMod = flag.newMode
|
|
332
396
|
if (Array.isArray(x)) {
|
|
333
|
-
fail(x)
|
|
334
|
-
}
|
|
335
|
-
else if (!isNaN(x)) {
|
|
397
|
+
fail(x)
|
|
398
|
+
} else if (!isNaN(x)) {
|
|
336
399
|
if (x > 0) {
|
|
337
|
-
succeed(successMsg, origin, version, backOnSave)
|
|
338
|
-
}
|
|
339
|
-
else {
|
|
400
|
+
succeed(successMsg, origin, version, backOnSave)
|
|
401
|
+
} else {
|
|
340
402
|
if (newMod && x <= 0) {
|
|
341
|
-
handleDuplicateKey()
|
|
342
|
-
}
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
var err = p1.resource.value('error_version');
|
|
349
|
-
p1.showError(err, undefined, title);
|
|
403
|
+
handleDuplicateKey()
|
|
404
|
+
} else if (!newMod && x === 0) {
|
|
405
|
+
handleNotFound()
|
|
406
|
+
} else {
|
|
407
|
+
var title = p1.resource.value("error")
|
|
408
|
+
var err = p1.resource.value("error_version")
|
|
409
|
+
p1.showError(err, undefined, title)
|
|
350
410
|
}
|
|
351
411
|
}
|
|
352
|
-
}
|
|
353
|
-
|
|
354
|
-
var result = r;
|
|
412
|
+
} else {
|
|
413
|
+
var result = r
|
|
355
414
|
if (isPatch) {
|
|
356
|
-
var keys = Object.keys(result)
|
|
357
|
-
var a = origin
|
|
358
|
-
for (var _i = 0,
|
|
359
|
-
var k =
|
|
360
|
-
a[k] = result[k]
|
|
415
|
+
var keys = Object.keys(result)
|
|
416
|
+
var a = origin
|
|
417
|
+
for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
|
|
418
|
+
var k = keys_2[_i]
|
|
419
|
+
a[k] = result[k]
|
|
361
420
|
}
|
|
362
|
-
succeed(successMsg, a, undefined, backOnSave, a)
|
|
363
|
-
}
|
|
364
|
-
|
|
365
|
-
succeed(successMsg, origin, version, backOnSave, r);
|
|
421
|
+
succeed(successMsg, a, undefined, backOnSave, a)
|
|
422
|
+
} else {
|
|
423
|
+
succeed(successMsg, origin, version, backOnSave, r)
|
|
366
424
|
}
|
|
367
|
-
p1.showMessage(successMsg)
|
|
425
|
+
p1.showMessage(successMsg)
|
|
368
426
|
}
|
|
369
|
-
}
|
|
370
|
-
var postSave =
|
|
427
|
+
}
|
|
428
|
+
var postSave = p && p.postSave ? p.postSave : _postSave
|
|
371
429
|
var _handleDuplicateKey = function (result) {
|
|
372
|
-
var msg =
|
|
373
|
-
p1.showError(msg.message, undefined, msg.title)
|
|
374
|
-
}
|
|
375
|
-
var handleDuplicateKey =
|
|
430
|
+
var msg = error_1.message(p1.resource.value, "error_duplicate_key", "error")
|
|
431
|
+
p1.showError(msg.message, undefined, msg.title)
|
|
432
|
+
}
|
|
433
|
+
var handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
|
|
376
434
|
var _doSave = function (obj, body, version, isBack) {
|
|
377
|
-
setRunning(true)
|
|
378
|
-
core_1.showLoading(p1.loading)
|
|
379
|
-
var isBackO =
|
|
380
|
-
var patchable =
|
|
435
|
+
setRunning(true)
|
|
436
|
+
core_1.showLoading(p1.loading)
|
|
437
|
+
var isBackO = isBack != null && isBack !== undefined ? isBack : false
|
|
438
|
+
var patchable = p ? p.patchable : true
|
|
381
439
|
if (flag.newMode === false) {
|
|
382
440
|
if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
|
|
383
|
-
service
|
|
384
|
-
|
|
385
|
-
|
|
441
|
+
service
|
|
442
|
+
.patch(body)
|
|
443
|
+
.then(function (res) {
|
|
444
|
+
postSave(res, obj, version, true, isBackO)
|
|
445
|
+
})
|
|
446
|
+
.catch(handleError)
|
|
447
|
+
} else {
|
|
448
|
+
service
|
|
449
|
+
.update(obj)
|
|
450
|
+
.then(function (res) {
|
|
451
|
+
return postSave(res, obj, version, false, isBackO)
|
|
452
|
+
})
|
|
453
|
+
.catch(handleError)
|
|
386
454
|
}
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
455
|
+
} else {
|
|
456
|
+
service
|
|
457
|
+
.create(obj)
|
|
458
|
+
.then(function (res) {
|
|
459
|
+
return postSave(res, obj, version, false, isBackO)
|
|
460
|
+
})
|
|
461
|
+
.catch(handleError)
|
|
462
|
+
}
|
|
463
|
+
}
|
|
464
|
+
var doSave = p && p.doSave ? p.doSave : _doSave
|
|
396
465
|
var _load = function (_id, callback) {
|
|
397
|
-
var id = _id
|
|
398
|
-
if (id != null && id !==
|
|
399
|
-
setRunning(true)
|
|
400
|
-
core_1.showLoading(p1.loading)
|
|
401
|
-
service
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
callback
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
}
|
|
414
|
-
setRunning(false);
|
|
415
|
-
core_1.hideLoading(p1.loading);
|
|
416
|
-
}).catch(function (err) {
|
|
417
|
-
var _a, _b, _c;
|
|
418
|
-
var data = (err && err.response) ? err.response : err;
|
|
419
|
-
var r = p1.resource;
|
|
420
|
-
var title = r.value('error');
|
|
421
|
-
var msg = r.value('error_internal');
|
|
422
|
-
if (data && data.status === 422) {
|
|
423
|
-
fail((_a = err.response) === null || _a === void 0 ? void 0 : _a.data);
|
|
424
|
-
var obj = (_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.value;
|
|
425
|
-
if (obj) {
|
|
426
|
-
callback ? callback(obj, showModel) : showModel(obj);
|
|
427
|
-
}
|
|
428
|
-
}
|
|
429
|
-
else {
|
|
430
|
-
if (data && data.status === 404) {
|
|
431
|
-
handleNotFound(refForm.current);
|
|
466
|
+
var id = _id
|
|
467
|
+
if (id != null && id !== "") {
|
|
468
|
+
setRunning(true)
|
|
469
|
+
core_1.showLoading(p1.loading)
|
|
470
|
+
service
|
|
471
|
+
.load(id)
|
|
472
|
+
.then(function (obj) {
|
|
473
|
+
if (!obj) {
|
|
474
|
+
handleNotFound(refForm.current)
|
|
475
|
+
} else {
|
|
476
|
+
setFlag({ newMode: false, originalModel: reflect_1.clone(obj) })
|
|
477
|
+
if (callback) {
|
|
478
|
+
callback(obj, showModel)
|
|
479
|
+
} else {
|
|
480
|
+
showModel(obj)
|
|
481
|
+
}
|
|
432
482
|
}
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
483
|
+
setRunning(false)
|
|
484
|
+
core_1.hideLoading(p1.loading)
|
|
485
|
+
})
|
|
486
|
+
.catch(function (err) {
|
|
487
|
+
var _a, _b, _c
|
|
488
|
+
var data = err && err.response ? err.response : err
|
|
489
|
+
var r = p1.resource
|
|
490
|
+
var title = r.value("error")
|
|
491
|
+
var msg = r.value("error_internal")
|
|
492
|
+
if (data && data.status === 422) {
|
|
493
|
+
fail((_a = err.response) === null || _a === void 0 ? void 0 : _a.data)
|
|
494
|
+
var obj = (_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.value
|
|
495
|
+
if (obj) {
|
|
496
|
+
callback ? callback(obj, showModel) : showModel(obj)
|
|
436
497
|
}
|
|
437
|
-
|
|
438
|
-
|
|
498
|
+
} else {
|
|
499
|
+
if (data && data.status === 404) {
|
|
500
|
+
handleNotFound(refForm.current)
|
|
501
|
+
} else {
|
|
502
|
+
if (data.status && !isNaN(data.status)) {
|
|
503
|
+
msg = error_1.messageByHttpStatus(data.status, r.value)
|
|
504
|
+
}
|
|
505
|
+
if (data && (data.status === 401 || data.status === 403)) {
|
|
506
|
+
formutil_1.setReadOnly(refForm.current)
|
|
507
|
+
}
|
|
508
|
+
p1.showError(msg, undefined, title)
|
|
439
509
|
}
|
|
440
|
-
p1.showError(msg, undefined, title);
|
|
441
510
|
}
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
var obj = createModel();
|
|
449
|
-
setFlag({ newMode: true, originalModel: undefined });
|
|
511
|
+
setRunning(false)
|
|
512
|
+
core_1.hideLoading(p1.loading)
|
|
513
|
+
})
|
|
514
|
+
} else {
|
|
515
|
+
var obj = createModel()
|
|
516
|
+
setFlag({ newMode: true, originalModel: undefined })
|
|
450
517
|
if (callback) {
|
|
451
|
-
callback(obj, showModel)
|
|
452
|
-
}
|
|
453
|
-
|
|
454
|
-
showModel(obj);
|
|
518
|
+
callback(obj, showModel)
|
|
519
|
+
} else {
|
|
520
|
+
showModel(obj)
|
|
455
521
|
}
|
|
456
522
|
}
|
|
457
|
-
}
|
|
458
|
-
var load =
|
|
459
|
-
return __assign(__assign({}, baseProps), {
|
|
460
|
-
|
|
523
|
+
}
|
|
524
|
+
var load = p && p.load ? p.load : _load
|
|
525
|
+
return __assign(__assign({}, baseProps), {
|
|
526
|
+
back: back,
|
|
527
|
+
refForm: refForm,
|
|
528
|
+
ui: p1.ui,
|
|
529
|
+
resource: p1.resource.resource(),
|
|
530
|
+
flag: flag,
|
|
461
531
|
running: running,
|
|
462
532
|
setRunning: setRunning,
|
|
463
533
|
showModel: showModel,
|
|
@@ -470,10 +540,13 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
|
|
|
470
540
|
save: save,
|
|
471
541
|
onSave: onSave,
|
|
472
542
|
confirm: confirm,
|
|
473
|
-
validate: validate,
|
|
543
|
+
validate: validate,
|
|
544
|
+
showMessage: p1.showMessage,
|
|
545
|
+
succeed: succeed,
|
|
474
546
|
fail: fail,
|
|
475
547
|
postSave: postSave,
|
|
476
548
|
handleDuplicateKey: handleDuplicateKey,
|
|
477
549
|
load: load,
|
|
478
|
-
doSave: doSave
|
|
479
|
-
}
|
|
550
|
+
doSave: doSave,
|
|
551
|
+
})
|
|
552
|
+
}
|