@tachybase/module-ui-schema 0.23.20 → 0.23.35

package/dist/externalVersion.js

@@ -1,11 +1,11 @@
 module.exports = {
-  "@tachybase/client": "0.23.20",
-  "@tachybase/database": "0.23.20",
-  "@tachybase/cache": "0.23.20",
-  "@tachybase/utils": "0.23.20",
+  "@tachybase/client": "0.23.35",
+  "@tachybase/database": "0.23.35",
+  "@tachybase/cache": "0.23.35",
+  "@tachybase/utils": "0.23.35",
   "lodash": "4.17.21",
-  "@tachybase/server": "0.23.20",
-  "@tachybase/actions": "0.23.20",
-  "@tachybase/resourcer": "0.23.20",
+  "@tachybase/server": "0.23.35",
+  "@tachybase/actions": "0.23.35",
+  "@tachybase/resourcer": "0.23.35",
   "sequelize": "6.37.5"
 };

package/dist/server/repository.d.ts

@@ -55,6 +55,8 @@ export declare class UiSchemaRepository extends Repository {
     insert(schema: any, options?: Transactionable): Promise<any>;
     insertNewSchema(schema: any, options?: Transactionable & {
         returnNode?: boolean;
+        position?: string;
+        target?: string;
     }): Promise<any>;
     insertSingleNode(schema: SchemaNode, options: Transactionable & removeParentOptions): Promise<any>;
     protected updateNode(uid: string, schema: any, transaction?: Transaction): Promise<void>;

package/dist/server/repository.js

@@ -235,12 +235,12 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
       return schema;
     };
     const buildTree = (rootNode) => {
-      const children = nodes.filter((node) => node.parent == rootNode["x-uid"]);
+      const children = nodes.filter((node) => node.parent === rootNode["x-uid"]);
       if (children.length > 0) {
         const childrenGroupByType = import_lodash.default.groupBy(children, "type");
         for (const childType of Object.keys(childrenGroupByType)) {
           const properties = childrenGroupByType[childType].map((child) => buildTree(child)).sort((a, b) => a["x-index"] - b["x-index"]);
-          rootNode[childType] = childType == "items" ? properties.length == 1 ? properties[0] : properties : properties.reduce((carry, item) => {
+          rootNode[childType] = childType === "items" ? properties.length === 1 ? properties[0] : properties : properties.reduce((carry, item) => {
             carry[item.name] = item;
             delete item["name"];
             return carry;
@@ -249,7 +249,7 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
       }
       return nodeAttributeSanitize(rootNode);
     };
-    return buildTree(nodes.find((node) => node["x-uid"] == rootUid));
+    return buildTree(nodes.find((node) => node["x-uid"] === rootUid));
   }
   async clearAncestor(uid2, options) {
     await this.clearXUidPathCache(uid2, options == null ? void 0 : options.transaction);
@@ -288,7 +288,7 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
     const oldTree = await this.getJsonSchema(rootUid, { transaction: transaction2 });
     const traverSchemaTree = async (schema, path = []) => {
       const node = schema;
-      const oldNode = path.length == 0 ? oldTree : import_lodash.default.get(oldTree, path);
+      const oldNode = path.length === 0 ? oldTree : import_lodash.default.get(oldTree, path);
       const oldNodeUid = oldNode["x-uid"];
       await this.updateNode(oldNodeUid, node, transaction2);
       const properties = node.properties;
@@ -377,7 +377,9 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
     if (options.wrap) {
       const wrapSchemaNodes = await this.insertNewSchema(options.wrap, {
         transaction: transaction2,
-        returnNode: true
+        returnNode: true,
+        target,
+        position
       });
       const lastWrapNode = wrapSchemaNodes[wrapSchemaNodes.length - 1];
       await this.insertAdjacent("afterBegin", lastWrapNode["x-uid"], schema, import_lodash.default.omit(options, "wrap"));
@@ -390,7 +392,9 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
       } else {
         const insertedSchema = await this.insertNewSchema(schema, {
           transaction: transaction2,
-          returnNode: true
+          returnNode: true,
+          position,
+          target
         });
         schema = insertedSchema[0]["x-uid"];
       }
@@ -616,7 +620,7 @@ const _UiSchemaRepository = class _UiSchemaRepository extends (_a = import_datab
           }
         );
         sort = targetSort[0].sort;
-        if (targetPosition.type == "after") {
+        if (targetPosition.type === "after") {
           sort += 1;
         }
         let updateSql2 = `UPDATE ${treeTable} as TreeTable
@@ -752,7 +756,7 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
       return null;
     }
     const parentChildrenCount = await this.childrenCount(parent, transaction2);
-    if (parentChildrenCount == 1) {
+    if (parentChildrenCount === 1) {
       const schema = await db.getRepository("uiSchemas").findOne({
         filter: {
           "x-uid": parent
@@ -847,7 +851,7 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
       },
       transaction: transaction2
     });
-    if (nodes[0].length == 0) {
+    if (nodes[0].length === 0) {
       return {};
     }
     const schema = this.nodesToSchema(nodes[0], uid2);
@@ -872,7 +876,7 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
       },
       transaction: options == null ? void 0 : options.transaction
     });
-    if (nodes[0].length == 0) {
+    if (nodes[0].length === 0) {
       return {};
     }
     return this.nodesToSchema(nodes[0], uid2);

package/dist/server/server-hooks/hooks/bind-menu-to-role.js

@@ -21,15 +21,33 @@ __export(bind_menu_to_role_exports, {
 });
 module.exports = __toCommonJS(bind_menu_to_role_exports);
 async function bindMenuToRole({ schemaInstance, db, options }) {
-  const { transaction } = options;
+  const { transaction, position, target } = options;
   const addNewMenuRoles = await db.getRepository("roles").find({
     filter: {
       allowNewMenu: true
     }
   });
+  const uid = schemaInstance.get("x-uid");
+  let ancestorSet = /* @__PURE__ */ new Set();
+  ancestorSet.add(uid);
+  if (target) {
+    const ancestorList = await db.getRepository("uiSchemaTreePath").find({
+      fields: ["ancestor"],
+      filter: {
+        descendant: target
+      },
+      transaction
+    });
+    ancestorList.forEach((ancestor) => {
+      ancestorSet.add(ancestor.get("ancestor"));
+    });
+    if (position === "beforeBegin" || position === "afterEnd") {
+      ancestorSet.delete(target);
+    }
+  }
   for (const role of addNewMenuRoles) {
     await db.getRepository("roles.menuUiSchemas", role.get("name")).add({
-      tk: schemaInstance.get("x-uid"),
+      tk: [...ancestorSet],
       transaction
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-ui-schema",
   "displayName": "UI schema storage",
-  "version": "0.23.20",
+  "version": "0.23.35",
   "description": "Provides centralized UI schema storage service.",
   "keywords": [
     "System & security"
@@ -14,16 +14,16 @@
     "sequelize": "6.37.5"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.20",
-    "@tachybase/client": "0.23.20",
-    "@tachybase/cache": "0.23.20",
-    "@tachybase/database": "0.23.20",
-    "@tachybase/module-user": "0.23.20",
-    "@tachybase/module-error-handler": "0.23.20",
-    "@tachybase/resourcer": "0.23.20",
-    "@tachybase/server": "0.23.20",
-    "@tachybase/test": "0.23.20",
-    "@tachybase/utils": "0.23.20"
+    "@tachybase/actions": "0.23.35",
+    "@tachybase/client": "0.23.35",
+    "@tachybase/cache": "0.23.35",
+    "@tachybase/database": "0.23.35",
+    "@tachybase/module-user": "0.23.35",
+    "@tachybase/module-error-handler": "0.23.35",
+    "@tachybase/resourcer": "0.23.35",
+    "@tachybase/server": "0.23.35",
+    "@tachybase/test": "0.23.35",
+    "@tachybase/utils": "0.23.35"
   },
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
   "displayName.zh-CN": "UI schema 存储服务",