q-koa 10.1.5 → 10.2.2
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/core/app.js +2 -1
- package/core/file/plugins/setting/model.js +6 -1
- package/core/validator.js +12 -5
- package/package.json +1 -1
package/core/app.js
CHANGED
|
@@ -266,6 +266,7 @@ class APP {
|
|
|
266
266
|
|
|
267
267
|
starter.on('loadAll', async () => {
|
|
268
268
|
const appName = this.config.includes[0]
|
|
269
|
+
if (!this.app[appName]) throw new Error(`没有生成应用${this.config.includes[0]},请检查config includes`)
|
|
269
270
|
this.server = this.app.listen(this.port, () => {
|
|
270
271
|
console.log(
|
|
271
272
|
`${moment().format(
|
|
@@ -996,7 +997,7 @@ class APP {
|
|
|
996
997
|
|
|
997
998
|
if (!Array.isArray(strInclude))
|
|
998
999
|
throw new Error(`可能include不是一个数组`)
|
|
999
|
-
|
|
1000
|
+
|
|
1000
1001
|
myInclude =
|
|
1001
1002
|
app[appName] &&
|
|
1002
1003
|
app[appName].include &&
|
|
@@ -51,7 +51,12 @@ exports.value = {
|
|
|
51
51
|
case 'switch':
|
|
52
52
|
return Boolean(Number(this.getDataValue('value')))
|
|
53
53
|
case 'list':
|
|
54
|
-
|
|
54
|
+
try {
|
|
55
|
+
const value = JSON.parse(this.getDataValue('value'))
|
|
56
|
+
return value
|
|
57
|
+
} catch (e) {
|
|
58
|
+
return this.getDataValue('value')
|
|
59
|
+
}
|
|
55
60
|
case 'input':
|
|
56
61
|
return this.getDataValue('value')
|
|
57
62
|
case 'decimal':
|
package/core/validator.js
CHANGED
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
const { default: Schema } = require('async-validator')
|
|
1
|
+
const { default: Schema } = require('async-validator')
|
|
2
2
|
|
|
3
3
|
module.exports = class Validator {
|
|
4
4
|
constructor(descriptor) {
|
|
5
|
-
this.validator = new Schema(descriptor)
|
|
5
|
+
this.validator = new Schema(descriptor)
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
async validate(data) {
|
|
9
9
|
try {
|
|
10
|
-
return await this.validator.validate(data)
|
|
10
|
+
return await this.validator.validate(data)
|
|
11
11
|
} catch (e) {
|
|
12
|
-
throw new Error(
|
|
12
|
+
throw new Error(
|
|
13
|
+
e.errors.map(
|
|
14
|
+
(item) =>
|
|
15
|
+
`${process.env.NODE_ENV === 'production' ? '' : item.field + ':'}${
|
|
16
|
+
item.message
|
|
17
|
+
}`
|
|
18
|
+
)
|
|
19
|
+
)
|
|
13
20
|
}
|
|
14
21
|
}
|
|
15
|
-
}
|
|
22
|
+
}
|