q-koa 8.6.7 → 8.7.2

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

@@ -4,7 +4,7 @@ module.exports = {
   multiple: false,
   availableSort: true,
   order: [],
-  select: [],
+  select: [{ key: 'parent_id' }],
   excludes: [],
   limit: 40,
   defaultOrder: [{ sort: 'ascending', type: 'sortOrder' }],

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

@@ -1,7 +1,6 @@
 const { getConfig, lodash } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
-const { is } = require('cheerio/lib/api/traversing')
 
 exports.initData = async ({ includes, excludes, app, ctx }) => {
   const appConfig = getConfig(app)

package/core/file/utils/index.js

@@ -16,11 +16,37 @@ exports.getList = (config) => (type) => {
 }
 
 exports.getObject = (config, app) => async (type) => {
+  const obj = config.find((i) => i.code === type)
+  let flag = false
+  const temObj = {}
+  if (obj) {
+    const list = config.filter((i) => i.parent_id === obj.id)
+
+    for (let i = 0; i < list.length; i++) {
+      if (list[i].type === 'decimal') {
+        temObj[list[i].code] = Number(list[i].value)
+      } else if (list[i].type === 'switch') {
+        temObj[list[i].code] = Boolean(Number(list[i].value))
+      } else {
+        temObj[list[i].code] = list[i].value
+      }
+    }
+    flag = true
+  }
+
   const findConfig = (item) => item.config === type || item.pay_config === type
   if (app) {
     const applicationList = app.cache.get('application')
-    if (applicationList && applicationList.find(findConfig)) {
-      return applicationList.find(findConfig)
+    if (
+      applicationList &&
+      applicationList.find(findConfig) &&
+      applicationList.find(findConfig)
+    ) {
+      flag = true
+      return {
+        ...applicationList.find(findConfig),
+        ...temObj,
+      }
     }
 
     if (!applicationList) {
@@ -32,25 +58,17 @@ exports.getObject = (config, app) => async (type) => {
 
           const target = result.find(findConfig)
           if (target) {
-            return target
+            flag = true
+            return {
+              ...target,
+              ...temObj,
+            }
           }
         }
       }
     }
   }
-  const obj = config.find((i) => i.code === type)
-  if (!obj) throw new Error(`找不到${type}相关设置`)
-  const list = config.filter((i) => i.parent_id === obj.id)
-  const temObj = {}
-  for (let i = 0; i < list.length; i++) {
-    if (list[i].type === 'decimal') {
-      temObj[list[i].code] = Number(list[i].value)
-    } else if (list[i].type === 'switch') {
-      temObj[list[i].code] = Boolean(Number(list[i].value))
-    } else {
-      temObj[list[i].code] = list[i].value
-    }
-  }
+  if (!flag) throw new Error(`找不到${type}相关设置`)
   return temObj
 }
 

package/package.json

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