@nocobase/plugin-system-settings 1.6.0-beta.2 → 1.6.0-beta.4

package/dist/externalVersion.js

@@ -8,8 +8,8 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-beta.2",
-  "@nocobase/plugin-file-manager": "1.6.0-beta.2",
-  "@nocobase/server": "1.6.0-beta.2",
-  "@nocobase/database": "1.6.0-beta.2"
+  "@nocobase/client": "1.6.0-beta.4",
+  "@nocobase/plugin-file-manager": "1.6.0-beta.4",
+  "@nocobase/server": "1.6.0-beta.4",
+  "@nocobase/database": "1.6.0-beta.4"
 };

package/dist/server/collections/systemSettings.js

@@ -33,6 +33,7 @@ var import_database = require("@nocobase/database");
 var systemSettings_default = (0, import_database.defineCollection)({
   dumpRules: "required",
   name: "systemSettings",
+  migrationRules: ["overwrite", "skip"],
   fields: [
     {
       type: "string",

package/dist/server/server.d.ts

@@ -10,6 +10,7 @@ import { InstallOptions, Plugin } from '@nocobase/server';
 export declare class PluginSystemSettingsServer extends Plugin {
     getInitAppLang(options: any): any;
     install(options?: InstallOptions): Promise<void>;
+    getSystemSettingsInstance(): Promise<any>;
     beforeLoad(): void;
     load(): Promise<void>;
 }

package/dist/server/server.js

@@ -63,6 +63,17 @@ class PluginSystemSettingsServer extends import_server.Plugin {
       }
     });
   }
+  async getSystemSettingsInstance() {
+    const repository = this.db.getRepository("systemSettings");
+    const instance = await repository.findOne({
+      filterByTk: 1,
+      appends: ["logo"]
+    });
+    const json = instance.toJSON();
+    json.raw_title = json.title;
+    json.title = this.app.environment.renderJsonTemplate(instance.title);
+    return json;
+  }
   beforeLoad() {
     const cmd = this.app.findCommand("install");
     if (cmd) {
@@ -70,16 +81,41 @@ class PluginSystemSettingsServer extends import_server.Plugin {
     }
     this.app.acl.registerSnippet({
       name: `pm.${this.name}.system-settings`,
-      actions: ["systemSettings:update"]
+      actions: ["systemSettings:put"]
     });
   }
   async load() {
-    await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
     this.app.acl.addFixedParams("systemSettings", "destroy", () => {
       return {
         "id.$ne": 1
       };
     });
+    this.app.resourceManager.define({
+      name: "systemSettings",
+      actions: {
+        get: async (ctx, next) => {
+          try {
+            ctx.body = await this.getSystemSettingsInstance();
+          } catch (error) {
+            throw error;
+          }
+          await next();
+        },
+        put: async (ctx, next) => {
+          const repository = this.db.getRepository("systemSettings");
+          const values = ctx.action.params.values;
+          await repository.update({
+            filterByTk: 1,
+            values: {
+              ...values,
+              title: values.raw_title
+            }
+          });
+          ctx.body = await this.getSystemSettingsInstance();
+          await next();
+        }
+      }
+    });
     this.app.acl.allow("systemSettings", "get", "public");
   }
 }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "系统设置",
   "description": "Used to adjust the system title, logo, language, etc.",
   "description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
-  "version": "1.6.0-beta.2",
+  "version": "1.6.0-beta.4",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/system-settings",
@@ -15,7 +15,7 @@
     "@nocobase/server": "1.x",
     "@nocobase/test": "1.x"
   },
-  "gitHead": "476ab2f424d86f585c8fba1459568c8aec49a5c6",
+  "gitHead": "4419f433716dadf34886b261d9abe20e74551044",
   "keywords": [
     "System management"
   ]