onchain-utility 0.0.6 → 0.0.8

package/dist/OnchainUtility.js

@@ -1356,6 +1356,7 @@ function move({
   isMoveUp,
   selectKeys,
   childrenKey = 'children',
+  onMove,
   onMoved,
   onError
 }) {
@@ -1378,7 +1379,12 @@ function move({
       const [start] = relArr;
       const end = relArr[len - 1];
       const changePosition = isMoveUp ? start.beforeSibling.pop() : end.afterSibling.shift();
-      if (changePosition) {
+      // 锚点的父级
+      const anchorParent = isMoveUp ? start.parent : end.parent;
+      if (changePosition && (!onMove || onMove({
+        parent: anchorParent,
+        selected
+      }))) {
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
@@ -1455,10 +1461,7 @@ async function upgrade({
       const {
         parent
       } = start;
-      if (parent && (!onUpgrade || (await onUpgrade({
-        parent,
-        selected
-      })))) {
+      if (parent) {
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
@@ -1469,6 +1472,13 @@ async function upgrade({
           parent: grandpa,
           index: parentIndex
         } = parentRel;
+        if (onUpgrade && !(await onUpgrade({
+          grandpa,
+          parent,
+          selected
+        }))) {
+          continue;
+        }
         // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
@@ -1597,6 +1607,27 @@ function insert({
   }
 }
 
+/** 树结构搜索 */
+function treeSearch({
+  data,
+  searchValue,
+  childrenKey = 'children'
+}) {
+  return data.map(row => {
+    const children = treeSearch({
+      childrenKey,
+      data: row[childrenKey] || [],
+      searchValue
+    });
+    if (searchValue(row) || children.length) {
+      return {
+        ...row,
+        [childrenKey]: children
+      };
+    }
+  }).filter(row => !!row);
+}
+
 exports._isMoment = _isMoment;
 exports.arrayAttributeFlat = arrayAttributeFlat;
 exports.asyncDfs = asyncDfs;
@@ -1630,6 +1661,7 @@ exports.t = t;
 exports.toRawType = toRawType;
 exports.toTypeString = toTypeString;
 exports.translateI18n = translateI18n;
+exports.treeSearch = treeSearch;
 exports.upgrade = upgrade;
 exports.useReactive = useReactive;
 exports.useShallowReactive = useShallowReactive;

package/dist/OnchainUtility.mjs

@@ -1354,6 +1354,7 @@ function move({
   isMoveUp,
   selectKeys,
   childrenKey = 'children',
+  onMove,
   onMoved,
   onError
 }) {
@@ -1376,7 +1377,12 @@ function move({
       const [start] = relArr;
       const end = relArr[len - 1];
       const changePosition = isMoveUp ? start.beforeSibling.pop() : end.afterSibling.shift();
-      if (changePosition) {
+      // 锚点的父级
+      const anchorParent = isMoveUp ? start.parent : end.parent;
+      if (changePosition && (!onMove || onMove({
+        parent: anchorParent,
+        selected
+      }))) {
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
@@ -1453,10 +1459,7 @@ async function upgrade({
       const {
         parent
       } = start;
-      if (parent && (!onUpgrade || (await onUpgrade({
-        parent,
-        selected
-      })))) {
+      if (parent) {
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
@@ -1467,6 +1470,13 @@ async function upgrade({
           parent: grandpa,
           index: parentIndex
         } = parentRel;
+        if (onUpgrade && !(await onUpgrade({
+          grandpa,
+          parent,
+          selected
+        }))) {
+          continue;
+        }
         // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
@@ -1595,4 +1605,25 @@ function insert({
   }
 }
 
-export { _isMoment, arrayAttributeFlat, asyncDfs, base64ToFile, base64ToMimeType, baseTemplate, bfs, createEnumObject, deleteTreeNodes, dfs, downgrade, generateSecureUUID, generatedAcrossHierarchySort, getBase64Regular, getHTMLTagString, getI18nText, getSiblings, getTreeRelation, hasOwnProperty, initTranslateI18nFn, insert, isEmptyObject, isIntegerKey, levelTransformTree, makeDestructurable, mergeAdjacent, movUp, move, moveDown, t, toRawType, toTypeString, translateI18n, upgrade, useReactive, useShallowReactive, useStore };
+/** 树结构搜索 */
+function treeSearch({
+  data,
+  searchValue,
+  childrenKey = 'children'
+}) {
+  return data.map(row => {
+    const children = treeSearch({
+      childrenKey,
+      data: row[childrenKey] || [],
+      searchValue
+    });
+    if (searchValue(row) || children.length) {
+      return {
+        ...row,
+        [childrenKey]: children
+      };
+    }
+  }).filter(row => !!row);
+}
+
+export { _isMoment, arrayAttributeFlat, asyncDfs, base64ToFile, base64ToMimeType, baseTemplate, bfs, createEnumObject, deleteTreeNodes, dfs, downgrade, generateSecureUUID, generatedAcrossHierarchySort, getBase64Regular, getHTMLTagString, getI18nText, getSiblings, getTreeRelation, hasOwnProperty, initTranslateI18nFn, insert, isEmptyObject, isIntegerKey, levelTransformTree, makeDestructurable, mergeAdjacent, movUp, move, moveDown, t, toRawType, toTypeString, translateI18n, treeSearch, upgrade, useReactive, useShallowReactive, useStore };

package/dist/Tree.js

@@ -349,6 +349,7 @@ function move({
   isMoveUp,
   selectKeys,
   childrenKey = 'children',
+  onMove,
   onMoved,
   onError
 }) {
@@ -371,7 +372,12 @@ function move({
       const [start] = relArr;
       const end = relArr[len - 1];
       const changePosition = isMoveUp ? start.beforeSibling.pop() : end.afterSibling.shift();
-      if (changePosition) {
+      // 锚点的父级
+      const anchorParent = isMoveUp ? start.parent : end.parent;
+      if (changePosition && (!onMove || onMove({
+        parent: anchorParent,
+        selected
+      }))) {
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
@@ -448,10 +454,7 @@ async function upgrade({
       const {
         parent
       } = start;
-      if (parent && (!onUpgrade || (await onUpgrade({
-        parent,
-        selected
-      })))) {
+      if (parent) {
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
@@ -462,6 +465,13 @@ async function upgrade({
           parent: grandpa,
           index: parentIndex
         } = parentRel;
+        if (onUpgrade && !(await onUpgrade({
+          grandpa,
+          parent,
+          selected
+        }))) {
+          continue;
+        }
         // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
@@ -590,6 +600,27 @@ function insert({
   }
 }
 
+/** 树结构搜索 */
+function treeSearch({
+  data,
+  searchValue,
+  childrenKey = 'children'
+}) {
+  return data.map(row => {
+    const children = treeSearch({
+      childrenKey,
+      data: row[childrenKey] || [],
+      searchValue
+    });
+    if (searchValue(row) || children.length) {
+      return {
+        ...row,
+        [childrenKey]: children
+      };
+    }
+  }).filter(row => !!row);
+}
+
 exports.arrayAttributeFlat = arrayAttributeFlat;
 exports.deleteTreeNodes = deleteTreeNodes;
 exports.downgrade = downgrade;
@@ -602,4 +633,5 @@ exports.mergeAdjacent = mergeAdjacent;
 exports.movUp = movUp;
 exports.move = move;
 exports.moveDown = moveDown;
+exports.treeSearch = treeSearch;
 exports.upgrade = upgrade;

package/dist/Tree.mjs

@@ -347,6 +347,7 @@ function move({
   isMoveUp,
   selectKeys,
   childrenKey = 'children',
+  onMove,
   onMoved,
   onError
 }) {
@@ -369,7 +370,12 @@ function move({
       const [start] = relArr;
       const end = relArr[len - 1];
       const changePosition = isMoveUp ? start.beforeSibling.pop() : end.afterSibling.shift();
-      if (changePosition) {
+      // 锚点的父级
+      const anchorParent = isMoveUp ? start.parent : end.parent;
+      if (changePosition && (!onMove || onMove({
+        parent: anchorParent,
+        selected
+      }))) {
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
@@ -446,10 +452,7 @@ async function upgrade({
       const {
         parent
       } = start;
-      if (parent && (!onUpgrade || (await onUpgrade({
-        parent,
-        selected
-      })))) {
+      if (parent) {
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
@@ -460,6 +463,13 @@ async function upgrade({
           parent: grandpa,
           index: parentIndex
         } = parentRel;
+        if (onUpgrade && !(await onUpgrade({
+          grandpa,
+          parent,
+          selected
+        }))) {
+          continue;
+        }
         // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
         let followChildren;
         /** 无法跟随的节点 */
@@ -588,4 +598,25 @@ function insert({
   }
 }
 
-export { arrayAttributeFlat, deleteTreeNodes, downgrade, generatedAcrossHierarchySort, getSiblings, getTreeRelation, insert, levelTransformTree, mergeAdjacent, movUp, move, moveDown, upgrade };
+/** 树结构搜索 */
+function treeSearch({
+  data,
+  searchValue,
+  childrenKey = 'children'
+}) {
+  return data.map(row => {
+    const children = treeSearch({
+      childrenKey,
+      data: row[childrenKey] || [],
+      searchValue
+    });
+    if (searchValue(row) || children.length) {
+      return {
+        ...row,
+        [childrenKey]: children
+      };
+    }
+  }).filter(row => !!row);
+}
+
+export { arrayAttributeFlat, deleteTreeNodes, downgrade, generatedAcrossHierarchySort, getSiblings, getTreeRelation, insert, levelTransformTree, mergeAdjacent, movUp, move, moveDown, treeSearch, upgrade };

package/package.json

@@ -2,7 +2,7 @@
   "name": "onchain-utility",
   "description": "This package contains misc utilities for onchain.",
   "license": "MIT",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "files": [
     "dist",
     "src"

package/src/Tree/index.ts

@@ -414,6 +414,7 @@ function _simpleGetRel<T extends Item>({
 
 type MoveParams<T> = Params<T> & {
   selectKeys: string[];
+  onMove?: (params: {selected: T[]; parent: T}) => boolean;
   onMoved?: (moves: T[]) => void;
   onError?: (params: {selected: T[]; isMoveUp?: boolean}) => boolean | void;
 };
@@ -424,6 +425,7 @@ export function move<T extends Item>({
   isMoveUp,
   selectKeys,
   childrenKey = 'children',
+  onMove,
   onMoved,
   onError,
 }: MoveParams<T> & {
@@ -443,7 +445,12 @@ export function move<T extends Item>({
       const changePosition = isMoveUp
         ? start.beforeSibling.pop()
         : end.afterSibling.shift();
-      if (changePosition) {
+      // 锚点的父级
+      const anchorParent = isMoveUp ? start.parent : end.parent;
+      if (
+        changePosition &&
+        (!onMove || onMove({parent: anchorParent!, selected}))
+      ) {
         // 锚点的父级
         const anchorParent = isMoveUp ? start.parent : end.parent;
         // 删除选中
@@ -499,6 +506,7 @@ export async function upgrade<T extends Item>({
   onUpgrade?: (params: {
     selected: T[];
     parent: T;
+    grandpa?: T;
   }) => Promise<boolean> | boolean;
   onUpgraded?: (upgrades: T[]) => void;
 }) {
@@ -516,7 +524,7 @@ export async function upgrade<T extends Item>({
       const [start] = relArr;
       const end = relArr[len - 1];
       const {parent} = start;
-      if (parent && (!onUpgrade || (await onUpgrade({parent, selected})))) {
+      if (parent) {
         const parentRel = _simpleGetRel({
           childrenKey,
           data,
@@ -524,6 +532,9 @@ export async function upgrade<T extends Item>({
           signKey,
         });
         const {parent: grandpa, index: parentIndex} = parentRel;
+        if (onUpgrade && !(await onUpgrade({grandpa, parent, selected}))) {
+          continue;
+        }
         // const originalOldPrtCdr = parent.children?.slice(0, Infinity) || [];
         let followChildren: T[];
         /** 无法跟随的节点 */
@@ -659,3 +670,26 @@ export function insert<T extends Item>({
     }
   }
 }
+
+/** 树结构搜索 */
+export function treeSearch<T extends Record<string, any>>({
+  data,
+  searchValue,
+  childrenKey = 'children',
+}: {
+  data: T[];
+  searchValue: (item: T) => boolean;
+  childrenKey?: string;
+}) {
+  return data
+    .map((row) => {
+      const children: T[] = treeSearch({ childrenKey, data: row[childrenKey] || [], searchValue });
+      if (searchValue(row) || children.length) {
+        return {
+          ...row,
+          [childrenKey]: children,
+        };
+      }
+    })
+    .filter((row): row is T => !!row);
+}