@nocobase/plugin-ui-templates 2.1.0-beta.9 → 2.1.0

package/dist/{client/schemas/flowModelTemplates.d.ts → client-v2/models/index.d.ts}

@@ -6,6 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { ISchema } from '@nocobase/client';
-export declare const flowModelTemplateEditActionSchema: ISchema;
-export declare const createFlowModelTemplatesSchema: (filter?: Record<string, any>) => ISchema;
+export * from './ReferenceBlockModel';
+export * from './ReferenceFormGridModel';
+export * from './SubModelTemplateImporterModel';

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

@@ -0,0 +1,42 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import type { FlowEngine } from '@nocobase/flow-engine';
+export type TemplateRow = {
+    uid: string;
+    name?: string;
+    description?: string;
+    targetUid?: string;
+    useModel?: string;
+    type?: string;
+    dataSourceKey?: string;
+    collectionName?: string;
+    associationName?: string;
+    filterByTk?: string;
+    sourceId?: string;
+};
+type ExpectedResourceInfo = {
+    dataSourceKey?: string;
+    collectionName?: string;
+    associationName?: string;
+};
+export type PopupTemplateSelectOption = {
+    label: React.ReactNode;
+    value: string;
+    raw?: TemplateRow;
+    description?: string;
+    disabled?: boolean;
+    disabledReason?: string;
+    rawName?: string;
+    __idx?: number;
+};
+export declare function appendPopupTemplateOptions(prev: PopupTemplateSelectOption[], next: PopupTemplateSelectOption[]): PopupTemplateSelectOption[];
+export declare function buildPopupTemplateListFilter(expected: ExpectedResourceInfo): Record<string, any>;
+export declare function registerOpenViewPopupTemplateAction(flowEngine: FlowEngine): void;
+export {};

package/dist/client-v2/pages/BlockTemplatesPage.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export { BlockTemplatesPage as default } from '../components/FlowModelTemplatesPage';

package/dist/client-v2/pages/PopupTemplatesPage.d.ts

@@ -0,0 +1,9 @@
+/**
+ * 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.
+ */
+export { PopupTemplatesPage as default } from '../components/FlowModelTemplatesPage';

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

@@ -0,0 +1,14 @@
+/**
+ * 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.
+ */
+import type { Application } from '@nocobase/client-v2';
+import { Plugin } from '@nocobase/client-v2';
+export declare class PluginUiTemplatesClientV2 extends Plugin<Record<string, never>, Application> {
+    load(): Promise<void>;
+}
+export default PluginUiTemplatesClientV2;

package/dist/client-v2/utils/replaceGridLayoutUid.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+import { type FlowModel } from '@nocobase/flow-engine';
+export declare function replaceGridLayoutUid(parent: FlowModel, fromUid: string, toUid: string): boolean;

package/dist/externalVersion.js

@@ -8,17 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-beta.9",
-  "@nocobase/flow-engine": "2.1.0-beta.9",
+  "@nocobase/client": "2.1.0",
+  "@nocobase/flow-engine": "2.1.0",
   "react": "18.2.0",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
-  "lodash": "4.17.21",
-  "@formily/react": "2.3.7",
-  "@nocobase/server": "2.1.0-beta.9",
-  "@nocobase/plugin-flow-engine": "2.1.0-beta.9",
-  "@nocobase/utils": "2.1.0-beta.9",
-  "@formily/core": "2.3.7",
-  "@nocobase/database": "2.1.0-beta.9",
-  "@nocobase/actions": "2.1.0-beta.9"
+  "lodash": "4.18.1",
+  "@nocobase/client-v2": "2.1.0",
+  "@nocobase/server": "2.1.0",
+  "@nocobase/plugin-flow-engine": "2.1.0",
+  "@nocobase/utils": "2.1.0",
+  "@nocobase/database": "2.1.0",
+  "@nocobase/actions": "2.1.0"
 };

package/dist/locale/en-US.json

@@ -1,8 +1,8 @@
 {
   "UI templates": "UI templates",
-  "Block templates (v2)": "Block templates (v2)",
-  "Popup templates (v2)": "Popup templates (v2)",
   "Actions": "Actions",
+  "Collection": "Collection",
+  "Data source": "Data source",
   "Are you sure you want to delete this item? This action cannot be undone.": "Are you sure you want to delete this item? This action cannot be undone.",
   "Block UID": "Block UID",
   "Block UID is already set and cannot be modified": "Block UID is already set and cannot be modified",
@@ -14,6 +14,7 @@
   "Edit": "Edit",
   "Edit template": "Edit template",
   "Mode": "Mode",
+  "Operation failed": "Operation failed",
   "Other blocks": "Other blocks",
   "Please configure target block": "Please configure target block",
   "Reference": "Reference",

package/dist/locale/zh-CN.json

@@ -1,8 +1,8 @@
 {
   "UI templates": "UI 模板",
-  "Block templates (v2)": "区块模板 (v2)",
-  "Popup templates (v2)": "弹窗模板 (v2)",
   "Actions": "操作",
+  "Collection": "数据表",
+  "Data source": "数据源",
   "Are you sure you want to delete this item? This action cannot be undone.": "确定要删除此项吗？此操作不可撤销。",
   "Block UID": "区块 UID",
   "Block UID is already set and cannot be modified": "当前已经指定区块UID，不允许修改",
@@ -15,6 +15,7 @@
   "Edit": "编辑",
   "Edit template": "编辑模板",
   "Mode": "模式",
+  "Operation failed": "操作失败",
   "Other blocks": "其他区块",
   "Please configure target block": "请先配置目标区块",
   "Reference": "引用",

package/dist/server/collections/flowModelTemplateUsages.js

@@ -33,6 +33,7 @@ var flowModelTemplateUsages_default = {
   dumpRules: "required",
   migrationRules: ["overwrite", "schema-only"],
   name: "flowModelTemplateUsages",
+  dataCategory: "system",
   autoGenId: false,
   timestamps: true,
   fields: [

package/dist/server/collections/flowModelTemplates.js

@@ -33,6 +33,7 @@ var flowModelTemplates_default = {
   dumpRules: "required",
   migrationRules: ["overwrite", "schema-only"],
   name: "flowModelTemplates",
+  dataCategory: "system",
   autoGenId: false,
   timestamps: true,
   fields: [

package/dist/server/plugin.js

@@ -142,17 +142,33 @@ class PluginBlockReferenceServer extends import_server.Plugin {
         });
       }
     };
-    const removeUsagesByInstance = async (instanceUid, _options, { transaction } = {}) => {
+    const removeUsagesByInstances = async (instanceUids, { transaction } = {}) => {
       const usageRepo = this.db.getRepository("flowModelTemplateUsages");
-      await usageRepo.destroy({ filter: { modelUid: instanceUid }, transaction });
+      const uids = import_lodash.default.uniq(instanceUids.map(String).filter(Boolean));
+      for (const chunk of import_lodash.default.chunk(uids, 500)) {
+        await usageRepo.destroy({
+          filter: {
+            modelUid: {
+              $in: chunk
+            }
+          },
+          transaction
+        });
+      }
     };
     this.db.on("flowModels.afterDestroy", async (instance, { transaction } = {}) => {
-      var _a2, _b;
+      var _a2;
       const instanceUid = ((_a2 = instance == null ? void 0 : instance.get) == null ? void 0 : _a2.call(instance, "uid")) || (instance == null ? void 0 : instance.uid);
       if (!instanceUid) return;
-      const options = parseOptions(((_b = instance == null ? void 0 : instance.get) == null ? void 0 : _b.call(instance, "options")) || (instance == null ? void 0 : instance.options));
-      await removeUsagesByInstance(instanceUid, options, { transaction });
+      await removeUsagesByInstances([instanceUid], { transaction });
     });
+    this.db.on(
+      "flowModels.beforeRemoveTree",
+      async ({ uids } = {}, options = {}) => {
+        if (!(uids == null ? void 0 : uids.length)) return;
+        await removeUsagesByInstances(uids, { transaction: options == null ? void 0 : options.transaction });
+      }
+    );
     const handleFlowModelSave = async (instance, { transaction } = {}) => {
       var _a2, _b;
       const instanceUid = ((_a2 = instance == null ? void 0 : instance.get) == null ? void 0 : _a2.call(instance, "uid")) || (instance == null ? void 0 : instance.uid);
@@ -203,11 +219,7 @@ class PluginBlockReferenceServer extends import_server.Plugin {
         for (const node of nodes) {
           const instanceUid = node == null ? void 0 : node.uid;
           if (!instanceUid) continue;
-          const options = parseOptions((node == null ? void 0 : node.options) || {});
-          if ((node == null ? void 0 : node.parent) && !(options == null ? void 0 : options.parentId)) {
-            options.parentId = node.parent;
-          }
-          await removeUsagesByInstance(instanceUid, options, { transaction: ctx.transaction });
+          await removeUsagesByInstances([instanceUid], { transaction: ctx.transaction });
         }
         return;
       }

package/dist/server/resources/flowModelTemplates.js

@@ -237,6 +237,7 @@ var flowModelTemplates_default = {
       }
     },
     async destroy(ctx, next) {
+      var _a;
       const templateUid = resolveTemplateUid(ctx);
       if (!templateUid) {
         return ctx.throw(400, "template uid is required");
@@ -255,6 +256,13 @@ var flowModelTemplates_default = {
           data: { usageCount }
         });
       }
+      const templateRepo = ctx.db.getRepository("flowModelTemplates");
+      const template = await templateRepo.findOne({
+        filter: { uid: templateUid },
+        transaction: ctx.transaction,
+        context: ctx
+      });
+      const targetUid = ((_a = template == null ? void 0 : template.get) == null ? void 0 : _a.call(template, "targetUid")) || (template == null ? void 0 : template.targetUid);
       await import_actions.default.destroy(ctx, next);
       await usageRepo.destroy({
         filter: {
@@ -262,6 +270,10 @@ var flowModelTemplates_default = {
         },
         context: ctx
       });
+      if (targetUid) {
+        const flowRepo = ctx.db.getRepository("flowModels");
+        await flowRepo.remove(targetUid, { transaction: ctx.transaction });
+      }
     }
   }
 };

package/package.json

@@ -4,17 +4,17 @@
   "displayName.zh-CN": "UI 模板",
   "description": "Provides block templates and popup templates for UI reuse.",
   "description.zh-CN": "提供区块模板和弹窗模板复用的能力。",
-  "version": "2.1.0-beta.9",
+  "version": "2.1.0",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "types": "./dist/index.d.ts",
   "devDependencies": {
-    "@formily/shared": "2.x",
     "antd": "5.x",
     "react": "^18.2.0"
   },
   "peerDependencies": {
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
     "@nocobase/flow-engine": "2.x",
     "@nocobase/plugin-flow-engine": "2.x",
     "@nocobase/server": "2.x",
@@ -33,5 +33,5 @@
     "block",
     "popup"
   ],
-  "gitHead": "c3a2875e4cbbb43b1f2361e6f9f5f84a7d3f3c3c"
+  "gitHead": "9373212dd0f22cd985be1e23674d6b454944b9ee"
 }

package/dist/client/collections/flowModelTemplates.d.ts

@@ -1,67 +0,0 @@
-/**
- * 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.
- */
-export declare const flowModelTemplatesCollection: {
-    name: string;
-    filterTargetKey: string;
-    fields: ({
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            required: boolean;
-            'x-component': string;
-            'x-component-props'?: undefined;
-            'x-disabled'?: undefined;
-            'x-hidden'?: undefined;
-        };
-    } | {
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            'x-component': string;
-            'x-component-props': {
-                rows: number;
-            };
-            required?: undefined;
-            'x-disabled'?: undefined;
-            'x-hidden'?: undefined;
-        };
-    } | {
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            'x-component': string;
-            'x-disabled': boolean;
-            required?: undefined;
-            'x-component-props'?: undefined;
-            'x-hidden'?: undefined;
-        };
-    } | {
-        type: string;
-        name: string;
-        interface: string;
-        uiSchema: {
-            type: string;
-            title: string;
-            'x-component': string;
-            'x-disabled': boolean;
-            'x-hidden': boolean;
-            required?: undefined;
-            'x-component-props'?: undefined;
-        };
-    })[];
-};

package/dist/client/hooks/useFlowModelTemplateActions.d.ts

@@ -1,24 +0,0 @@
-/**
- * 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.
- */
-import { ActionProps } from '@nocobase/client';
-export declare const useFlowModelTemplateSearchProps: () => {
-    placeholder: string;
-    value: string;
-    onChange: (e: any) => void;
-    onSearch: (value: string) => void;
-    allowClear: boolean;
-    style: {
-        width: number;
-    };
-};
-export declare const useFlowModelTemplateEditFormProps: () => {
-    form: import("@formily/core").Form<any>;
-};
-export declare const useFlowModelTemplateEditActionProps: () => ActionProps;
-export declare const useFlowModelTemplateDeleteActionProps: () => ActionProps;