q-koa 11.6.2 → 11.8.0

package/core/app.js

@@ -797,13 +797,9 @@ class APP {
               Array.isArray(
                 this.app[appName].attributes[model][model1 + '_id'].defaultValue
               )) ||
-            (this.app[appName].attributes[model][model1 + '_id'].type &&
-              this.app[appName].attributes[model][model1 + '_id'].type ===
-                'JSON') ||
-            (this.app[appName].attributes[model][model1 + '_id'].type &&
-              this.app[appName].attributes[model][model1 + '_id'].type.key &&
-              this.app[appName].attributes[model][model1 + '_id'].type.key ===
-                'JSON')
+            this.app[appName].attributes[model][model1 + '_id'].type ===
+              Sequelize.DataTypes.JSON
+
           if (!is_multiple) {
             this.app[appName].model[model].hasOne(
               this.app[appName].model[model1],
@@ -1385,13 +1381,7 @@ class APP {
                         (app[appName].attributes[controller][modelName + '_id']
                           .type &&
                           app[appName].attributes[controller][modelName + '_id']
-                            .type === 'JSON') ||
-                        (app[appName].attributes[controller][modelName + '_id']
-                          .type &&
-                          app[appName].attributes[controller][modelName + '_id']
-                            .type.key &&
-                          app[appName].attributes[controller][modelName + '_id']
-                            .type.key === 'JSON')
+                            .type === Sequelize.DataTypes.JSON)
                       )
                       if (is_single) {
                         rows[i].setDataValue(
@@ -1544,13 +1534,7 @@ class APP {
                         (app[appName].attributes[controller][modelName + '_id']
                           .type &&
                           app[appName].attributes[controller][modelName + '_id']
-                            .type === 'JSON') ||
-                        (app[appName].attributes[controller][modelName + '_id']
-                          .type &&
-                          app[appName].attributes[controller][modelName + '_id']
-                            .type.key &&
-                          app[appName].attributes[controller][modelName + '_id']
-                            .type.key === 'JSON')
+                            .type === Sequelize.DataTypes.JSON)
                       )
 
                       if (is_single) {
@@ -1620,14 +1604,7 @@ class APP {
                     app[appName].attributes[controller][modelName + '_id']
                       .type &&
                     app[appName].attributes[controller][modelName + '_id']
-                      .type === 'JSON') ||
-                  (app[appName].attributes[controller][modelName + '_id'] &&
-                    app[appName].attributes[controller][modelName + '_id']
-                      .type &&
-                    app[appName].attributes[controller][modelName + '_id'].type
-                      .key &&
-                    app[appName].attributes[controller][modelName + '_id'].type
-                      .key === 'JSON')
+                      .type === Sequelize.DataTypes.JSON)
                 )
 
                 if (is_single) {
@@ -1826,6 +1803,7 @@ class APP {
           }
         }
 
+        let createTarget = null
         if (fn === 'upsert' || fn === 'create') {
           if (_.isEmpty(ctx.request.body)) {
             throw new Error('新增不能为空')
@@ -1863,6 +1841,9 @@ class APP {
               : 0,
             ...newData,
           })
+          if (fn === 'create') {
+            createTarget = flag.toJSON ? flag.toJSON() : flag
+          }
           ctx.SUCCESS(flag)
 
           if (cacheModel.includes(controller)) {
@@ -1910,7 +1891,7 @@ class APP {
         }
 
         if (_.get(app, `${appName}.afterExecute.${controller}.${fn}`)) {
-          app[appName].afterExecute[controller][fn](ctx)
+          app[appName].afterExecute[controller][fn](ctx, createTarget)
             .then((res) => {
               if (is_dev) {
                 console.log('afterUpdate', res)

package/package.json

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