q-koa 9.5.3 → 9.6.0

package/core/app.js

@@ -979,12 +979,16 @@ class APP {
 
           if (referenceInclude) {
             const _referenceInclude = Object.keys(referenceInclude).map(
-              (model) => ({
-                model: app[appName].model[model],
-                where: {
-                  ...referenceInclude[model],
-                },
-              })
+              (model) => {
+                const { required = true, ...rest } = referenceInclude[model]
+                return {
+                  model: app[appName].model[model],
+                  where: {
+                    ...rest,
+                  },
+                  required,
+                }
+              }
             )
             myInclude = [...myInclude, ..._referenceInclude]
           }

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

@@ -255,6 +255,14 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
     return {
       ...obj,
       setting: obj.setting.map((i) => {
+        let reset = true
+        if (i.parent_id) {
+          const parent = obj.setting.find((s) => s.id === i.parent_id)
+          const same = obj.setting.filter((s) => s.code === i.code)
+          if (parent && parent.code !== config && same.length > 1) {
+            reset = false
+          }
+        }
         if (i.code === 'is_check' && i.value === false) {
           return {
             ...(i.toJSON ? i.toJSON() : i),
@@ -269,7 +277,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
         ) {
           return {
             ...(i.toJSON ? i.toJSON() : i),
-            value: target[i.code],
+            ...(reset ? { value: target[i.code] } : {}),
           }
         }
         return i

package/package.json

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