@nocobase/plugin-ui-templates 2.1.0-beta.33 → 2.1.0-beta.35

package/dist/externalVersion.js

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

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,7 +4,7 @@
   "displayName.zh-CN": "UI 模板",
   "description": "Provides block templates and popup templates for UI reuse.",
   "description.zh-CN": "提供区块模板和弹窗模板复用的能力。",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "types": "./dist/index.d.ts",
@@ -33,5 +33,5 @@
     "block",
     "popup"
   ],
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }