q-koa 11.3.3 → 11.4.0

package/core/app.js

@@ -853,6 +853,7 @@ class APP {
         !_.get(app, `${appName}.model.${controller}`) ||
         !_.get(app, `${appName}.controller.${controller}`)
       ) {
+        console.error(`${controller}`)
         throw new Error('路由model定义缺失')
       }
       await next()
@@ -870,6 +871,7 @@ class APP {
         !_.get(app, `${appName}.model.${controller}.${fn}`) &&
         !_.get(app, `${appName}.controller.${controller}.${fn}`)
       ) {
+        console.error(`${controller}.${fn}`)
         throw new Error('路由fn定义缺失')
       }
 

package/core/file/plugins/system/controller.js

@@ -22,7 +22,11 @@ exports.initModel = async (ctx) => {
         alter: true,
       }
 
+  const appConfig = getConfig(app)
   if (Array.isArray(model)) {
+    const { is_dev } = await appConfig.getObject('base')
+    if (!is_dev && option === 'force')
+      throw new Error('正式环境不允许array model force')
     await Promise.all(model.map((m) => app.model[m].sync(config)))
     return ctx.SUCCESS('ok')
   }
@@ -180,7 +184,7 @@ exports.showTables = async (ctx) => {
       autoData: lodash.get(target, 'autoData', null),
       // 有些model需要前置查询其它model数据
       initList: lodash.get(target, 'initList', []),
-      // 有些model的table需要前置查询模型
+      // 有些table需要前置查询数据
       initTableList: lodash.get(target, 'initTableList', []),
       // 局部更新列表
       editInline: lodash.get(target, 'editInline', {}),
@@ -188,9 +192,9 @@ exports.showTables = async (ctx) => {
       comment: lodash.get(target, 'comment', {}),
       // 默认查询，覆盖之前
       modelQuery: lodash.get(target, 'modelQuery', {}),
-      // 插入字段，覆盖之前
+      // 默认更新，覆盖之前
       modelUpsert: lodash.get(target, 'modelUpsert', {}),
-      // 编辑软删除
+      // 软删除比如is_on:false,就upsert
       modelDelete: lodash.get(target, 'modelDelete', {}),
       // 删除时检查是不是含有
       deleteCheckList: lodash.get(target, 'deleteCheckList', []),

package/core/file/plugins/system/validate.js

@@ -3,9 +3,12 @@ const { Validator, getAppByCtx } = require('q-koa')
 exports.initModel = async (ctx) => {
   const params = {
     model: {
-      type: 'string',
       required: true,
       message: '请输入model',
+      validator: (rule, value) =>
+        typeof value === 'string' || Array.isArray(value)
+          ? Promise.resolve()
+          : Promise.reject(new Error('string | array')),
     },
   }
   await new Validator(params).validate(ctx.request.body)
@@ -22,7 +25,7 @@ exports.showAllSchemas = async (ctx) => {
       validator: (rule, value) =>
         app[appName].model && app[appName].model[value]
           ? Promise.resolve()
-          : Promise.reject('没有这个模型'),
+          : Promise.reject(new Error('没有这个模型')),
     },
   }
   await new Validator(params).validate(ctx.request.body)
@@ -39,7 +42,7 @@ exports.dropModel = async (ctx) => {
       validator: (rule, value) =>
         app[appName].model && app[appName].model[value]
           ? Promise.resolve()
-          : Promise.reject('没有这个模型'),
+          : Promise.reject(new Error('没有这个模型')),
     },
   }
   await new Validator(params).validate(ctx.request.body)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "11.3.3",
+  "version": "11.4.0",
   "description": "",
   "main": "index.js",
   "scripts": {