q-koa 8.6.2 → 8.6.5

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

@@ -42,6 +42,13 @@ exports.availableSort = {
   defaultValue: false,
 }
 
+exports.referenceSelect = {
+  type: Sequelize.JSON,
+  comment: '筛选',
+  allowNull: false,
+  defaultValue: [],
+}
+
 exports.select = {
   type: Sequelize.JSON,
   comment: '筛选',

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

@@ -219,7 +219,7 @@ exports.getTable = async (ctx) => {
     ).forEach((attr) => {
       obj[attr] = lodash.merge(
         app.attributes[model][attr],
-        result[attr],
+        lodash.omitBy(result[attr], lodash.isNull),
         app.config[_model].comment && app.config[_model].comment
           ? app.config[_model].comment[attr]
           : {}
@@ -229,7 +229,7 @@ exports.getTable = async (ctx) => {
     Object.keys(result).forEach((attr) => {
       obj[attr] = lodash.merge(
         app.attributes[model][attr],
-        result[attr],
+        lodash.omitBy(result[attr], lodash.isNull),
         app.config[_model].comment && app.config[_model].comment
           ? app.config[_model].comment[attr]
           : {}

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

@@ -1,6 +1,6 @@
 const md5 = require('js-md5')
 const { getAppByCtx, getConfig, lodash } = require('q-koa')
-
+const { getAppConfig } = require('../../utils')
 exports.login = async (ctx) => {
   const { app, appName } = getAppByCtx(ctx)
   const { mobile, password, ...rest } = ctx.request.body
@@ -259,11 +259,20 @@ exports.checkLogin = async (ctx) => {
           return app.model[m] !== i.model
         })
       })
+      const { exclude_list = [] } = await getAppConfig({ app, config })
+      const attributes = {
+        exclude: Array.from(
+          new Set([
+            ...app.appConfig.loginData.attributes.exclude,
+            ...(Array.isArray(exclude_list) ? exclude_list : []),
+          ])
+        ),
+      }
       result = await app.model.user.findOne({
         where: {
           id: ctx.request[`${appName}-user`].id,
         },
-        attributes: app.appConfig.loginData.attributes,
+        attributes,
         include,
       })
     } else {

package/core/file/utils/index.js

@@ -140,3 +140,13 @@ exports.getImageType = (fileBuffer) => {
   // 未能识别到该文件类型
   return ''
 }
+
+exports.getAppConfig = async ({ app, config }) => {
+  if (!config || !app) return null
+  const application =
+    app.cache.get('application') || (await app.model.application.findAll())
+
+  const target = application.find((a) => a.config === config)
+
+  return target
+}

package/package.json

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