q-koa 9.5.2 → 9.5.4

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

@@ -502,7 +502,11 @@ exports.urlToOss = async (ctx) => {
     oss_host,
   } = await appConfig.getObject('oss')
 
-  if (!url || ['aliyun', cdn_host, oss_host].some((i) => url.includes(i)))
+  if (
+    !url ||
+    (!url.includes('://lanhu') &&
+      ['aliyun', cdn_host, oss_host].some((i) => url.includes(i)))
+  )
     return ctx.SUCCESS(url)
 
   if (!(accessKeyId && accessKeySecret && bucket && region)) {

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.2",
+  "version": "9.5.4",
   "description": "",
   "main": "index.js",
   "scripts": {