q-koa 13.0.9 → 13.1.1

package/core/app.js

@@ -2167,6 +2167,7 @@ APP.getConfig = (app) => ({
             'is_front',
             'is_control',
             'createdid',
+            'extra',
           ],
         },
         include: [
@@ -2184,6 +2185,7 @@ APP.getConfig = (app) => ({
                 'is_front',
                 'is_control',
                 'createdid',
+                'extra',
               ],
             },
           },

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

@@ -186,6 +186,16 @@ exports.showTables = async (ctx) => {
 
     if (!target) throw new Error(`检查是否有${_model}/config.js`)
     const model = target.model ? target.model : _model
+
+    function getValueByModelName(target, key, defaultValue, model, _model) {
+      return lodash.get(
+        target,
+        key,
+        model !== _model
+          ? lodash.get(app.config[model], key, defaultValue)
+          : defaultValue
+      )
+    }
     return {
       modelName: _model,
       model,
@@ -200,7 +210,7 @@ exports.showTables = async (ctx) => {
       // 默认排序
       defaultOrder: lodash.get(target, 'defaultOrder', []),
       // 下拉筛选
-      select: lodash.get(target, 'select', []),
+      select: getValueByModelName(target, 'select', [], model, _model),
       // 是否可以选择批量删除
       multiple: lodash.get(target, 'multiple', true),
       // 是否后台拆分sql
@@ -221,17 +231,9 @@ exports.showTables = async (ctx) => {
               lodash.get(target, 'order', [])
             ),
       // reference admin components
-      reference: lodash.get(
-        target,
-        'reference',
-        model !== _model ? lodash.get(app.config[model], 'reference', []) : []
-      ),
+      reference: getValueByModelName(target, 'reference', [], model, _model),
       // reference admin components
-      personal: lodash.get(
-        target,
-        'personal',
-        model !== _model ? lodash.get(app.config[model], 'personal', []) : []
-      ),
+      personal: getValueByModelName(target, 'personal', [], model, _model),
       // sortOrder router
       sortOrder: lodash.get(target, 'sortOrder', 1),
 

package/package.json

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