q-koa 11.8.7 → 11.9.0

package/core/app.js

@@ -1158,7 +1158,10 @@ class APP {
                   .filter(
                     (item) =>
                       (item.where && !item.hasOwnProperty('required')) ||
-                      (item.hasOwnProperty('required') && item.required)
+                      (item.hasOwnProperty('required') && item.required) ||
+                      (item.hasOwnProperty('where') &&
+                        item.hasOwnProperty('required') &&
+                        !item.required)
                   )
                   .map((item) => {
                     return {
@@ -1173,6 +1176,7 @@ class APP {
                       },
                     }
                   })
+
                 const { count, rows } = await app[appName].model[controller][
                   fn
                 ]({
@@ -1199,7 +1203,10 @@ class APP {
                     (myInclude[j].where &&
                       !myInclude[j].hasOwnProperty('required')) ||
                     (myInclude[j].hasOwnProperty('required') &&
-                      myInclude[j].required)
+                      myInclude[j].required) ||
+                    (myInclude[j].hasOwnProperty('where') &&
+                      myInclude[j].hasOwnProperty('required') &&
+                      !myInclude[j].required)
                   ) {
                     continue
                   }
@@ -1265,7 +1272,10 @@ class APP {
                       (myInclude[j].where &&
                         !myInclude[j].hasOwnProperty('required')) ||
                       (myInclude[j].hasOwnProperty('required') &&
-                        myInclude[j].required)
+                        myInclude[j].required) ||
+                      (myInclude[j].hasOwnProperty('where') &&
+                        myInclude[j].hasOwnProperty('required') &&
+                        !myInclude[j].required)
                     ) {
                       continue
                     }

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

@@ -1,4 +1,4 @@
-const { getConfig, lodash } = require('q-koa')
+const { getConfig, lodash, Sequelize } = require('q-koa')
 const formatPostFunction = (str) => `eval(${str})`
 const nodeVm = require('vm')
 const axios = require('axios')

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

@@ -16,7 +16,7 @@ module.exports = {
       key: 'type',
     },
   ],
-  excludes: [],
+  excludes: ['administrator'],
   limit: 20,
   defaultOrder: [
     { sort: 'ascending', type: 'status' },
@@ -27,5 +27,9 @@ module.exports = {
   excludeAuth: [],
   initList: [],
   is_split: false,
-  show_virtual: false,
+  show_virtual: true,
+  modelUpsert: {
+    administrator:
+      '(target, getName, user_info) => target.administrator || user_info.name',
+  },
 }

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

@@ -18,6 +18,9 @@ exports.desc = {
   defaultValue: '',
   sortOrder: 2,
   mock: () => Random.csentence(),
+  extra: {
+    tableWidth: 0,
+  },
 }
 
 exports.image_list = {
@@ -67,3 +70,23 @@ exports.important_rate = {
     tableWidth: 180,
   },
 }
+
+exports.administrator = {
+  type: Sequelize.STRING,
+  comment: '管理员',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 7,
+  mock: () => Random.ctitle(),
+}
+
+exports.from = {
+  type: Sequelize.VIRTUAL,
+  comment: '来自管理员',
+  sortOrder: 8,
+  get: function () {
+    const administrator = this.getDataValue('administrator')
+    return administrator
+  },
+}

package/package.json

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