Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into cleaning

packages/@core/base/design/src/css/global.css

@@ -14,8 +14,9 @@
   }
 
   html {
-    @apply text-foreground font-sans text-[100%];
+    @apply text-foreground bg-background font-sans;
 
+    font-size: var(--font-size-base, 16px);
     font-variation-settings: normal;
     line-height: 1.15;
 
@@ -171,7 +172,6 @@
     border-radius: 2rem !important;
     box-shadow: var(--glass-shadow) !important;
     backdrop-filter: blur(24px) !important;
-    backdrop-filter: blur(24px) !important;
     transition: all 0.3s ease-out !important;
   }
 
@@ -239,7 +239,6 @@
     border: 1px solid rgb(var(--glass-border)) !important;
     border-radius: 1.5rem !important;
     backdrop-filter: blur(24px) !important;
-    backdrop-filter: blur(24px) !important;
   }
 
   /* 表头样式 */
@@ -247,7 +246,6 @@
   div.vxe-table--header-wrapper {
     background: rgb(255 255 255 / 30%) !important;
     backdrop-filter: blur(16px) !important;
-    backdrop-filter: blur(16px) !important;
   }
 
   .vxe-header--column,
@@ -306,7 +304,6 @@
   .glass-card {
     background: rgb(var(--glass-surface));
     backdrop-filter: blur(24px);
-    backdrop-filter: blur(24px);
   }
 
   /* 玻璃边框 */

packages/@core/base/design/src/design-tokens/default.css

@@ -110,6 +110,7 @@
 
   /* 基本文字大小 */
   --font-size-base: 16px;
+  --menu-font-size: calc(var(--font-size-base) * 0.875);
 
   /* =============component & UI============= */
 

packages/@core/base/shared/src/utils/tree.ts

@@ -208,4 +208,39 @@ function treeToString(tree: any[], nodeId: number | string) {
   return str;
 }
 
-export { filterTree, handleTree, mapTree, traverseTreeValues, treeToString };
+/**
+ * 对树形结构数据进行递归排序
+ * @param treeData - 树形数据数组
+ * @param sortFunction - 排序函数，用于定义排序规则
+ * @param options - 配置选项，包括子节点属性名
+ * @returns 排序后的树形数据
+ */
+function sortTree<T extends Record<string, any>>(
+  treeData: T[],
+  sortFunction: (a: T, b: T) => number,
+  options?: TreeConfigOptions,
+): T[] {
+  const { childProps } = options || {
+    childProps: 'children',
+  };
+
+  return treeData.toSorted(sortFunction).map((item) => {
+    const children = item[childProps];
+    if (children && Array.isArray(children) && children.length > 0) {
+      return {
+        ...item,
+        [childProps]: sortTree(children, sortFunction, options),
+      };
+    }
+    return item;
+  });
+}
+
+export {
+  filterTree,
+  handleTree,
+  mapTree,
+  sortTree,
+  traverseTreeValues,
+  treeToString,
+};