q-koa 11.2.4 → 11.3.0

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

@@ -161,6 +161,13 @@ exports.modelQuery = {
   defaultValue: {},
 }
 
+exports.modelUpsert = {
+  type: Sequelize.JSON,
+  comment: '默认插入值',
+  allowNull: false,
+  defaultValue: {},
+}
+
 exports.editInline = {
   type: Sequelize.JSON,
   comment: '局部更新',

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

@@ -101,6 +101,7 @@ exports.loadModel = async ({ app, appName }) => {
         is_split_count: config.is_split_count,
         show_virtual: config.show_virtual,
         modelQuery: config.modelQuery,
+        modelUpsert: config.modelUpsert,
         editInline: config.editInline,
         deleteCheckList: config.deleteCheckList,
         bulkCreateList: config.bulkCreateList,

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

@@ -181,6 +181,8 @@ exports.showTables = async (ctx) => {
       comment: lodash.get(target, 'comment', {}),
       // 默认查询，覆盖之前
       modelQuery: lodash.get(target, 'modelQuery', {}),
+      // 插入字段，覆盖之前
+      modelUpsert: lodash.get(target, 'modelUpsert', {}),
       // 删除时检查是不是含有
       deleteCheckList: lodash.get(target, 'deleteCheckList', []),
       // 批量更新字段

package/core/file/utils/index.js

@@ -6,7 +6,8 @@ const findConfig = (type) => (item) =>
   item.config === type ||
   item.pay_config === type ||
   (item.ToUserName && item.ToUserName === type) ||
-  (item.appId && item.appId === type)
+  (item.appId && item.appId === type) ||
+  (item.id && item.id === type)
 
 exports.getSetting = (config) => (type) =>
   config.find((i) => i.key === type).value
@@ -176,12 +177,11 @@ exports.getImageType = (fileBuffer) => {
   return ''
 }
 
-exports.getAppConfig = async ({ app, config, key, app_id }) => {
-  if (!(app && (config || key || app_id))) return null
+exports.getAppConfig = async ({ app, config, key, app_id, id }) => {
+  if (!(app && (config || key || app_id || id))) return null
   const application =
     app.cache.get('application') || (await app.model.application.findAll())
-
-  const target = application.find(findConfig(config || key || app_id))
+  const target = application.find(findConfig(config || key || app_id || id))
 
   return target || null
 }

package/package.json

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