q-koa 13.8.45 → 13.8.46

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

@@ -543,22 +543,21 @@ exports.initDataWithCache = exports.initData = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
 
-  const { is_cache } = await appConfig.getObject('base')
+  const { is_cache, version: cacheVersion } = await appConfig.getObject('base')
   const { includes, excludes = [] } = ctx.request.body
   if (!includes) {
     return ctx.SUCCESS(null)
   }
-  const cacheTarget = JSON.stringify(ctx.request.body)
+  const cacheTarget = is_cache ? JSON.stringify(ctx.request.body) : ''
 
-  let result = null
-  if (is_cache && cache.get(cacheTarget)) {
-    result = cache.get(cacheTarget)
-  } else {
+  let result = is_cache ? cache.get(cacheTarget) : null
+  if (!result) {
     result = await app.service.system.initData({
       app,
       includes,
       excludes,
       ctx,
+      cacheVersion,
     })
     if (is_cache && cacheTarget.includes('setting/findAll')) {
       cache.set(cacheTarget, result)

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

@@ -1,5 +1,5 @@
 const lodash = require('lodash')
-const { getConfig, Sequelize } = require('q-koa')
+const { Sequelize } = require('q-koa')
 const { formatLiteralObj, filterFunction } = require('../../utils')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
@@ -17,19 +17,17 @@ const getLiteral = (str) => {
   }
   return ''
 }
-exports.initData = async ({ includes, excludes, app, ctx }) => {
-  const appConfig = getConfig(app)
-  const { version: cacheVersion } = await appConfig.getObject('base')
-
+exports.initData = async ({ includes, excludes, app, ctx, cacheVersion }) => {
   const apiVersion = ctx.request.header.version
   const config = ctx.request.header.config
 
   if (!(excludes instanceof Array)) {
     excludes = [excludes]
   }
+  const excludeSet = new Set(excludes)
   const result = await Promise.all(
     Object.keys(includes)
-      .filter((item) => excludes.includes(item) || excludes.length === 0)
+      .filter((item) => excludeSet.has(item) || excludes.length === 0)
       .map((item) => {
         const route = includes[item]
         if (lodash.isObject(route)) {
@@ -125,14 +123,17 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             Array.isArray(excludeInclude) &&
             excludeInclude.length > 0
           ) {
+            const excludeNameSet = new Set(excludeInclude)
+            const excludeModelSet = new Set(
+              excludeInclude
+                .map((m) => app.model[m])
+                .filter((m) => m !== undefined)
+            )
             myInclude = myInclude.filter((i) => {
-              if (excludeInclude.includes(model)) return false
-              if (excludeInclude.includes(i.as)) return false
+              if (excludeNameSet.has(model)) return false
+              if (excludeNameSet.has(i.as)) return false
               return (
-                (excludeInclude.every((m) => {
-                  return app.model[m] !== i.model
-                }) ||
-                  i.as) &&
+                (!excludeModelSet.has(i.model) || i.as) &&
                 !(
                   i.as &&
                   data.attributes &&
@@ -254,7 +255,9 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
         }).then((res) => {
           app.cache && app.cache.set(`${model}`, res)
           const cacheModel = lodash.get(app, 'appConfig.cacheModel', [])
-          app.appConfig.cacheModel = Array.from(new Set([...cacheModel, model]))
+          if (!cacheModel.includes(model)) {
+            app.appConfig.cacheModel = [...cacheModel, model]
+          }
           return {
             [item]: res,
           }
@@ -275,14 +278,24 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
       }
     }
 
+    const settingById = new Map()
+    const codeCount = new Map()
+    for (const s of obj.setting) {
+      settingById.set(s.id, s)
+      codeCount.set(s.code, (codeCount.get(s.code) || 0) + 1)
+    }
+
     return {
       ...obj,
       setting: obj.setting.map((i) => {
         let reset = true
         if (i.parent_id) {
-          const parent = obj.setting.find((s) => s.id === i.parent_id)
-          const same = obj.setting.filter((s) => s.code === i.code)
-          if (parent && parent.code !== config && same.length > 1) {
+          const parent = settingById.get(i.parent_id)
+          if (
+            parent &&
+            parent.code !== config &&
+            (codeCount.get(i.code) || 0) > 1
+          ) {
             reset = false
           }
         }

package/package.json

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