q-koa 7.8.3 → 7.8.6

package/core/app.js

@@ -729,17 +729,31 @@ class APP {
         }
 
         if (model1 && this.app[appName].model[model1]) {
-          this.app[appName].model[model].hasOne(
-            this.app[appName].model[model1],
-            {
-              foreignKey: 'id',
-              sourceKey: `${model1}_id`,
-              constraints: false,
-            }
-          )
-          this.app[appName].include[model].push({
-            model: this.app[appName].model[model1],
-          })
+          const is_multiple =
+            (this.app[appName].attributes[model][model1 + '_id'].defaultValue &&
+              Array.isArray(
+                this.app[appName].attributes[model][model1 + '_id'].defaultValue
+              )) ||
+            (this.app[appName].attributes[model][model1 + '_id'].type &&
+              this.app[appName].attributes[model][model1 + '_id'].type ===
+                'JSON') ||
+            (this.app[appName].attributes[model][model1 + '_id'].type &&
+              this.app[appName].attributes[model][model1 + '_id'].type.key &&
+              this.app[appName].attributes[model][model1 + '_id'].type.key ===
+                'JSON')
+          if (!is_multiple) {
+            this.app[appName].model[model].hasOne(
+              this.app[appName].model[model1],
+              {
+                foreignKey: 'id',
+                sourceKey: `${model1}_id`,
+                constraints: false,
+              }
+            )
+            this.app[appName].include[model].push({
+              model: this.app[appName].model[model1],
+            })
+          }
           if (
             this.app[appName].attributes[model][`${model1}_id`].hasOne &&
             this.app[appName].attributes[model][`${model1}_id`].hasOne === true
@@ -1500,7 +1514,7 @@ class APP {
                   if (rows.length === 0) ctx.SUCCESS([])
                   let objList = {}
                   for (let j = 0; j < specialInclude.length; j++) {
-                    const model = specialInclude[j].model
+                    const { model, ...rest } = specialInclude[j]
                     const modelName = model.getName()
                     const modelIdList = _.uniq(
                       rows
@@ -1517,6 +1531,7 @@ class APP {
                         where: {
                           id: modelIdList,
                         },
+                        ...rest,
                       })
                       objList = {
                         ...objList,
@@ -1721,6 +1736,9 @@ APP.moment = moment
 global.moment = moment
 global.Sequelize = Sequelize
 global.lodash = _
+
+APP.sleep = (time) => new Promise((resolve) => setTimeout(resolve, time * 1000))
+
 APP.getService = (name) => {
   const target = require(path.resolve(__dirname, `./file/services/${name}`))
   return target

package/core/config.js

@@ -81,6 +81,7 @@ module.exports = {
       $neq: Sequelize.Op.ne,
       $eq: Sequelize.Op.eq,
       $like: Sequelize.Op.like,
+      $notLike: Sequelize.Op.notLike,
       $or: Sequelize.Op.or,
       $and: Sequelize.Op.and,
       $gt: Sequelize.Op.gt,

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

@@ -174,6 +174,8 @@ exports.showTables = async (ctx) => {
       modelQuery: lodash.get(target, 'modelQuery', {}),
       // 删除时检查是不是含有
       deleteCheckList: lodash.get(target, 'deleteCheckList', []),
+      // 批量更新字段
+      bulkCreateList: lodash.get(target, 'bulkCreateList', []),
     }
   })
 

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

@@ -4,12 +4,30 @@ const { getAppByCtx, getConfig } = require('q-koa')
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { mobile, password, ...rest } = ctx.request.body
+  const where =
+    process.env.NODE_ENV !== 'production'
+      ? {
+          $or: [
+            {
+              mobile,
+              password: [md5(password), password],
+              ...rest,
+            },
+            {
+              id: mobile,
+              password: [md5(password), password],
+              ...rest,
+            },
+          ],
+        }
+      : {
+          mobile,
+          password: [md5(password), password],
+          ...rest,
+        }
+
   let result = await app.model.user.findOne({
-    where: {
-      mobile,
-      password: [md5(password), password],
-      ...rest,
-    },
+    where,
   })
   if (!result) throw new Error('账号密码错误')
   console.log('user==>', ctx.request[`${appName}-user`])

package/package.json

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