q-koa 13.4.1 → 13.4.2

package/core/app.js

@@ -23,7 +23,23 @@ const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
 const { getObject, getAppConfig, formatLiteralObj } = require('./file/utils')
-
+const redisVirtual = {
+  hSet: () => {
+    console.log('redisVirtual hSet')
+  },
+  hGet: () => {
+    console.log('redisVirtual hGet')
+  },
+  set: () => {
+    console.log('redisVirtual set')
+  },
+  get: () => {
+    console.log('redisVirtual get')
+  },
+  publish: () => {
+    console.log('redisVirtual publish')
+  },
+}
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -467,6 +483,7 @@ class APP {
         } else {
           this.app[appName] = {
             sequelize: db,
+            redisClient: redisVirtual,
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
               this.config.app,
@@ -686,7 +703,53 @@ class APP {
                 const indexes = _.cloneDeep(
                   _.get(this.app[appName].config[folder], 'indexList', [])
                 )
+                let hookList = _.cloneDeep(
+                  _.get(this.app[appName].config[folder], 'hookList', [])
+                )
+                if (
+                  hookList.some((h) =>
+                    ['afterDestroy', 'beforeDestroy'].includes(h)
+                  ) &&
+                  !hookList.includes('beforeBulkDestroy')
+                ) {
+                  hookList = [...hookList, 'beforeBulkDestroy']
+                }
+                let reduceHook = {}
+                for (let i = 0; i < hookList.length; i++) {
+                  const hook = hookList[i]
+                  reduceHook = {
+                    ...reduceHook,
+                    [hook]: (target, t) => {
+                      if (['beforeBulkDestroy'].includes(hook)) {
+                        target.individualHooks = true
+                      }
+                      try {
+                        this.app[appName].service &&
+                          this.app[appName].service[folder] &&
+                          this.app[appName].service[folder][hook] &&
+                          this.app[appName].service[folder][hook]({
+                            app: this.app[appName],
+                            model: folder,
+                            hook,
+                            ...(target.toJSON
+                              ? {
+                                  target: target.toJSON(),
+                                }
+                              : {
+                                  target,
+                                }),
+                            ...t,
+                          })
+                      } catch (e) {
+                        console.log(e)
+                      }
 
+                      if (['beforeBulkDestroy'].includes(hook)) {
+                        return target
+                      }
+                    },
+                  }
+                }
                 const instance = this.app[appName].sequelize.define(
                   folder,
                   attributes,
@@ -701,6 +764,7 @@ class APP {
                       plural: `${folder}s`,
                     },
                     hooks: {
+                      ...reduceHook,
                       beforeCreate: (res, t) => {
                         try {
                           if (folder === 'log') {
@@ -1120,7 +1184,7 @@ class APP {
           } = ctx.request.body
           if (['findOne', 'findAll', 'findAndCountAll'].includes(fn)) {
             if (!_.isEmpty(other)) {
-              throw new Error('参数不合理，条件需要放在where里')
+              throw new Error('参数不合理')
             }
           }
 

package/core/file/plugins/model/model.js

@@ -219,3 +219,10 @@ exports.alias = {
     return name + model
   },
 }
+
+exports.hookList = {
+  type: Sequelize.JSON,
+  comment: 'hookd',
+  allowNull: false,
+  defaultValue: [],
+}

package/core/file/plugins/model/service.js

@@ -111,6 +111,7 @@ exports.loadModel = async ({ app, appName }) => {
         deleteCheckList: config.deleteCheckList,
         bulkCreateList: config.bulkCreateList,
         indexList: config.indexList,
+        hookList: config.hookList,
         list: attributes.map((attr, index) => {
           const name = attr.match(/exports.(.*)=/)[1].trim()
           let defaultValue = ''

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

@@ -230,12 +230,19 @@ exports.customRouter = async (ctx) => {
   return list
 }
 
-exports.showTables = async (ctx) => {
+exports.showTables = async (ctx, _data) => {
   const { app, appName } = getAppByCtx(ctx)
+  const { omit = [] } = _data || ctx.request.body
 
+  const mapFn = (item) => {
+    if (omit.length === 0) return item
+    return lodash.omit(item.toJSON ? item.toJSON() : item, omit)
+  }
   if (app.cache && app.cache.get('showTables')) {
-    ctx.SUCCESS(app.cache.get('showTables'))
-    return app.cache.get('showTables')
+    const cacheResult = app.cache.get('showTables')
+    const payLoad = cacheResult.map(mapFn)
+    ctx.SUCCESS(payLoad)
+    return payLoad
   }
 
   const pluginDir = path.resolve(
@@ -315,7 +322,13 @@ exports.showTables = async (ctx) => {
       // 可排序字段
       order: lodash.get(target, 'order', []),
       // 默认排序
-      defaultOrder: lodash.get(target, 'defaultOrder', []),
+      defaultOrder: getValueByModelName(
+        target,
+        'defaultOrder',
+        [],
+        model,
+        _model
+      ),
       // 下拉筛选
       select: getValueByModelName(target, 'select', [], model, _model),
       // 是否可以选择批量删除
@@ -356,19 +369,25 @@ exports.showTables = async (ctx) => {
       // can be mock boolean
       mock,
       // reference model query
-      referenceSelect: lodash.get(target, 'referenceSelect', []),
+      referenceSelect: getValueByModelName(
+        target,
+        'referenceSelect',
+        [],
+        model,
+        _model
+      ),
       // 是否可以选择批量删除
       availableSort: lodash.get(target, 'availableSort', false),
       // 用于后台管理不要查询太多数据，常用于表多的model
       autoData: lodash.get(target, 'autoData', null),
       // 有些model需要前置查询其它model数据
-      initList: lodash.get(target, 'initList', []),
+      initList: getValueByModelName(target, 'initList', [], model, _model),
       // 有些table需要前置查询数据
       initTableList: lodash.get(target, 'initTableList', []),
       // 局部更新列表
       editInline: lodash.get(target, 'editInline', {}),
       // 有些model需要前置查询其它model数据
-      comment: lodash.get(target, 'comment', {}),
+      comment: getValueByModelName(target, 'comment', {}, model, _model),
       // 默认查询，覆盖之前
       modelQuery: lodash.get(target, 'modelQuery', {}),
       // 默认更新，覆盖之前
@@ -386,9 +405,10 @@ exports.showTables = async (ctx) => {
     }
   })
 
-  ctx.SUCCESS(models)
-  app.cache && app.cache.set('showTables', models)
-  return models
+  const payLoad = models.map(mapFn)
+  ctx.SUCCESS(payLoad)
+  app.cache && app.cache.set('showTables', models.map(mapFn))
+  return payLoad
 }
 
 exports.getTable = async (ctx) => {

package/package.json

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