q-koa 13.1.4 → 13.1.6

package/core/app.js

@@ -1207,6 +1207,19 @@ class APP {
                 }
                 return target
               }
+
+              if (
+                where.hasOwnProperty('id') &&
+                typeof where.id === 'string' &&
+                where.id.includes('/')
+              ) {
+                const _result = await _.get(
+                  app[appName].controller,
+                  where.id.replace('/', '.')
+                )(ctx)
+                where.id = _result
+              }
+
               const formatWhere = _.mapValues(where, (item) => {
                 if (!_.isObject(item)) return item
                 return formatObj(item)

package/core/file/plugins/setting/afterExecute.js

@@ -1,14 +1,40 @@
-const { getAppByCtx, getConfig } = require('q-koa')
+const { getAppByCtx, getConfig, lodash, is_dev } = require('q-koa')
 
 exports.upsert = async (ctx) => {
   const { app } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
-  appConfig.update()
+  const { id } = ctx.request.body
+  if (!id) return
+  const current_list = await app.model.setting.findAll({
+    where: {
+      id,
+    },
+  })
+  if (
+    current_list.some(
+      (o) => (o.extra && !lodash.isEmpty(o.extra)) || o.is_front || o.is_cache
+    )
+  ) {
+    appConfig.update()
+  }
 }
 
 exports.bulkUpdate = async (ctx) => {
   const { app } = getAppByCtx(ctx)
-
   const appConfig = getConfig(app)
-  appConfig.update()
+  const { list = [] } = ctx.request.body
+
+  if (list.length === 0) return
+  const current_list = await app.model.setting.findAll({
+    where: {
+      id: list.map((item) => item.id),
+    },
+  })
+  if (
+    current_list.some(
+      (o) => (o.extra && !lodash.isEmpty(o.extra)) || o.is_front || o.is_cache
+    )
+  ) {
+    appConfig.update()
+  }
 }

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

@@ -0,0 +1,30 @@
+module.exports = {
+  name: '设置',
+  belongs: 'page',
+  multiple: false,
+  model: 'setting',
+  availableSort: false,
+  order: [],
+  referenceSelect: [],
+  select: ['id', 'code', 'name', 'is_front', 'is_cache', 'is_control', 'extra'],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [],
+  comment: {},
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  initTableList: [],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: true,
+  modelQuery: {},
+  modelUpsert: {},
+  modelDelete: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+  indexList: [],
+}

package/package.json

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