From c77086ad2d7949ab36dd0c4e0b59907e672dd64f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 18 九月 2026 15:04:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_pro2.0' into dev_宁夏_九泓化工
---
src/utils/index.ts | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/utils/index.ts b/src/utils/index.ts
index aeacaf7..cdedaf7 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,10 +1,10 @@
-import type { Recordable } from '..\packages\types\src';
+import type { Recordable } from '@vben/types';
export * from './rangePickerProps';
export * from './routerHelper';
// 浠庡叡浜寘瀵煎嚭 URL 宸ュ叿鍑芥暟
-export { isUrl } from '..\packages\utils\src';
+export { isUrl } from '@vben/utils';
/**
* 鏌ユ壘鏁扮粍瀵硅薄鐨勬煇涓笅鏍�
@@ -30,3 +30,18 @@
});
return index;
};
+
+/**
+ * 鍘绘帀琛ㄦ牸鍒楃殑鍥哄畾锛坒ixed锛夐厤缃�
+ *
+ * 鐢ㄤ簬銆屾煡鐪嬪鎵规槑缁� / 璇︽儏銆嶇瓑鍙鍦烘櫙锛氭鏃惰〃鏍煎鍣ㄨ緝绐勶紝
+ * 鍥哄畾鍒椾細鎸ゅ崰鍙瀹藉害锛屾妸浜у搧鍚嶇О銆佸崟浣嶃�佸娉ㄧ瓑鍒楅伄浣忋��
+ *
+ * @param columns 鍘熷琛ㄦ牸鍒楅厤缃�
+ */
+export function withoutFixedColumns<T>(columns?: null | T[]): T[] {
+ return (columns ?? []).map((column) => {
+ const { fixed: _fixed, ...rest } = column as Recordable<any>;
+ return rest as unknown as T;
+ });
+}
--
Gitblit v1.9.3