Skip to content

Commit 0d877bc

Browse files
committed
feat/model-driven
1 parent d523d6d commit 0d877bc

3 files changed

Lines changed: 32 additions & 81 deletions

File tree

packages/builtinComponent/src/components/BaseForm.vue

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ const insertApi = (data = modelData.value) => {
118118
return getMetaApi(META_SERVICE.Http)
119119
.post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
120120
.then((res) => {
121-
if (res.code === 200) {
122-
return res.data
123-
} else {
124-
throw new Error('request fail')
125-
}
121+
return res.data
126122
})
127123
.catch((err) => {
128124
throw new Error(err)
@@ -143,11 +139,7 @@ const updateApi = (data = modelData.value) => {
143139
params: { id }
144140
})
145141
.then((res) => {
146-
if (res.code === 200) {
147-
return res.data
148-
} else {
149-
throw new Error('request fail')
150-
}
142+
return res.data
151143
})
152144
.catch((err) => {
153145
throw new Error(err)
@@ -168,10 +160,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
168160
params: data || modelData.value
169161
})
170162
.then((res) => {
171-
if (res.code === 200) {
172-
return res.data
173-
}
174-
throw new Error('request fail')
163+
return res.data
175164
})
176165
.catch((err) => {
177166
throw new Error(err)
@@ -186,11 +175,7 @@ const deleteApi = () => {
186175
return getMetaApi(META_SERVICE.Http)
187176
.post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
188177
.then((res) => {
189-
if (res.code === 200) {
190-
return res.data
191-
} else {
192-
throw new Error('request fail')
193-
}
178+
return res.data
194179
})
195180
.catch((err) => {
196181
throw new Error(err)

packages/builtinComponent/src/components/BasePage.vue

Lines changed: 22 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,12 @@ const insertApi = (data = addFormData.value) => {
305305
return getMetaApi(META_SERVICE.Http)
306306
.post(apiInfo.url, { nameEn: pageModel.value.nameEn, params: data })
307307
.then((res) => {
308-
console.log(res)
309-
if (res.code === 200) {
310-
Notify({
311-
type: 'success',
312-
message: res.data.message,
313-
position: 'top-right'
314-
})
315-
return res.data
316-
} else {
317-
throw new Error('request fail')
318-
}
308+
Notify({
309+
type: 'success',
310+
message: '新增成功',
311+
position: 'top-right'
312+
})
313+
return res.data
319314
})
320315
.catch((err) => {
321316
throw new Error(err)
@@ -336,17 +331,12 @@ const updateApi = (data = addFormData.value) => {
336331
params: { id }
337332
})
338333
.then((res) => {
339-
console.log(res)
340-
if (res.code === 200) {
341-
Notify({
342-
type: 'success',
343-
message: res.data.message,
344-
position: 'top-right'
345-
})
346-
return res.data
347-
} else {
348-
throw new Error('request fail')
349-
}
334+
Notify({
335+
type: 'success',
336+
message: '修改成功',
337+
position: 'top-right'
338+
})
339+
return res.data
350340
})
351341
.catch((err) => {
352342
throw new Error(err)
@@ -367,14 +357,10 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
367357
params: data
368358
})
369359
.then((res) => {
370-
console.log(res)
371-
if (res.code === 200) {
372-
tableData.value = res.data.list
373-
pagerState.total = res.data.total
374-
emit('update:tableData', tableData.value)
375-
return res.data
376-
}
377-
throw new Error('request fail')
360+
tableData.value = res.data.list
361+
pagerState.total = res.data.total
362+
emit('update:tableData', tableData.value)
363+
return res.data
378364
})
379365
.catch((err) => {
380366
throw new Error(err)
@@ -389,17 +375,12 @@ const deleteApi = (evidence) => {
389375
return getMetaApi(META_SERVICE.Http)
390376
.post(apiInfo.url, { ...evidence, nameEn: pageModel.value.nameEn })
391377
.then((res) => {
392-
console.log(res)
393-
if (res.code === 200) {
394-
Notify({
395-
type: 'success',
396-
message: res.data.message,
397-
position: 'top-right'
398-
})
399-
return res.data
400-
} else {
401-
throw new Error('request fail')
402-
}
378+
Notify({
379+
type: 'success',
380+
message: '已删除',
381+
position: 'top-right'
382+
})
383+
return res.data
403384
})
404385
.catch((err) => {
405386
throw new Error(err)

packages/builtinComponent/src/components/BaseTable.vue

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,7 @@ const insertApi = (data = {}) => {
172172
return getMetaApi(META_SERVICE.Http)
173173
.post(apiInfo.url, { nameEn: tableModel.value.nameEn, params: data })
174174
.then((res) => {
175-
if (res.code === 200) {
176-
return res.data
177-
} else {
178-
throw new Error('request fail')
179-
}
175+
return res.data
180176
})
181177
.catch((err) => {
182178
throw new Error(err)
@@ -197,11 +193,7 @@ const updateApi = (data) => {
197193
params: { id }
198194
})
199195
.then((res) => {
200-
if (res.code === 200) {
201-
return res.data
202-
} else {
203-
throw new Error('request fail')
204-
}
196+
return res.data
205197
})
206198
.catch((err) => {
207199
throw new Error(err)
@@ -224,12 +216,9 @@ const queryApi = (
224216
params: data
225217
})
226218
.then((res) => {
227-
if (res.code === 200) {
228-
tableData.value = res.data.list
229-
pagerState.total = res.data.total
230-
return res.data
231-
}
232-
throw new Error('request fail')
219+
tableData.value = res.data.list
220+
pagerState.total = res.data.total
221+
return res.data
233222
})
234223
.catch((err) => {
235224
throw new Error(err)
@@ -244,11 +233,7 @@ const deleteApi = (evidence) => {
244233
return getMetaApi(META_SERVICE.Http)
245234
.post(apiInfo.url, { ...evidence, nameEn: tableModel.value.nameEn })
246235
.then((res) => {
247-
if (res.status === 200) {
248-
return res.data
249-
} else {
250-
throw new Error('request fail')
251-
}
236+
return res.data
252237
})
253238
.catch((err) => {
254239
throw new Error(err)

0 commit comments

Comments
 (0)