@nocobase/plugin-public-forms 2.1.0-beta.36 → 2.1.0-beta.38

package/dist/client-v2/route.d.ts

@@ -0,0 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+type PublicFormAppLike = {
+    router?: {
+        getBasename?: () => string | undefined;
+    };
+    getPublicPath?: () => string;
+    getRouteUrl?: (pathname: string) => string;
+};
+export declare function getPublicFormRoutePath(app: PublicFormAppLike | undefined, pathname: string): string;
+export {};

package/dist/externalVersion.js

@@ -8,10 +8,12 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.36",
+  "@nocobase/client": "2.1.0-beta.38",
   "react-i18next": "11.18.6",
-  "@nocobase/plugin-ui-schema-storage": "2.1.0-beta.36",
-  "@nocobase/server": "2.1.0-beta.36",
+  "@nocobase/flow-engine": "2.1.0-beta.38",
+  "@nocobase/client-v2": "2.1.0-beta.38",
+  "@nocobase/plugin-ui-schema-storage": "2.1.0-beta.38",
+  "@nocobase/server": "2.1.0-beta.38",
   "react": "18.2.0",
   "@ant-design/icons": "5.6.1",
   "antd": "5.24.2",
@@ -22,6 +24,8 @@ module.exports = {
   "@formily/react": "2.3.7",
   "@formily/core": "2.3.7",
   "@formily/shared": "2.3.7",
-  "@nocobase/database": "2.1.0-beta.36",
+  "@formily/reactive": "2.3.7",
+  "ahooks": "3.7.8",
+  "@nocobase/database": "2.1.0-beta.38",
   "dayjs": "1.11.13"
 };

package/dist/locale/en-US.json

@@ -2,17 +2,34 @@
   "# Submitted successfully!\nThis is a demo text, **supports Markdown syntax**.": "# Submitted successfully!\nThis is a demo text, **supports Markdown syntax**.",
   "Add New": "Add New",
   "After successful submission": "After successful submission",
+  "Actions": "Actions",
+  "Are you sure you want to delete it?": "Are you sure you want to delete it?",
+  "Cancel": "Cancel",
+  "Collection": "Collection",
+  "Configure": "Configure",
+  "Configure form": "Configure form",
   "Copy link": "Copy link",
+  "Delete": "Delete",
+  "Description": "Description",
+  "Edit": "Edit",
   "Enable form": "Enable form",
   "Enable password": "Enable password",
+  "Enabled": "Enabled",
   "Form": "Form",
+  "Incorrect password": "Incorrect password",
   "Link copied successfully": "Link copied successfully",
+  "No": "No",
   "Open form": "Open form",
+  "Password": "Password",
   "Prompt after successful submission": "Prompt after successful submission",
   "Public forms": "Public forms",
   "QR code": "QR code",
   "Set password": "Set password",
+  "Settings": "Settings",
+  "Submit": "Submit",
   "The form is not enabled and cannot be accessed": "The form is not enabled and cannot be accessed",
   "The form is not found": "The form is not found",
-  "Type": "Type"
-}
+  "Title": "Title",
+  "Type": "Type",
+  "Yes": "Yes"
+}

package/dist/locale/zh-CN.json

@@ -2,17 +2,34 @@
   "# Submitted successfully!\nThis is a demo text, **supports Markdown syntax**.": "# 提交成功!\n这是一段演示文本，**支持 Markdown 语法**。",
   "Add New": "添加",
   "After successful submission": "提交成功后",
+  "Actions": "操作",
+  "Are you sure you want to delete it?": "确定删除吗？",
+  "Cancel": "取消",
+  "Collection": "数据表",
+  "Configure": "配置",
+  "Configure form": "配置表单",
   "Copy link": "复制链接",
+  "Delete": "删除",
+  "Description": "描述",
+  "Edit": "编辑",
   "Enable form": "启用表单",
   "Enable password": "启用密码",
+  "Enabled": "是否启用",
   "Form": "普通表单",
+  "Incorrect password": "密码错误",
   "Link copied successfully": "复制地址成功",
+  "No": "否",
   "Open form": "查看公开表单",
+  "Password": "密码",
   "Prompt after successful submission": "提交成功后的信息提示",
   "Public forms": "公开表单",
   "QR code": "二维码",
   "Set password": "设置密码",
+  "Settings": "设置",
+  "Submit": "提交",
   "The form is not enabled and cannot be accessed": "该表单未启用,无法访问",
   "The form is not found": "未找到该表单",
-  "Type": "类型"
-}
+  "Title": "标题",
+  "Type": "类型",
+  "Yes": "是"
+}

package/dist/server/plugin.d.ts

@@ -8,26 +8,21 @@
  */
 import { Plugin } from '@nocobase/server';
 export declare class PluginPublicFormsServer extends Plugin {
-    parseCollectionData(dataSourceKey: any, formCollection: any, appends: any): Promise<{
-        name: any;
-        fields: {
-            [x: string]: any;
-            name: string;
-            field: string;
-            rawType: string;
-            type: string;
-            description?: string;
-            interface?: string;
-            uiSchema?: any;
-            possibleTypes?: string[];
-            defaultValue?: any;
-            primaryKey?: boolean;
-            unique?: boolean;
-            allowNull?: boolean;
-            autoIncrement?: boolean;
-        }[];
-        template: any;
-    }[]>;
+    protected associationFieldTypes: string[];
+    parseCollectionData(dataSourceKey: any, formCollection: any, appends: any): Promise<any[]>;
+    getFlowModelTree(uid: string, options?: {
+        includeAsyncNode?: boolean;
+    }): Promise<any>;
+    isFlowModelDescendant(rootUid: string, uid: string): Promise<boolean>;
+    validatePublicFormToken(filterByTk: string, token?: string): Promise<import("jsonwebtoken").JwtPayload>;
+    getFlowModelByTk(filterByTk: string, options: {
+        uid?: string;
+        parentId?: string;
+        subKey?: string;
+        token?: string;
+    }): Promise<any>;
+    getSchemaAssociationAppends(dataSourceKey: string, collectionName: string, schema: any): any[];
+    getFlowModelAssociationAppends(dataSourceKey: string, collectionName: string, flowModel: any): string[];
     getMetaByTk(filterByTk: string, options: {
         password?: string;
         token?: string;
@@ -36,38 +31,22 @@ export declare class PluginPublicFormsServer extends Plugin {
         dataSource?: undefined;
         token?: undefined;
         schema?: undefined;
+        flowModel?: undefined;
         title?: undefined;
     } | {
         dataSource: {
             key: any;
             displayName: any;
-            collections: {
-                name: any;
-                fields: {
-                    [x: string]: any;
-                    name: string;
-                    field: string;
-                    rawType: string;
-                    type: string;
-                    description?: string;
-                    interface?: string;
-                    uiSchema?: any;
-                    possibleTypes?: string[];
-                    defaultValue?: any;
-                    primaryKey?: boolean;
-                    unique?: boolean;
-                    allowNull?: boolean;
-                    autoIncrement?: boolean;
-                }[];
-                template: any;
-            }[];
+            collections: any[];
         };
         token: string;
         schema: any;
+        flowModel: any;
         title: any;
         passwordRequired?: undefined;
     }>;
     getPublicFormsMeta: (ctx: any, next: any) => Promise<void>;
+    getPublicFormFlowModel: (ctx: any, next: any) => Promise<void>;
     parseToken: (ctx: any, next: any) => Promise<any>;
     parseACL: (ctx: any, next: any) => Promise<any>;
     load(): Promise<void>;

package/dist/server/plugin.js

@@ -35,34 +35,144 @@ var import_hook = require("./hook");
 class PasswordError extends Error {
 }
 class PluginPublicFormsServer extends import_server.Plugin {
+  associationFieldTypes = ["hasOne", "hasMany", "belongsTo", "belongsToMany", "belongsToArray"];
   async parseCollectionData(dataSourceKey, formCollection, appends) {
     const dataSource = this.app.dataSourceManager.dataSources.get(dataSourceKey);
+    const serializeCollection = (collection2) => ({
+      ...collection2.options,
+      name: collection2.name,
+      filterTargetKey: collection2.filterTargetKey,
+      titleField: collection2.titleField,
+      fields: collection2.getFields().map((v) => {
+        return {
+          ...v.options
+        };
+      })
+    });
     const collection = dataSource.collectionManager.getCollection(formCollection);
-    const collections = [
-      {
-        name: collection.name,
-        fields: collection.getFields().map((v) => {
-          return {
-            ...v.options
-          };
-        }),
-        template: collection.options.template
-      }
-    ];
+    const collections = [serializeCollection(collection)];
     return collections.concat(
       appends.map((v) => {
-        const targetCollection = this.db.getCollection(v);
-        return {
-          ...targetCollection.options,
-          fields: targetCollection.getFields().map((v2) => {
-            return {
-              ...v2.options
-            };
-          })
-        };
+        const targetCollection = dataSource.collectionManager.getCollection(v);
+        return serializeCollection(targetCollection);
       })
     );
   }
+  async getFlowModelTree(uid, options = {}) {
+    var _a;
+    const repository = (_a = this.db.getCollection("flowModels")) == null ? void 0 : _a.repository;
+    if (!(repository == null ? void 0 : repository.findModelById)) {
+      return null;
+    }
+    return repository.findModelById(uid, { includeAsyncNode: !!options.includeAsyncNode }).catch(() => null);
+  }
+  async isFlowModelDescendant(rootUid, uid) {
+    var _a, _b;
+    if (!rootUid || !uid) {
+      return false;
+    }
+    if (rootUid === uid) {
+      return true;
+    }
+    const repository = this.db.getRepository("flowModelTreePath");
+    const node = await ((_b = (_a = repository == null ? void 0 : repository.model) == null ? void 0 : _a.findOne) == null ? void 0 : _b.call(_a, {
+      where: {
+        ancestor: rootUid,
+        descendant: uid
+      }
+    }));
+    return !!node;
+  }
+  async validatePublicFormToken(filterByTk, token) {
+    if (!token) {
+      throw new Error("Public form token is required");
+    }
+    const tokenData = await this.app.authManager.jwt.decode(token);
+    if ((tokenData == null ? void 0 : tokenData.formKey) !== filterByTk) {
+      throw new Error("Invalid public form token");
+    }
+    const publicForms = this.db.getRepository("publicForms");
+    const instance = await publicForms.findOne({
+      filter: {
+        key: tokenData.formKey
+      }
+    });
+    if (!instance) {
+      throw new Error("The form is not found");
+    }
+    if (!instance.get("enabled")) {
+      throw new Error("The form is not enabled");
+    }
+    return tokenData;
+  }
+  async getFlowModelByTk(filterByTk, options) {
+    var _a;
+    await this.validatePublicFormToken(filterByTk, options.token);
+    const repository = (_a = this.db.getCollection("flowModels")) == null ? void 0 : _a.repository;
+    if (!repository) {
+      return null;
+    }
+    if (options.uid) {
+      if (!await this.isFlowModelDescendant(filterByTk, options.uid)) {
+        throw new Error("The flow model is not in this public form");
+      }
+      return repository.findModelById(options.uid, { includeAsyncNode: true }).catch(() => null);
+    }
+    if (!options.parentId) {
+      throw new Error("parentId is required");
+    }
+    if (!await this.isFlowModelDescendant(filterByTk, options.parentId)) {
+      throw new Error("The flow model parent is not in this public form");
+    }
+    const flowModel = await repository.findModelByParentId(options.parentId, {
+      subKey: options.subKey,
+      includeAsyncNode: true
+    }).catch(() => null);
+    if ((flowModel == null ? void 0 : flowModel.uid) && !await this.isFlowModelDescendant(filterByTk, flowModel.uid)) {
+      throw new Error("The flow model is not in this public form");
+    }
+    return flowModel;
+  }
+  getSchemaAssociationAppends(dataSourceKey, collectionName, schema) {
+    var _a;
+    if (!((_a = schema == null ? void 0 : schema.properties) == null ? void 0 : _a.form)) {
+      return [];
+    }
+    const { getAssociationAppends } = (0, import_hook.parseAssociationNames)(dataSourceKey, collectionName, this.app, schema);
+    return getAssociationAppends().appends || [];
+  }
+  getFlowModelAssociationAppends(dataSourceKey, collectionName, flowModel) {
+    const dataSource = this.app.dataSourceManager.dataSources.get(dataSourceKey);
+    const appends = /* @__PURE__ */ new Set();
+    const traverse = (node) => {
+      var _a, _b;
+      if (!node || typeof node !== "object") {
+        return;
+      }
+      const init = (_b = (_a = node.stepParams) == null ? void 0 : _a.fieldSettings) == null ? void 0 : _b.init;
+      const fieldDataSourceKey = (init == null ? void 0 : init.dataSourceKey) || dataSourceKey;
+      const fieldCollectionName = (init == null ? void 0 : init.collectionName) || collectionName;
+      const fieldPath = init == null ? void 0 : init.fieldPath;
+      if (fieldDataSourceKey === dataSourceKey && fieldCollectionName && fieldPath) {
+        const collection = dataSource.collectionManager.getCollection(fieldCollectionName);
+        const fieldName = String(fieldPath).split(".")[0];
+        const collectionField = collection == null ? void 0 : collection.getField(fieldName);
+        const collectionFieldOptions = collectionField == null ? void 0 : collectionField.options;
+        if (collectionFieldOptions && this.associationFieldTypes.includes(collectionFieldOptions.type) && collectionFieldOptions.target) {
+          appends.add(collectionFieldOptions.target);
+        }
+      }
+      Object.values(node.subModels || {}).forEach((subModel) => {
+        if (Array.isArray(subModel)) {
+          subModel.forEach(traverse);
+          return;
+        }
+        traverse(subModel);
+      });
+    };
+    traverse(flowModel);
+    return [...(0, import_hook.fillParentFields)(appends)];
+  }
   async getMetaByTk(filterByTk, options) {
     const { token, password } = options;
     const publicForms = this.db.getRepository("publicForms");
@@ -78,25 +188,40 @@ class PluginPublicFormsServer extends import_server.Plugin {
     if (!instance.get("enabled")) {
       return null;
     }
-    if (!token) {
-      if (instance.get("password")) {
-        if (password === void 0) {
+    if (instance.get("password")) {
+      if (password !== void 0) {
+        if (this.app.environment.renderJsonTemplate(instance.get("password")) !== password) {
+          throw new PasswordError("Please enter your password");
+        }
+      } else if (token) {
+        try {
+          await this.validatePublicFormToken(filterByTk, token);
+        } catch (error) {
           return {
             passwordRequired: true
           };
         }
-        if (this.app.environment.renderJsonTemplate(instance.get("password")) !== password) {
-          throw new PasswordError("Please enter your password");
-        }
+      } else {
+        return {
+          passwordRequired: true
+        };
       }
     }
     const keys = instance.collection.split(":");
     const collectionName = keys.pop();
     const dataSourceKey = keys.pop() || "main";
     const title = instance.get("title");
-    const schema = await uiSchema.getJsonSchema(filterByTk);
-    const { getAssociationAppends } = (0, import_hook.parseAssociationNames)(dataSourceKey, collectionName, this.app, schema);
-    const { appends } = getAssociationAppends();
+    const [schema, flowModel, completeFlowModel] = await Promise.all([
+      uiSchema.getJsonSchema(filterByTk).catch(() => null),
+      this.getFlowModelTree(filterByTk),
+      this.getFlowModelTree(filterByTk, { includeAsyncNode: true })
+    ]);
+    const appends = [
+      .../* @__PURE__ */ new Set([
+        ...this.getSchemaAssociationAppends(dataSourceKey, collectionName, schema),
+        ...this.getFlowModelAssociationAppends(dataSourceKey, collectionName, completeFlowModel || flowModel)
+      ])
+    ];
     const collections = await this.parseCollectionData(dataSourceKey, collectionName, appends);
     return {
       dataSource: {
@@ -115,6 +240,7 @@ class PluginPublicFormsServer extends import_server.Plugin {
         }
       ),
       schema,
+      flowModel,
       title
     };
   }
@@ -133,6 +259,16 @@ class PluginPublicFormsServer extends import_server.Plugin {
     }
     await next();
   };
+  getPublicFormFlowModel = async (ctx, next) => {
+    const token = ctx.get("X-Form-Token");
+    const { filterByTk, uid, parentId, subKey } = ctx.action.params;
+    try {
+      ctx.body = await this.getFlowModelByTk(filterByTk, { uid, parentId, subKey, token });
+    } catch (error) {
+      ctx.throw(401, error.message);
+    }
+    await next();
+  };
   parseToken = async (ctx, next) => {
     if (!ctx.action) {
       return next();
@@ -196,9 +332,10 @@ class PluginPublicFormsServer extends import_server.Plugin {
       name: `pm.${this.name}`,
       actions: ["publicForms:*"]
     });
-    this.app.acl.allow("publicForms", "getMeta", "public");
+    this.app.acl.allow("publicForms", ["getMeta", "getFlowModel"], "public");
     this.app.resourceManager.registerActionHandlers({
-      "publicForms:getMeta": this.getPublicFormsMeta
+      "publicForms:getMeta": this.getPublicFormsMeta,
+      "publicForms:getFlowModel": this.getPublicFormFlowModel
     });
     this.app.dataSourceManager.afterAddDataSource((dataSource) => {
       dataSource.resourceManager.use(this.parseToken, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-public-forms",
-  "version": "2.1.0-beta.36",
+  "version": "2.1.0-beta.38",
   "main": "dist/server/index.js",
   "displayName": "Public forms",
   "displayName.ru-RU": "Публичные формы",
@@ -14,7 +14,10 @@
   "homepage.zh-CN": "https://docs-cn.nocobase.com/public-form",
   "peerDependencies": {
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
+    "@nocobase/flow-engine": "2.x",
     "@nocobase/plugin-client": "2.x",
+    "@nocobase/plugin-flow-engine": "2.x",
     "@nocobase/plugin-ui-schema-storage": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
@@ -22,5 +25,5 @@
   "devDependencies": {
     "react-device-detect": "2.2.3"
   },
-  "gitHead": "397d45c744f6eb48b3a0cd785c87cbf1257c3513"
+  "gitHead": "d1c585108ff6e51c17b0b52bacb1a2d621d9c119"
 }