q-koa 13.2.9 → 13.3.0

package/core/app.js

@@ -1974,8 +1974,6 @@ class APP {
             (ctx.request[`${appName}-user`] &&
               ((ctx.request[`${appName}-user`].name &&
                 ctx.request[`${appName}-user`].name === 'admin') ||
-                (ctx.request[`${appName}-user`].mobile &&
-                  ctx.request[`${appName}-user`].mobile === '18978909244') ||
                 ctx.request[`${appName}-user`].is_admin ||
                 ctx.request[`${appName}-user`].is_dev))
               ? ['updated_at']

package/core/file/plugins/model_attributes/config.js

@@ -8,5 +8,5 @@ module.exports = {
   defaultOrder: [],
   comment: {},
   reference: [],
-  
-};
+  indexList: [{ fields: ['model_id'] }],
+}

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

@@ -149,7 +149,7 @@ exports.initModel = async (ctx) => {
           )
           .then((res) => res.data)
         if (code === 200) {
-          const findList = Object.keys(productionModel).filter((key) => {
+          const findList = Object.keys(productionModel || {}).filter((key) => {
             return (
               !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
               !Object.keys(app.attributes[model]).includes(key)

package/core/file/utils/index.js

@@ -279,7 +279,7 @@ const $in = {
 }
 const $between = {
   check: (param) =>
-    Array.isArray(param) && param.every((p) => typeof param === 'string'),
+    Array.isArray(param) && param.every((p) => typeof p === 'string'),
   result: (param, key) => {
     if (param[key].every((i) => getLiteral(i))) {
       return {
@@ -322,7 +322,7 @@ exports.formatLiteralObj = (target) => {
   return target
 }
 
-exports.filterFunction = (target, data) => {
+const filterFunction = (target, data) => {
   if (!target) {
     return false
   }
@@ -333,6 +333,16 @@ exports.filterFunction = (target, data) => {
     if (typeof target[key] === 'boolean') {
       return Boolean(data[key]) === target[key]
     }
+    if ('$and' in target) {
+      return target.$and.every((item) => {
+        return filterFunction(item, data)
+      })
+    }
+    if ('$or' in target) {
+      return target.$or.some((item) => {
+        return filterFunction(item, data)
+      })
+    }
     if (Array.isArray(target[key])) {
       return target[key].includes(data[key])
     }
@@ -386,3 +396,5 @@ exports.filterFunction = (target, data) => {
     return data[key] === target[key]
   })
 }
+
+exports.filterFunction = filterFunction

package/package.json

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