@nocobase/plugin-multi-app-manager 1.3.49-beta → 1.3.51

package/dist/server/server.d.ts

@@ -8,8 +8,10 @@
  */
 import { IDatabaseOptions, Transactionable } from '@nocobase/database';
 import Application, { Plugin } from '@nocobase/server';
+import { ApplicationModel } from '../server';
 export type AppDbCreator = (app: Application, options?: Transactionable & {
     context?: any;
+    applicationModel?: ApplicationModel;
 }) => Promise<void>;
 export type AppOptionsFactory = (appName: string, mainApp: Application) => any;
 export type SubAppUpgradeHandler = (mainApp: Application) => Promise<void>;

package/dist/server/server.js

@@ -78,7 +78,7 @@ const defaultSubAppUpgradeHandle = async (mainApp) => {
 };
 const defaultDbCreator = async (app) => {
   const databaseOptions = app.options.database;
-  const { host, port, username, password, dialect, database } = databaseOptions;
+  const { host, port, username, password, dialect, database, schema } = databaseOptions;
   if (dialect === "mysql") {
     const mysql = require("mysql2/promise");
     const connection = await mysql.createConnection({ host, port, user: username, password });
@@ -91,18 +91,22 @@ const defaultDbCreator = async (app) => {
     await connection.query(`CREATE DATABASE IF NOT EXISTS \`${database}\`;`);
     await connection.end();
   }
-  if (dialect === "postgres") {
+  if (["postgres", "kingbase"].includes(dialect)) {
     const { Client } = require("pg");
     const client = new Client({
       host,
       port,
       user: username,
       password,
-      database: "postgres"
+      database: dialect
     });
     await client.connect();
     try {
-      await client.query(`CREATE DATABASE "${database}"`);
+      if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true") {
+        await client.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
+      } else {
+        await client.query(`CREATE DATABASE "${database}"`);
+      }
     } catch (e) {
       console.log(e);
     }
@@ -117,6 +121,8 @@ const defaultAppOptionsFactory = (appName, mainApp) => {
       const mainStorageDir = import_path.default.dirname(mainAppStorage);
       rawDatabaseOptions.storage = import_path.default.join(mainStorageDir, `${appName}.sqlite`);
     }
+  } else if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true" && ["postgres", "kingbase"].includes(rawDatabaseOptions.dialect)) {
+    rawDatabaseOptions.schema = appName;
   } else {
     rawDatabaseOptions.database = appName;
   }
@@ -170,11 +176,15 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         const subApp = model.registerToSupervisor(this.app, {
           appOptionsFactory: this.appOptionsFactory
         });
-        await this.appDbCreator(subApp, {
-          transaction,
-          context: options.context
-        });
-        const startPromise = subApp.runCommand("start", "--quickstart");
+        const quickstart = async () => {
+          await this.appDbCreator(subApp, {
+            transaction,
+            applicationModel: model,
+            context: options.context
+          });
+          await subApp.runCommand("start", "--quickstart");
+        };
+        const startPromise = quickstart();
         if ((_a = options == null ? void 0 : options.context) == null ? void 0 : _a.waitSubAppInstall) {
           await startPromise;
         }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.3.49-beta",
+  "version": "1.3.51",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
@@ -28,7 +28,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "46dde74e2c220ae19bc275bb40be9ddf52485fa9",
+  "gitHead": "01f2b933a0681d99c5928d91d41f3f0c0ecae988",
   "keywords": [
     "system"
   ]

package/dist/node_modules/mariadb/node_modules/iconv-lite/.github/dependabot.yml

@@ -1,11 +0,0 @@
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    allow:
-      - dependency-type: production

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/codeStyles/Project.xml

@@ -1,47 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="100" />
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="100" />
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/iconv-lite.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/iconv-lite.iml" filepath="$PROJECT_DIR$/.idea/iconv-lite.iml" />
-    </modules>
-  </component>
-</project>

package/dist/node_modules/mariadb/node_modules/iconv-lite/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>