q-koa 9.0.4 → 9.1.0

package/core/app.js

@@ -926,6 +926,24 @@ class APP {
             }
           }
 
+          if (fn === 'findAll') {
+            const disabledFindAllList = _.get(
+              app[appName],
+              'appConfig.disabledFindAllList',
+              []
+            )
+            if (
+              disabledFindAllList.includes(controller) &&
+              !(
+                limit >= 0 ||
+                limit !== undefined ||
+                (where && !_.isEmpty(where))
+              )
+            ) {
+              throw new Error(`请使用条件`)
+            }
+          }
+
           let myInclude
           if (include) {
             if (relate) {

package/core/config.js

@@ -131,6 +131,7 @@ module.exports = {
     excludes: ['admin'],
   },
   cacheModel: [],
+  disabledFindAllList: [],
   defaultRouter: (router) => (app) => {
     if (app.controller.cache) {
       router.get('/cache/get', app.controller.cache.get)

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

@@ -60,6 +60,15 @@ exports.loadModel = async ({ app, appName }) => {
       // const ori_target = modelList.find((m) => m.model === result[i])
       // const id = ori_target ? ori_target.id : null
       const id = i + 1
+
+      let countNumber = 0
+      if (app.model[result[i]]) {
+        countNumber = await app.model[result[i]].count()
+      }
+      if (countNumber >= 500) {
+        disabledFindAllList = [...disabledFindAllList, result[i]]
+      }
+
       const obj = {
         id,
         model: result[i],
@@ -211,6 +220,8 @@ exports.loadModel = async ({ app, appName }) => {
 
   await Promise.all([promise1, promise2])
   console.log('lodaModel success!')
+  console.warn(`disabledFindAllList: ${JSON.stringify(disabledFindAllList)}`)
+
   if (app.service.routes && app.model.routes) {
     await app.service.routes.initRouter({ app })
   } else {

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

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

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

@@ -206,8 +206,9 @@ exports.getTable = async (ctx) => {
 
   const _result = await app.sequelize.getQueryInterface().describeTable(model)
 
+  const modelAttributes = lodash.cloneDeep(app.attributes[model])
   const result = lodash.pick(_result, [
-    ...Object.keys(app.attributes[model]),
+    ...Object.keys(modelAttributes),
     'id',
     'createdid',
     'updated_at',
@@ -217,10 +218,10 @@ exports.getTable = async (ctx) => {
   const obj = {}
   if (show_virtual) {
     Array.from(
-      new Set([...Object.keys(result), ...Object.keys(app.attributes[model])])
+      new Set([...Object.keys(result), ...Object.keys(modelAttributes)])
     ).forEach((attr) => {
       obj[attr] = lodash.merge(
-        app.attributes[model][attr],
+        modelAttributes[attr],
         lodash.omitBy(result[attr], lodash.isNull),
         app.config[_model].comment && app.config[_model].comment
           ? app.config[_model].comment[attr]
@@ -230,7 +231,7 @@ exports.getTable = async (ctx) => {
   } else {
     Object.keys(result).forEach((attr) => {
       obj[attr] = lodash.merge(
-        app.attributes[model][attr],
+        modelAttributes[attr],
         lodash.omitBy(result[attr], lodash.isNull),
         app.config[_model].comment && app.config[_model].comment
           ? app.config[_model].comment[attr]

package/package.json

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