ll-plus 2.4.5 → 2.4.7

package/lib/components/tooltip/src/tooltip.vue.d.ts

@@ -1,11 +1,11 @@
 declare const _default: import("vue").DefineComponent<{
     readonly tip: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "提示", boolean>;
-    readonly placement: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown, "top", boolean>;
+    readonly placement: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown, "top", boolean>;
     readonly maxWidth: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, "", boolean>;
 }, {
     props: import("@vue/shared").LooseRequired<{
-        readonly placement: import("ll-plus/es/utils").EpPropMergeType<StringConstructor, "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown>;
         readonly maxWidth: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
+        readonly placement: import("ll-plus/es/utils").EpPropMergeType<StringConstructor, "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown>;
         readonly tip: string;
     } & {}>;
     attrs: {
@@ -24,11 +24,11 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     readonly tip: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "提示", boolean>;
-    readonly placement: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown, "top", boolean>;
+    readonly placement: import("ll-plus/es/utils").EpPropFinalized<StringConstructor, "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown, "top", boolean>;
     readonly maxWidth: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, "", boolean>;
 }>>, {
-    readonly placement: import("ll-plus/es/utils").EpPropMergeType<StringConstructor, "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown>;
     readonly maxWidth: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
+    readonly placement: import("ll-plus/es/utils").EpPropMergeType<StringConstructor, "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom", unknown>;
     readonly tip: string;
 }, {}>;
 export default _default;

package/lib/components/tree-search/index.d.ts

@@ -20,14 +20,14 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
     readonly modalConfigProps: {
         readonly type: import("vue").PropType<{
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }>;
@@ -37,12 +37,12 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
     };
     readonly drawerConfigProps: {
         readonly type: import("vue").PropType<{
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -73,37 +73,37 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
         readonly expandedKeys?: string[] | undefined;
         readonly modalConfigProps?: {
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         } | undefined;
         readonly drawerConfigProps?: {
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirmOptions: Record<string, any>;
         } | undefined;
         readonly onSelect?: ((selectedKeys: string[], e: Event) => any) | undefined;
-        readonly onClose?: (() => any) | undefined;
         readonly onOk?: (() => any) | undefined;
+        readonly onClose?: (() => any) | undefined;
         readonly onExpand?: ((expandedKeys: string[], data: any) => any) | undefined;
         readonly onCancel?: (() => any) | undefined;
         readonly onClickAdd?: (() => any) | undefined;
     } & {}>;
-    emits: ((event: "close") => void) & ((event: "select", selectedKeys: string[], e: Event) => void) & ((event: "ok") => void) & ((event: "cancel") => void) & ((event: "expand", expandedKeys: string[], data: any) => void) & ((event: "clickAdd") => void);
+    emits: ((event: "ok") => void) & ((event: "select", selectedKeys: string[], e: Event) => void) & ((event: "close") => void) & ((event: "cancel") => void) & ((event: "expand", expandedKeys: string[], data: any) => void) & ((event: "clickAdd") => void);
     isCollapseMenu: import("vue").Ref<boolean>;
     newExpandedKeys: import("vue").Ref<string[]>;
     bem: {
@@ -335,14 +335,14 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
     readonly modalConfigProps: {
         readonly type: import("vue").PropType<{
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }>;
@@ -352,12 +352,12 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
     };
     readonly drawerConfigProps: {
         readonly type: import("vue").PropType<{
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -376,8 +376,8 @@ export declare const LlTreeSearch: import("ll-plus/es/utils").SFCWithInstall<imp
     readonly onSearchInputChange: import("ll-plus/es/utils").EpPropFinalized<FunctionConstructor, unknown, unknown, (v: string) => boolean, boolean>;
 }>> & {
     onSelect?: ((selectedKeys: string[], e: Event) => any) | undefined;
-    onClose?: (() => any) | undefined;
     onOk?: (() => any) | undefined;
+    onClose?: (() => any) | undefined;
     onExpand?: ((expandedKeys: string[], data: any) => any) | undefined;
     onCancel?: (() => any) | undefined;
     onClickAdd?: (() => any) | undefined;

package/lib/components/tree-search/src/config/tree-search.d.ts

@@ -23,14 +23,14 @@ export declare const treeSearchProps: {
     readonly modalConfigProps: {
         readonly type: import("vue").PropType<{
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }>;
@@ -40,12 +40,12 @@ export declare const treeSearchProps: {
     };
     readonly drawerConfigProps: {
         readonly type: import("vue").PropType<{
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;

package/lib/components/tree-search/src/tree-search.vue.d.ts

@@ -19,14 +19,14 @@ declare const _default: import("vue").DefineComponent<{
     readonly modalConfigProps: {
         readonly type: import("vue").PropType<{
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }>;
@@ -36,12 +36,12 @@ declare const _default: import("vue").DefineComponent<{
     };
     readonly drawerConfigProps: {
         readonly type: import("vue").PropType<{
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -72,37 +72,37 @@ declare const _default: import("vue").DefineComponent<{
         readonly expandedKeys?: string[] | undefined;
         readonly modalConfigProps?: {
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         } | undefined;
         readonly drawerConfigProps?: {
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirmOptions: Record<string, any>;
         } | undefined;
         readonly onSelect?: ((selectedKeys: string[], e: Event) => any) | undefined;
-        readonly onClose?: (() => any) | undefined;
         readonly onOk?: (() => any) | undefined;
+        readonly onClose?: (() => any) | undefined;
         readonly onExpand?: ((expandedKeys: string[], data: any) => any) | undefined;
         readonly onCancel?: (() => any) | undefined;
         readonly onClickAdd?: (() => any) | undefined;
     } & {}>;
-    emits: ((event: "close") => void) & ((event: "select", selectedKeys: string[], e: Event) => void) & ((event: "ok") => void) & ((event: "cancel") => void) & ((event: "expand", expandedKeys: string[], data: any) => void) & ((event: "clickAdd") => void);
+    emits: ((event: "ok") => void) & ((event: "select", selectedKeys: string[], e: Event) => void) & ((event: "close") => void) & ((event: "cancel") => void) & ((event: "expand", expandedKeys: string[], data: any) => void) & ((event: "clickAdd") => void);
     isCollapseMenu: import("vue").Ref<boolean>;
     newExpandedKeys: import("vue").Ref<string[]>;
     bem: {
@@ -334,14 +334,14 @@ declare const _default: import("vue").DefineComponent<{
     readonly modalConfigProps: {
         readonly type: import("vue").PropType<{
             readonly type: import("ll-plus/es/utils").EpPropMergeType<(new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload") | ((new (...args: any[]) => "confirm" | "operate" | "upload") | (() => "confirm" | "operate" | "upload"))[], unknown, unknown>;
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly wrapClassName: string;
             readonly class: string;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly isConfirmModel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
         }>;
@@ -351,12 +351,12 @@ declare const _default: import("vue").DefineComponent<{
     };
     readonly drawerConfigProps: {
         readonly type: import("vue").PropType<{
-            readonly title: string;
             readonly open: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly title: string;
             readonly loading: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelText: string;
             readonly showCancel: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly confirmText: string;
             readonly useClose: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
             readonly cancelConfirm: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -375,8 +375,8 @@ declare const _default: import("vue").DefineComponent<{
     readonly onSearchInputChange: import("ll-plus/es/utils").EpPropFinalized<FunctionConstructor, unknown, unknown, (v: string) => boolean, boolean>;
 }>> & {
     onSelect?: ((selectedKeys: string[], e: Event) => any) | undefined;
-    onClose?: (() => any) | undefined;
     onOk?: (() => any) | undefined;
+    onClose?: (() => any) | undefined;
     onExpand?: ((expandedKeys: string[], data: any) => any) | undefined;
     onCancel?: (() => any) | undefined;
     onClickAdd?: (() => any) | undefined;

package/lib/components/upload-drag/index.d.ts

@@ -35,11 +35,11 @@ export declare const LlUploadDrag: import("ll-plus/es/utils").SFCWithInstall<imp
         readonly tip: string;
         readonly fileSize: number;
         readonly "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-        readonly onConfirm?: ((...args: any[]) => any) | undefined;
         readonly onCancel?: ((...args: any[]) => any) | undefined;
+        readonly onConfirm?: ((...args: any[]) => any) | undefined;
         readonly onCustomRequest?: ((...args: any[]) => any) | undefined;
     } & {}>;
-    emits: (event: "update:value" | "confirm" | "customRequest" | "cancel", ...args: any[]) => void;
+    emits: (event: "update:value" | "customRequest" | "confirm" | "cancel", ...args: any[]) => void;
     bem: {
         b: (blockSuffix?: string) => string;
         e: (element?: string) => string;
@@ -61,7 +61,7 @@ export declare const LlUploadDrag: import("ll-plus/es/utils").SFCWithInstall<imp
     handleDragReject: () => void;
     handleClickCancelBtn: () => void;
     handleClickOkBtn: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "confirm" | "customRequest" | "cancel")[], "update:value" | "confirm" | "customRequest" | "cancel", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "customRequest" | "confirm" | "cancel")[], "update:value" | "customRequest" | "confirm" | "cancel", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: ArrayConstructor;
         default: () => never[];
@@ -88,8 +88,8 @@ export declare const LlUploadDrag: import("ll-plus/es/utils").SFCWithInstall<imp
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-    onConfirm?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
     onCustomRequest?: ((...args: any[]) => any) | undefined;
 }, {
     value: unknown[];

package/lib/components/upload-drag/src/upload-drag.vue.d.ts

@@ -35,11 +35,11 @@ declare const _default: import("vue").DefineComponent<{
         readonly tip: string;
         readonly fileSize: number;
         readonly "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-        readonly onConfirm?: ((...args: any[]) => any) | undefined;
         readonly onCancel?: ((...args: any[]) => any) | undefined;
+        readonly onConfirm?: ((...args: any[]) => any) | undefined;
         readonly onCustomRequest?: ((...args: any[]) => any) | undefined;
     } & {}>;
-    emits: (event: "update:value" | "confirm" | "customRequest" | "cancel", ...args: any[]) => void;
+    emits: (event: "update:value" | "customRequest" | "confirm" | "cancel", ...args: any[]) => void;
     bem: {
         b: (blockSuffix?: string) => string;
         e: (element?: string) => string;
@@ -61,7 +61,7 @@ declare const _default: import("vue").DefineComponent<{
     handleDragReject: () => void;
     handleClickCancelBtn: () => void;
     handleClickOkBtn: () => void;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "confirm" | "customRequest" | "cancel")[], "update:value" | "confirm" | "customRequest" | "cancel", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:value" | "customRequest" | "confirm" | "cancel")[], "update:value" | "customRequest" | "confirm" | "cancel", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     value: {
         type: ArrayConstructor;
         default: () => never[];
@@ -88,8 +88,8 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-    onConfirm?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
     onCustomRequest?: ((...args: any[]) => any) | undefined;
 }, {
     value: unknown[];

package/lib/packages/components/advanced-filtering/src/advanced-filtering.js

@@ -17,10 +17,13 @@ const initValue = (column, values) => {
   }
   return value;
 };
-const filterAllValue = (values) => {
+const filterAllValue = (values, column) => {
   let value = null;
   if (Array.isArray(values)) {
     value = values.filter((item) => item !== ALL_VALUE);
+    if (column && column.type === "number-range") {
+      value = values ? values.every((e) => !lodashEs.isNil(e)) ? values : null : null;
+    }
   } else {
     value = values === ALL_VALUE ? null : values;
   }

package/lib/packages/components/advanced-filtering/src/advanced-filtering.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering.js","sources":["../../../../../../packages/components/advanced-filtering/src/advanced-filtering.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\nimport { has, isEmpty, isNil } from 'lodash-es'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type { FormProps as AntFormProps, TooltipProps } from 'ant-design-vue'\nimport type { FormColumn } from '@ll-plus/components'\nimport type advancedFiltering from './advanced-filtering.vue'\nimport type advancedFilteringParams from './components/advanced-filtering-params.vue'\nimport type advancedFilteringTags from './components/advanced-filtering-tags.vue'\n\nexport interface IAvancedFilteringTag {\n  label: string\n  key: string\n  value: string | string[]\n  showValue: string | string[]\n}\n\nexport const ALL_VALUE: string = '_ALL'\n\nexport type FilterColumn = FormColumn<{\n  unUseDefaultOption?: boolean\n  defaultOptionLabel?: string\n}>\n\nexport const initValue = (column: FilterColumn, values: any) => {\n  let value: any = has(values, column.key) ? values[column.key] : null\n  if (has(column, 'options') && !column.unUseDefaultOption) {\n    if (column.type === 'checkbox-group' || has(column, 'mode')) {\n      value = isEmpty(value) || isNil(value) ? [ALL_VALUE] : value\n    } else {\n      value = isNil(value) ? ALL_VALUE : value\n    }\n  }\n\n  return value\n}\n\nexport const filterAllValue = (values: string | string[]) => {\n  let value: any = null\n  if (Array.isArray(values)) {\n    value = values.filter(item => item !== ALL_VALUE)\n  } else {\n    value = values === ALL_VALUE ? null : values\n  }\n\n  return value\n}\n\nexport const treeDataFormat = (\n  arr = [] as any[],\n  fieldNames: { [key: string]: string }\n) => {\n  let options = [] as any[]\n  if (!arr) return []\n  options = arr.map((e: any) => {\n    const obj: any = {}\n    obj.label = e[fieldNames.label]\n    obj.value = e[fieldNames.value]\n    if (e[fieldNames.children] && e[fieldNames.children].length) {\n      obj.children = treeDataFormat(e[fieldNames.children], fieldNames)\n    }\n\n    return obj\n  })\n  return options\n}\n\nexport const findLabelByValue = (\n  tree: FilterColumn['options'],\n  value: any\n): string => {\n  // 递归函数，用于遍历 Tree 数据\n  function _findLabel(nodes: FilterColumn['options']): string[] {\n    const labels: string[] = []\n    if (!nodes) return []\n    for (const node of nodes) {\n      if (node.value === value) {\n        labels.push(node.label)\n      }\n      if (node.children && node.children.length > 0) {\n        const childLabels = _findLabel(node.children)\n        if (childLabels) {\n          labels.push(...childLabels)\n        }\n      }\n    }\n    return labels.length > 0 ? labels : []\n  }\n  // 开始递归查找\n  return _findLabel(tree).join(',')\n}\n\nexport const advancedFilteringProps = buildProps({\n  filterColumns: {\n    type: definePropType<FilterColumn[]>(Array),\n    default: () => []\n  },\n  value: {\n    type: Object,\n    default: () => ({})\n  },\n  formOptions: {\n    type: definePropType<AntFormProps>(Object),\n    default: () => ({ layout: 'vertical' })\n  },\n  overlayStyle: {\n    type: definePropType<TooltipProps['overlayStyle']>(Object),\n    default: () => ({\n      width: '500px'\n    })\n  }\n} as const)\n\nexport const advancedFilteringParamsProps = buildProps({\n  filterColumns: {\n    type: definePropType<FilterColumn[]>(Array),\n    default: () => []\n  },\n  value: {\n    type: Object,\n    default: () => ({})\n  },\n  formOptions: {\n    type: definePropType<AntFormProps>(Object),\n    default: () => ({ layout: 'vertical' })\n  },\n  showFooter: {\n    type: Boolean,\n    default: false\n  }\n} as const)\n\nexport const advancedFilteringEmits = {\n  change: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\nexport const advancedFilteringParamsEmits = {\n  close: () => true,\n  confirm: () => true,\n  changeValue: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\nexport const advancedFilteringTagsEmits = {\n  change: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\n// props\nexport type AdvancedFilteringProps = ExtractPropTypes<\n  typeof advancedFilteringProps\n>\n\nexport type AdvancedFilteringParamsProps = ExtractPropTypes<\n  typeof advancedFilteringParamsProps\n>\n\n// emits\nexport type AdvancedFilteringEmits = typeof advancedFilteringEmits\n\nexport type AdvancedFilteringParamsEmits = typeof advancedFilteringParamsEmits\n\nexport type AdvancedFilteringTagsEmits = typeof advancedFilteringTagsEmits\n\n// instance\nexport type AdvancedFilteringInstance = InstanceType<typeof advancedFiltering>\n\nexport type AdvancedFilteringParamsInstance = InstanceType<\n  typeof advancedFilteringParams\n>\n\nexport type AdvancedFilteringTagsInstance = InstanceType<\n  typeof advancedFilteringTags\n>\n"],"names":["has","isEmpty","isNil","buildProps","definePropType"],"mappings":";;;;;;;AAiBO,MAAM,SAAoB,GAAA,OAAA;AAOpB,MAAA,SAAA,GAAY,CAAC,MAAA,EAAsB,MAAgB,KAAA;AAC9D,EAAI,IAAA,KAAA,GAAaA,aAAI,MAAQ,EAAA,MAAA,CAAO,GAAG,CAAI,GAAA,MAAA,CAAO,MAAO,CAAA,GAAG,CAAI,GAAA,IAAA,CAAA;AAChE,EAAA,IAAIA,aAAI,MAAQ,EAAA,SAAS,CAAK,IAAA,CAAC,OAAO,kBAAoB,EAAA;AACxD,IAAA,IAAI,OAAO,IAAS,KAAA,gBAAA,IAAoBA,YAAI,CAAA,MAAA,EAAQ,MAAM,CAAG,EAAA;AAC3D,MAAQ,KAAA,GAAAC,gBAAA,CAAQ,KAAK,CAAK,IAAAC,cAAA,CAAM,KAAK,CAAI,GAAA,CAAC,SAAS,CAAI,GAAA,KAAA,CAAA;AAAA,KAClD,MAAA;AACL,MAAQ,KAAA,GAAAA,cAAA,CAAM,KAAK,CAAA,GAAI,SAAY,GAAA,KAAA,CAAA;AAAA,KACrC;AAAA,GACF;AAEA,EAAO,OAAA,KAAA,CAAA;AACT,EAAA;AAEa,MAAA,cAAA,GAAiB,CAAC,MAA8B,KAAA;AAC3D,EAAA,IAAI,KAAa,GAAA,IAAA,CAAA;AACjB,EAAI,IAAA,KAAA,CAAM,OAAQ,CAAA,MAAM,CAAG,EAAA;AACzB,IAAA,KAAA,GAAQ,MAAO,CAAA,MAAA,CAAO,CAAQ,IAAA,KAAA,IAAA,KAAS,SAAS,CAAA,CAAA;AAAA,GAC3C,MAAA;AACL,IAAQ,KAAA,GAAA,MAAA,KAAW,YAAY,IAAO,GAAA,MAAA,CAAA;AAAA,GACxC;AAEA,EAAO,OAAA,KAAA,CAAA;AACT,EAAA;AAEO,MAAM,cAAiB,GAAA,CAC5B,GAAM,GAAA,IACN,UACG,KAAA;AACH,EAAA,IAAI,UAAU,EAAC,CAAA;AACf,EAAA,IAAI,CAAC,GAAA;AAAK,IAAA,OAAO,EAAC,CAAA;AAClB,EAAU,OAAA,GAAA,GAAA,CAAI,GAAI,CAAA,CAAC,CAAW,KAAA;AAC5B,IAAA,MAAM,MAAW,EAAC,CAAA;AAClB,IAAI,GAAA,CAAA,KAAA,GAAQ,CAAE,CAAA,UAAA,CAAW,KAAK,CAAA,CAAA;AAC9B,IAAI,GAAA,CAAA,KAAA,GAAQ,CAAE,CAAA,UAAA,CAAW,KAAK,CAAA,CAAA;AAC9B,IAAI,IAAA,CAAA,CAAE,WAAW,QAAQ,CAAA,IAAK,EAAE,UAAW,CAAA,QAAQ,EAAE,MAAQ,EAAA;AAC3D,MAAA,GAAA,CAAI,WAAW,cAAe,CAAA,CAAA,CAAE,UAAW,CAAA,QAAQ,GAAG,UAAU,CAAA,CAAA;AAAA,KAClE;AAEA,IAAO,OAAA,GAAA,CAAA;AAAA,GACR,CAAA,CAAA;AACD,EAAO,OAAA,OAAA,CAAA;AACT,EAAA;AAEa,MAAA,gBAAA,GAAmB,CAC9B,IAAA,EACA,KACW,KAAA;AAEX,EAAA,SAAS,WAAW,KAA0C,EAAA;AAC5D,IAAA,MAAM,SAAmB,EAAC,CAAA;AAC1B,IAAA,IAAI,CAAC,KAAA;AAAO,MAAA,OAAO,EAAC,CAAA;AACpB,IAAA,KAAA,MAAW,QAAQ,KAAO,EAAA;AACxB,MAAI,IAAA,IAAA,CAAK,UAAU,KAAO,EAAA;AACxB,QAAO,MAAA,CAAA,IAAA,CAAK,KAAK,KAAK,CAAA,CAAA;AAAA,OACxB;AACA,MAAA,IAAI,IAAK,CAAA,QAAA,IAAY,IAAK,CAAA,QAAA,CAAS,SAAS,CAAG,EAAA;AAC7C,QAAM,MAAA,WAAA,GAAc,UAAW,CAAA,IAAA,CAAK,QAAQ,CAAA,CAAA;AAC5C,QAAA,IAAI,WAAa,EAAA;AACf,UAAO,MAAA,CAAA,IAAA,CAAK,GAAG,WAAW,CAAA,CAAA;AAAA,SAC5B;AAAA,OACF;AAAA,KACF;AACA,IAAA,OAAO,MAAO,CAAA,MAAA,GAAS,CAAI,GAAA,MAAA,GAAS,EAAC,CAAA;AAAA,GACvC;AAEA,EAAA,OAAO,UAAW,CAAA,IAAI,CAAE,CAAA,IAAA,CAAK,GAAG,CAAA,CAAA;AAClC,EAAA;AAEO,MAAM,yBAAyBC,kBAAW,CAAA;AAAA,EAC/C,aAAe,EAAA;AAAA,IACb,IAAA,EAAMC,uBAA+B,KAAK,CAAA;AAAA,IAC1C,OAAA,EAAS,MAAM,EAAC;AAAA,GAClB;AAAA,EACA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAA,EAAS,OAAO,EAAC,CAAA;AAAA,GACnB;AAAA,EACA,WAAa,EAAA;AAAA,IACX,IAAA,EAAMA,uBAA6B,MAAM,CAAA;AAAA,IACzC,OAAS,EAAA,OAAO,EAAE,MAAA,EAAQ,UAAW,EAAA,CAAA;AAAA,GACvC;AAAA,EACA,YAAc,EAAA;AAAA,IACZ,IAAA,EAAMA,uBAA6C,MAAM,CAAA;AAAA,IACzD,SAAS,OAAO;AAAA,MACd,KAAO,EAAA,OAAA;AAAA,KACT,CAAA;AAAA,GACF;AACF,CAAU,EAAA;AAEH,MAAM,+BAA+BD,kBAAW,CAAA;AAAA,EACrD,aAAe,EAAA;AAAA,IACb,IAAA,EAAMC,uBAA+B,KAAK,CAAA;AAAA,IAC1C,OAAA,EAAS,MAAM,EAAC;AAAA,GAClB;AAAA,EACA,KAAO,EAAA;AAAA,IACL,IAAM,EAAA,MAAA;AAAA,IACN,OAAA,EAAS,OAAO,EAAC,CAAA;AAAA,GACnB;AAAA,EACA,WAAa,EAAA;AAAA,IACX,IAAA,EAAMA,uBAA6B,MAAM,CAAA;AAAA,IACzC,OAAS,EAAA,OAAO,EAAE,MAAA,EAAQ,UAAW,EAAA,CAAA;AAAA,GACvC;AAAA,EACA,UAAY,EAAA;AAAA,IACV,IAAM,EAAA,OAAA;AAAA,IACN,OAAS,EAAA,KAAA;AAAA,GACX;AACF,CAAU,EAAA;AAEH,MAAM,sBAAyB,GAAA;AAAA,EACpC,MAAQ,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AAAA,EAC1C,cAAgB,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AACpD,EAAA;AAEO,MAAM,4BAA+B,GAAA;AAAA,EAC1C,OAAO,MAAM,IAAA;AAAA,EACb,SAAS,MAAM,IAAA;AAAA,EACf,WAAa,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AAAA,EAC/C,cAAgB,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AACpD,EAAA;AAEO,MAAM,0BAA6B,GAAA;AAAA,EACxC,MAAQ,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AAAA,EAC1C,cAAgB,EAAA,CAAC,KAA+B,KAAA,CAAC,CAAC,KAAA;AACpD;;;;;;;;;;;;;"}
+{"version":3,"file":"advanced-filtering.js","sources":["../../../../../../packages/components/advanced-filtering/src/advanced-filtering.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\nimport { has, isEmpty, isNil } from 'lodash-es'\n\nimport type { ExtractPropTypes } from 'vue'\nimport type { FormProps as AntFormProps, TooltipProps } from 'ant-design-vue'\nimport type { FormColumn } from '@ll-plus/components'\nimport type advancedFiltering from './advanced-filtering.vue'\nimport type advancedFilteringParams from './components/advanced-filtering-params.vue'\nimport type advancedFilteringTags from './components/advanced-filtering-tags.vue'\n\nexport interface IAvancedFilteringTag {\n  label: string\n  key: string\n  value: string | string[]\n  showValue: string | string[]\n}\n\nexport const ALL_VALUE: string = '_ALL'\n\nexport type FilterColumn = FormColumn<{\n  unUseDefaultOption?: boolean\n  defaultOptionLabel?: string\n}>\n\nexport const initValue = (column: FilterColumn, values: any) => {\n  let value: any = has(values, column.key) ? values[column.key] : null\n  if (has(column, 'options') && !column.unUseDefaultOption) {\n    if (column.type === 'checkbox-group' || has(column, 'mode')) {\n      value = isEmpty(value) || isNil(value) ? [ALL_VALUE] : value\n    } else {\n      value = isNil(value) ? ALL_VALUE : value\n    }\n  }\n\n  return value\n}\n\nexport const filterAllValue = (\n  values: string | string[],\n  column: FilterColumn\n): any => {\n  let value: any = null\n  if (Array.isArray(values)) {\n    value = values.filter(item => item !== ALL_VALUE)\n    if (column && column.type === 'number-range') {\n      value = values ? (values.every(e => !isNil(e)) ? values : null) : null\n    }\n  } else {\n    value = values === ALL_VALUE ? null : values\n  }\n\n  return value\n}\n\nexport const treeDataFormat = (\n  arr = [] as any[],\n  fieldNames: { [key: string]: string }\n) => {\n  let options = [] as any[]\n  if (!arr) return []\n  options = arr.map((e: any) => {\n    const obj: any = {}\n    obj.label = e[fieldNames.label]\n    obj.value = e[fieldNames.value]\n    if (e[fieldNames.children] && e[fieldNames.children].length) {\n      obj.children = treeDataFormat(e[fieldNames.children], fieldNames)\n    }\n\n    return obj\n  })\n  return options\n}\n\nexport const findLabelByValue = (\n  tree: FilterColumn['options'],\n  value: any\n): string => {\n  // 递归函数，用于遍历 Tree 数据\n  function _findLabel(nodes: FilterColumn['options']): string[] {\n    const labels: string[] = []\n    if (!nodes) return []\n    for (const node of nodes) {\n      if (node.value === value) {\n        labels.push(node.label)\n      }\n      if (node.children && node.children.length > 0) {\n        const childLabels = _findLabel(node.children)\n        if (childLabels) {\n          labels.push(...childLabels)\n        }\n      }\n    }\n    return labels.length > 0 ? labels : []\n  }\n  // 开始递归查找\n  return _findLabel(tree).join(',')\n}\n\nexport const advancedFilteringProps = buildProps({\n  filterColumns: {\n    type: definePropType<FilterColumn[]>(Array),\n    default: () => []\n  },\n  value: {\n    type: Object,\n    default: () => ({})\n  },\n  formOptions: {\n    type: definePropType<AntFormProps>(Object),\n    default: () => ({ layout: 'vertical' })\n  },\n  overlayStyle: {\n    type: definePropType<TooltipProps['overlayStyle']>(Object),\n    default: () => ({\n      width: '500px'\n    })\n  }\n} as const)\n\nexport const advancedFilteringParamsProps = buildProps({\n  filterColumns: {\n    type: definePropType<FilterColumn[]>(Array),\n    default: () => []\n  },\n  value: {\n    type: Object,\n    default: () => ({})\n  },\n  formOptions: {\n    type: definePropType<AntFormProps>(Object),\n    default: () => ({ layout: 'vertical' })\n  },\n  showFooter: {\n    type: Boolean,\n    default: false\n  }\n} as const)\n\nexport const advancedFilteringEmits = {\n  change: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\nexport const advancedFilteringParamsEmits = {\n  close: () => true,\n  confirm: () => true,\n  changeValue: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\nexport const advancedFilteringTagsEmits = {\n  change: (value: Record<string, any>) => !!value,\n  'update:value': (value: Record<string, any>) => !!value\n}\n\n// props\nexport type AdvancedFilteringProps = ExtractPropTypes<\n  typeof advancedFilteringProps\n>\n\nexport type AdvancedFilteringParamsProps = ExtractPropTypes<\n  typeof advancedFilteringParamsProps\n>\n\n// emits\nexport type AdvancedFilteringEmits = typeof advancedFilteringEmits\n\nexport type AdvancedFilteringParamsEmits = typeof advancedFilteringParamsEmits\n\nexport type AdvancedFilteringTagsEmits = typeof advancedFilteringTagsEmits\n\n// instance\nexport type AdvancedFilteringInstance = InstanceType<typeof advancedFiltering>\n\nexport type AdvancedFilteringParamsInstance = InstanceType<\n  typeof advancedFilteringParams\n>\n\nexport type AdvancedFilteringTagsInstance = InstanceType<\n  typeof advancedFilteringTags\n>\n"],"names":["has","isEmpty","isNil","buildProps","definePropType"],"mappings":"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"}

package/lib/packages/components/advanced-filtering/src/advanced-filtering.vue2.js

@@ -51,9 +51,8 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watch(
       filterValue,
       (n) => {
-        const value = advancedFiltering.filterAllValue(n);
-        emits("update:value", value);
-        emits("change", value);
+        emits("update:value", n);
+        emits("change", n);
       },
       {
         deep: true

package/lib/packages/components/advanced-filtering/src/advanced-filtering.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering.vue2.js","sources":["../../../../../../packages/components/advanced-filtering/src/advanced-filtering.vue"],"sourcesContent":["<template>\n  <a-popover\n    :overlay-class-name=\"bem.b()\"\n    placement=\"bottomRight\"\n    :overlay-style=\"props.overlayStyle\"\n    :open=\"showSelectBox\"\n  >\n    <template #content>\n      <advanced-filtering-params\n        v-model:value=\"filterValue\"\n        :filter-columns=\"props.filterColumns\"\n        :form-options=\"props.formOptions\"\n        @close=\"handleClose\"\n      />\n    </template>\n    <a-popover\n      :overlay-class-name=\"bem.b()\"\n      trigger=\"hover\"\n      placement=\"bottomRight\"\n      :open=\"showValueBox\"\n      :overlay-style=\"props.overlayStyle\"\n      @open-change=\"handleHoverChange\"\n    >\n      <template #content>\n        <advanced-filtering-tags\n          :value=\"filterValue\"\n          :filter-columns=\"props.filterColumns\"\n          @change=\"handleChange\"\n        />\n      </template>\n      <ll-button @click.stop=\"handleClickChange\">\n        <ll-icon icon-name=\"icon-Screening\" style=\"margin-right: 10px\" />\n        <span>高级筛选</span>\n      </ll-button>\n    </a-popover>\n  </a-popover>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watch } from 'vue'\n\nimport { createNamespace } from '@ll-plus/utils'\n\nimport {\n  advancedFilteringProps,\n  advancedFilteringEmits,\n  filterAllValue\n} from './advanced-filtering'\n\nimport { LlButton, LlIcon } from '@ll-plus/components'\nimport AdvancedFilteringParams from './components/advanced-filtering-params.vue'\nimport AdvancedFilteringTags from './components/advanced-filtering-tags.vue'\n\ndefineOptions({ name: 'LlAdvancedFiltering' })\nconst props = defineProps(advancedFilteringProps)\nconst emits = defineEmits(advancedFilteringEmits)\nconst bem = createNamespace('advanced-filtering')\nconst filterValue = ref<any>(props.value)\nconst showSelectBox = ref<boolean>(false)\nconst showValueBox = ref<boolean>(false)\n\nconst handleHoverChange = (visible: boolean) => {\n  if (showSelectBox.value) return\n  showValueBox.value = visible\n}\n\nconst handleClickChange = () => {\n  showSelectBox.value = !showSelectBox.value\n  showValueBox.value = false\n}\n\nconst handleClose = () => {\n  showSelectBox.value = false\n  showValueBox.value = false\n}\n\nconst handleChange = val => {\n  filterValue.value = val\n}\n\nwatch(\n  filterValue,\n  n => {\n    const value = filterAllValue(n)\n    emits('update:value', value)\n    emits('change', value)\n  },\n  {\n    deep: true\n  }\n)\n</script>\n"],"names":["createNamespace","ref","watch","filterAllValue"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsDA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AACd,IAAM,MAAA,GAAA,GAAMA,gCAAgB,oBAAoB,CAAA,CAAA;AAChD,IAAM,MAAA,WAAA,GAAcC,OAAS,CAAA,KAAA,CAAM,KAAK,CAAA,CAAA;AACxC,IAAM,MAAA,aAAA,GAAgBA,QAAa,KAAK,CAAA,CAAA;AACxC,IAAM,MAAA,YAAA,GAAeA,QAAa,KAAK,CAAA,CAAA;AAEvC,IAAM,MAAA,iBAAA,GAAoB,CAAC,OAAqB,KAAA;AAC9C,MAAA,IAAI,aAAc,CAAA,KAAA;AAAO,QAAA,OAAA;AACzB,MAAA,YAAA,CAAa,KAAQ,GAAA,OAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,oBAAoB,MAAM;AAC9B,MAAc,aAAA,CAAA,KAAA,GAAQ,CAAC,aAAc,CAAA,KAAA,CAAA;AACrC,MAAA,YAAA,CAAa,KAAQ,GAAA,KAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,cAAc,MAAM;AACxB,MAAA,aAAA,CAAc,KAAQ,GAAA,KAAA,CAAA;AACtB,MAAA,YAAA,CAAa,KAAQ,GAAA,KAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,eAAe,CAAO,GAAA,KAAA;AAC1B,MAAA,WAAA,CAAY,KAAQ,GAAA,GAAA,CAAA;AAAA,KACtB,CAAA;AAEA,IAAAC,SAAA;AAAA,MACE,WAAA;AAAA,MACA,CAAK,CAAA,KAAA;AACH,QAAM,MAAA,KAAA,GAAQC,iCAAe,CAAC,CAAA,CAAA;AAC9B,QAAA,KAAA,CAAM,gBAAgB,KAAK,CAAA,CAAA;AAC3B,QAAA,KAAA,CAAM,UAAU,KAAK,CAAA,CAAA;AAAA,OACvB;AAAA,MACA;AAAA,QACE,IAAM,EAAA,IAAA;AAAA,OACR;AAAA,KACF,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"advanced-filtering.vue2.js","sources":["../../../../../../packages/components/advanced-filtering/src/advanced-filtering.vue"],"sourcesContent":["<template>\n  <a-popover\n    :overlay-class-name=\"bem.b()\"\n    placement=\"bottomRight\"\n    :overlay-style=\"props.overlayStyle\"\n    :open=\"showSelectBox\"\n  >\n    <template #content>\n      <advanced-filtering-params\n        v-model:value=\"filterValue\"\n        :filter-columns=\"props.filterColumns\"\n        :form-options=\"props.formOptions\"\n        @close=\"handleClose\"\n      />\n    </template>\n    <a-popover\n      :overlay-class-name=\"bem.b()\"\n      trigger=\"hover\"\n      placement=\"bottomRight\"\n      :open=\"showValueBox\"\n      :overlay-style=\"props.overlayStyle\"\n      @open-change=\"handleHoverChange\"\n    >\n      <template #content>\n        <advanced-filtering-tags\n          :value=\"filterValue\"\n          :filter-columns=\"props.filterColumns\"\n          @change=\"handleChange\"\n        />\n      </template>\n      <ll-button @click.stop=\"handleClickChange\">\n        <ll-icon icon-name=\"icon-Screening\" style=\"margin-right: 10px\" />\n        <span>高级筛选</span>\n      </ll-button>\n    </a-popover>\n  </a-popover>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watch } from 'vue'\n\nimport { createNamespace } from '@ll-plus/utils'\n\nimport {\n  advancedFilteringProps,\n  advancedFilteringEmits\n} from './advanced-filtering'\n\nimport { LlButton, LlIcon } from '@ll-plus/components'\nimport AdvancedFilteringParams from './components/advanced-filtering-params.vue'\nimport AdvancedFilteringTags from './components/advanced-filtering-tags.vue'\n\ndefineOptions({ name: 'LlAdvancedFiltering' })\nconst props = defineProps(advancedFilteringProps)\nconst emits = defineEmits(advancedFilteringEmits)\nconst bem = createNamespace('advanced-filtering')\nconst filterValue = ref<any>(props.value)\nconst showSelectBox = ref<boolean>(false)\nconst showValueBox = ref<boolean>(false)\n\nconst handleHoverChange = (visible: boolean) => {\n  if (showSelectBox.value) return\n  showValueBox.value = visible\n}\n\nconst handleClickChange = () => {\n  showSelectBox.value = !showSelectBox.value\n  showValueBox.value = false\n}\n\nconst handleClose = () => {\n  showSelectBox.value = false\n  showValueBox.value = false\n}\n\nconst handleChange = val => {\n  filterValue.value = val\n}\n\nwatch(\n  filterValue,\n  n => {\n    emits('update:value', n)\n    emits('change', n)\n  },\n  {\n    deep: true\n  }\n)\n</script>\n"],"names":["createNamespace","ref","watch"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AACd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AACd,IAAM,MAAA,GAAA,GAAMA,gCAAgB,oBAAoB,CAAA,CAAA;AAChD,IAAM,MAAA,WAAA,GAAcC,OAAS,CAAA,KAAA,CAAM,KAAK,CAAA,CAAA;AACxC,IAAM,MAAA,aAAA,GAAgBA,QAAa,KAAK,CAAA,CAAA;AACxC,IAAM,MAAA,YAAA,GAAeA,QAAa,KAAK,CAAA,CAAA;AAEvC,IAAM,MAAA,iBAAA,GAAoB,CAAC,OAAqB,KAAA;AAC9C,MAAA,IAAI,aAAc,CAAA,KAAA;AAAO,QAAA,OAAA;AACzB,MAAA,YAAA,CAAa,KAAQ,GAAA,OAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,oBAAoB,MAAM;AAC9B,MAAc,aAAA,CAAA,KAAA,GAAQ,CAAC,aAAc,CAAA,KAAA,CAAA;AACrC,MAAA,YAAA,CAAa,KAAQ,GAAA,KAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,cAAc,MAAM;AACxB,MAAA,aAAA,CAAc,KAAQ,GAAA,KAAA,CAAA;AACtB,MAAA,YAAA,CAAa,KAAQ,GAAA,KAAA,CAAA;AAAA,KACvB,CAAA;AAEA,IAAA,MAAM,eAAe,CAAO,GAAA,KAAA;AAC1B,MAAA,WAAA,CAAY,KAAQ,GAAA,GAAA,CAAA;AAAA,KACtB,CAAA;AAEA,IAAAC,SAAA;AAAA,MACE,WAAA;AAAA,MACA,CAAK,CAAA,KAAA;AACH,QAAA,KAAA,CAAM,gBAAgB,CAAC,CAAA,CAAA;AACvB,QAAA,KAAA,CAAM,UAAU,CAAC,CAAA,CAAA;AAAA,OACnB;AAAA,MACA;AAAA,QACE,IAAM,EAAA,IAAA;AAAA,OACR;AAAA,KACF,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/packages/components/advanced-filtering/src/components/advanced-filtering-params.vue2.js

@@ -61,9 +61,10 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const setData = (val) => {
       const value = lodashEs.cloneDeep(val);
       const obj = {};
-      for (const i in value) {
-        obj[i] = advancedFiltering.filterAllValue(value[i]);
-      }
+      computeFormColumns.value.forEach((item) => {
+        const i = item.key;
+        obj[i] = advancedFiltering.filterAllValue(value[i], item);
+      });
       emits("update:value", obj);
       emits("changeValue", obj);
     };

package/lib/packages/components/advanced-filtering/src/components/advanced-filtering-params.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering-params.vue2.js","sources":["../../../../../../../packages/components/advanced-filtering/src/components/advanced-filtering-params.vue"],"sourcesContent":["<template>\n  <a-card\n    title=\"高级筛选\"\n    :class=\"bem.b()\"\n    onselectstart=\"return false\"\n    :bordered=\"false\"\n  >\n    <template #extra>\n      <ll-icon\n        icon-name=\"icon-close2\"\n        :style=\"{\n          cursor: 'pointer'\n        }\"\n        @click=\"handleClose\"\n      />\n    </template>\n    <div :class=\"bem.m('content')\">\n      <ll-form\n        v-if=\"props.filterColumns.length > 0\"\n        v-bind=\"$attrs\"\n        :form-columns=\"computeFormColumns\"\n        :form-options=\"props.formOptions\"\n        :form-data=\"innerValue\"\n        :row-options=\"\n          $attrs['row-options'] || {\n            gutter: 30\n          }\n        \"\n        @change=\"handleChange\"\n      />\n      <div v-else :class=\"bem.m('empty')\">\n        <p>暂无数据</p>\n      </div>\n    </div>\n    <div v-if=\"props.showFooter\" :class=\"bem.m('footer')\">\n      <ll-button\n        type=\"primary\"\n        style=\"margin-right: 16px\"\n        @click=\"handleAdvancedFilterConfirm\"\n      >\n        确定\n      </ll-button>\n      <ll-button @click=\"handleClose\">取消</ll-button>\n    </div>\n  </a-card>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watch, computed } from 'vue'\nimport { has, cloneDeep } from 'lodash-es'\nimport { createNamespace } from '@ll-plus/utils'\nimport { LlForm } from '@ll-plus/components'\nimport {\n  advancedFilteringParamsProps,\n  advancedFilteringParamsEmits,\n  ALL_VALUE,\n  initValue,\n  filterAllValue\n} from '../advanced-filtering'\n\ndefineOptions({ name: 'LlAdvancedFilteringParams' })\n\nconst props = defineProps(advancedFilteringParamsProps)\n\nconst emits = defineEmits(advancedFilteringParamsEmits)\n\nconst bem = createNamespace('advanced-filtering-params')\n\nconst innerValue = ref({})\n\nconst key = ref(0)\n\nconst computeFormColumns = computed(() => {\n  return props.filterColumns.map(column => {\n    if (has(column, 'options')) {\n      if (\n        (column.options.length && column.options[0].value === ALL_VALUE) ||\n        column.unUseDefaultOption\n      ) {\n        return column\n      }\n      column.options = [\n        {\n          label: column?.defaultOptionLabel ?? '全部',\n          value: ALL_VALUE\n        },\n        ...column.options\n      ]\n    }\n    return column\n  })\n})\n\nconst handleClose = () => {\n  emits('close')\n}\n\nconst handleAdvancedFilterConfirm = () => {\n  emits('confirm')\n}\n\nconst handleChange = (val: Record<string, any>) => {\n  setData(val)\n}\n\nconst setData = (val: Record<string, any>) => {\n  const value = cloneDeep(val)\n  const obj: Record<string, any> = {}\n  for (const i in value) {\n    obj[i] = filterAllValue(value[i])\n  }\n  emits('update:value', obj)\n  emits('changeValue', obj)\n}\n\nwatch(\n  () => props.value,\n  val => {\n    const value = cloneDeep(val)\n    const cloneInnerValue = cloneDeep(innerValue.value)\n    const obj: Record<string, any> = {}\n    computeFormColumns.value.forEach(item => {\n      obj[item.key] = initValue(item, value)\n    })\n    const comparedObj: Record<string, any> = {}\n    computeFormColumns.value.forEach(item => {\n      comparedObj[item.key] = initValue(item, cloneInnerValue)\n    })\n    if (JSON.stringify(obj) !== JSON.stringify(comparedObj)) {\n      innerValue.value = cloneDeep(obj)\n    }\n    if (key.value === 0) {\n      innerValue.value = cloneDeep(obj)\n      key.value++\n    }\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\nwatch(\n  () => innerValue.value,\n  val => {\n    setData(val)\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\n</script>\n"],"names":["createNamespace","ref","computed","has","ALL_VALUE","cloneDeep","filterAllValue","watch","initValue"],"mappings":"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"}
+{"version":3,"file":"advanced-filtering-params.vue2.js","sources":["../../../../../../../packages/components/advanced-filtering/src/components/advanced-filtering-params.vue"],"sourcesContent":["<template>\n  <a-card\n    title=\"高级筛选\"\n    :class=\"bem.b()\"\n    onselectstart=\"return false\"\n    :bordered=\"false\"\n  >\n    <template #extra>\n      <ll-icon\n        icon-name=\"icon-close2\"\n        :style=\"{\n          cursor: 'pointer'\n        }\"\n        @click=\"handleClose\"\n      />\n    </template>\n    <div :class=\"bem.m('content')\">\n      <ll-form\n        v-if=\"props.filterColumns.length > 0\"\n        v-bind=\"$attrs\"\n        :form-columns=\"computeFormColumns\"\n        :form-options=\"props.formOptions\"\n        :form-data=\"innerValue\"\n        :row-options=\"\n          $attrs['row-options'] || {\n            gutter: 30\n          }\n        \"\n        @change=\"handleChange\"\n      />\n      <div v-else :class=\"bem.m('empty')\">\n        <p>暂无数据</p>\n      </div>\n    </div>\n    <div v-if=\"props.showFooter\" :class=\"bem.m('footer')\">\n      <ll-button\n        type=\"primary\"\n        style=\"margin-right: 16px\"\n        @click=\"handleAdvancedFilterConfirm\"\n      >\n        确定\n      </ll-button>\n      <ll-button @click=\"handleClose\">取消</ll-button>\n    </div>\n  </a-card>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watch, computed } from 'vue'\nimport { has, cloneDeep } from 'lodash-es'\nimport { createNamespace } from '@ll-plus/utils'\nimport { LlForm } from '@ll-plus/components'\nimport {\n  advancedFilteringParamsProps,\n  advancedFilteringParamsEmits,\n  ALL_VALUE,\n  initValue,\n  filterAllValue\n} from '../advanced-filtering'\n\ndefineOptions({ name: 'LlAdvancedFilteringParams' })\n\nconst props = defineProps(advancedFilteringParamsProps)\n\nconst emits = defineEmits(advancedFilteringParamsEmits)\n\nconst bem = createNamespace('advanced-filtering-params')\n\nconst innerValue = ref({})\n\nconst key = ref(0)\n\nconst computeFormColumns = computed(() => {\n  return props.filterColumns.map(column => {\n    if (has(column, 'options')) {\n      if (\n        (column.options.length && column.options[0].value === ALL_VALUE) ||\n        column.unUseDefaultOption\n      ) {\n        return column\n      }\n      column.options = [\n        {\n          label: column?.defaultOptionLabel ?? '全部',\n          value: ALL_VALUE\n        },\n        ...column.options\n      ]\n    }\n    return column\n  })\n})\n\nconst handleClose = () => {\n  emits('close')\n}\n\nconst handleAdvancedFilterConfirm = () => {\n  emits('confirm')\n}\n\nconst handleChange = (val: Record<string, any>) => {\n  setData(val)\n}\n\nconst setData = (val: Record<string, any>) => {\n  const value = cloneDeep(val)\n  const obj: Record<string, any> = {}\n  computeFormColumns.value.forEach(item => {\n    const i = item.key\n    obj[i] = filterAllValue(value[i], item)\n  })\n  emits('update:value', obj)\n  emits('changeValue', obj)\n}\n\nwatch(\n  () => props.value,\n  val => {\n    const value = cloneDeep(val)\n    const cloneInnerValue = cloneDeep(innerValue.value)\n    const obj: Record<string, any> = {}\n    computeFormColumns.value.forEach(item => {\n      obj[item.key] = initValue(item, value)\n    })\n    const comparedObj: Record<string, any> = {}\n    computeFormColumns.value.forEach(item => {\n      comparedObj[item.key] = initValue(item, cloneInnerValue)\n    })\n    if (JSON.stringify(obj) !== JSON.stringify(comparedObj)) {\n      innerValue.value = cloneDeep(obj)\n    }\n    if (key.value === 0) {\n      innerValue.value = cloneDeep(obj)\n      key.value++\n    }\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\nwatch(\n  () => innerValue.value,\n  val => {\n    setData(val)\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\n</script>\n"],"names":["createNamespace","ref","computed","has","ALL_VALUE","cloneDeep","filterAllValue","watch","initValue"],"mappings":"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"}

package/lib/packages/components/advanced-filtering/src/components/advanced-filtering-tags.vue2.js

@@ -57,7 +57,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const getTags = (filterColumns, values) => {
       const arr = [];
       filterColumns.map((item) => {
-        const value = advancedFiltering.filterAllValue(values[item.key]);
+        const value = advancedFiltering.filterAllValue(values[item.key], item);
         if (!lodashEs.isNil(value)) {
           let tagValue = "";
           if (item?.options) {

package/lib/packages/components/advanced-filtering/src/components/advanced-filtering-tags.vue2.js.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering-tags.vue2.js","sources":["../../../../../../../packages/components/advanced-filtering/src/components/advanced-filtering-tags.vue"],"sourcesContent":["<template>\n  <div :class=\"bem.b()\">\n    <div :class=\"bem.m('title')\">\n      <p>筛选结果：</p>\n      <a @click=\"handleClean(null)\">清除筛选结果</a>\n    </div>\n    <div v-if=\"tags.length > 0\" :class=\"bem.m('box')\">\n      <div v-for=\"tag in tags\" :key=\"tag.key\" :class=\"bem.m('tag')\">\n        <span :class=\"bem.m('label')\">{{ tag.label }}：</span>\n        <span :class=\"bem.m('value')\">{{ tag.showValue }}</span>\n        <span :class=\"bem.m('close')\" @click=\"handleClean(tag)\">\n          <ll-icon icon-name=\"icon-close2\" :class-name=\"bem.m('icon')\" />\n        </span>\n      </div>\n    </div>\n    <div v-else :class=\"bem.m('empty')\">\n      <span>暂无数据</span>\n    </div>\n  </div>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watchEffect } from 'vue'\nimport dayjs from 'dayjs'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { isNil, has } from 'lodash-es'\nimport {\n  advancedFilteringProps,\n  advancedFilteringTagsEmits,\n  type IAvancedFilteringTag,\n  filterAllValue,\n  treeDataFormat,\n  findLabelByValue\n} from '../advanced-filtering'\nimport type { FormColumn } from '@ll-plus/components'\ndefineOptions({ name: 'LlAdvancedFilteringTags' })\nconst props = defineProps(advancedFilteringProps)\nconst emits = defineEmits(advancedFilteringTagsEmits)\nconst bem = createNamespace('advanced-filtering-tags')\nconst tags = ref([] as IAvancedFilteringTag[])\n\nconst handleClean = (tag: IAvancedFilteringTag | null = null) => {\n  const copyValue = {}\n  if (tag) {\n    tags.value = tags.value.filter(e => e.key !== tag.key)\n  } else {\n    tags.value = []\n  }\n  tags.value.map(e => {\n    copyValue[e.key] = e.value\n  })\n  setData(copyValue)\n}\nconst setData = (obj: Record<string, any>) => {\n  emits('update:value', obj)\n  emits('change', obj)\n}\n\nconst getTags = (filterColumns: FormColumn[], values: Record<string, any>) => {\n  const arr = [] as IAvancedFilteringTag[]\n  filterColumns.map(item => {\n    const value = filterAllValue(values[item.key])\n\n    if (!isNil(value)) {\n      let tagValue = ''\n\n      if (item?.options) {\n        let options = [] as FormColumn['options']\n        if (item.fieldNames) {\n          options = treeDataFormat(options, item.fieldNames)\n        } else {\n          options = item.options\n        }\n        if (Array.isArray(value)) {\n          let tagArr: any = []\n          tagArr = value.map((val: string) => {\n            return findLabelByValue(options, val)\n          })\n\n          tagValue = tagArr.join(',')\n        } else {\n          tagValue = findLabelByValue(options, value)\n        }\n      } else {\n        tagValue = value\n      }\n\n      if (item.type === 'date-picker') {\n        tagValue = dayjs(value).format(item?.format ?? 'YYYY-MM-DD')\n      }\n      if (item.type === 'time-picker') {\n        tagValue = dayjs(value).format(item?.format ?? 'YYYY/MM/DD hh:mm:ss')\n      }\n      if (item.type === 'date-range') {\n        tagValue = `${dayjs(value[0]).format(\n          item?.format ?? 'YYYY-MM-DD'\n        )} - ${dayjs(value[1]).format(item?.format ?? 'YYYY-MM-DD')}`\n      }\n\n      if (item.type === 'number-range') {\n        tagValue = `${value[0]}${value[1] ? ` - ${value[1]}` : ''}`\n      }\n\n      if (item.type === 'time-range') {\n        tagValue = `${dayjs(value[0]).format(\n          item?.format ?? 'YYYY/MM/DD HH:mm:ss'\n        )} - ${dayjs(value[1]).format(item?.format ?? 'YYYY/MM/DD HH:mm:ss')}`\n      }\n\n      if (item.type === 'switch') {\n        if (\n          has(item, 'checkedChildren') &&\n          has(item, 'checkedValue') &&\n          has(item, 'unCheckedChildren') &&\n          has(item, 'unCheckedValue')\n        ) {\n          tagValue =\n            value === item.checkedValue\n              ? item.checkedChildren\n              : item.unCheckedChildren\n        }\n\n        if (has(item, 'checkedChildren') && !has(item, 'checkedValue')) {\n          tagValue = value ? item.checkedChildren : false\n        }\n      }\n      if (tagValue) {\n        arr.push({\n          label: item.label || '',\n          key: item.key,\n          value: value,\n          showValue: tagValue\n        })\n      }\n    }\n  })\n  return arr\n}\n\nwatchEffect(() => {\n  tags.value = getTags(props.filterColumns, props.value)\n})\n</script>\n"],"names":["createNamespace","ref","filterAllValue","isNil","treeDataFormat","findLabelByValue","has","watchEffect"],"mappings":"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"}
+{"version":3,"file":"advanced-filtering-tags.vue2.js","sources":["../../../../../../../packages/components/advanced-filtering/src/components/advanced-filtering-tags.vue"],"sourcesContent":["<template>\n  <div :class=\"bem.b()\">\n    <div :class=\"bem.m('title')\">\n      <p>筛选结果：</p>\n      <a @click=\"handleClean(null)\">清除筛选结果</a>\n    </div>\n    <div v-if=\"tags.length > 0\" :class=\"bem.m('box')\">\n      <div v-for=\"tag in tags\" :key=\"tag.key\" :class=\"bem.m('tag')\">\n        <span :class=\"bem.m('label')\">{{ tag.label }}：</span>\n        <span :class=\"bem.m('value')\">{{ tag.showValue }}</span>\n        <span :class=\"bem.m('close')\" @click=\"handleClean(tag)\">\n          <ll-icon icon-name=\"icon-close2\" :class-name=\"bem.m('icon')\" />\n        </span>\n      </div>\n    </div>\n    <div v-else :class=\"bem.m('empty')\">\n      <span>暂无数据</span>\n    </div>\n  </div>\n</template>\n\n<script setup lang=\"ts\">\nimport { ref, watchEffect } from 'vue'\nimport dayjs from 'dayjs'\n\nimport { createNamespace } from '@ll-plus/utils'\nimport { isNil, has } from 'lodash-es'\nimport {\n  advancedFilteringProps,\n  advancedFilteringTagsEmits,\n  type IAvancedFilteringTag,\n  filterAllValue,\n  treeDataFormat,\n  findLabelByValue\n} from '../advanced-filtering'\nimport type { FormColumn } from '@ll-plus/components'\ndefineOptions({ name: 'LlAdvancedFilteringTags' })\nconst props = defineProps(advancedFilteringProps)\nconst emits = defineEmits(advancedFilteringTagsEmits)\nconst bem = createNamespace('advanced-filtering-tags')\nconst tags = ref([] as IAvancedFilteringTag[])\n\nconst handleClean = (tag: IAvancedFilteringTag | null = null) => {\n  const copyValue = {}\n  if (tag) {\n    tags.value = tags.value.filter(e => e.key !== tag.key)\n  } else {\n    tags.value = []\n  }\n  tags.value.map(e => {\n    copyValue[e.key] = e.value\n  })\n  setData(copyValue)\n}\nconst setData = (obj: Record<string, any>) => {\n  emits('update:value', obj)\n  emits('change', obj)\n}\n\nconst getTags = (filterColumns: FormColumn[], values: Record<string, any>) => {\n  const arr = [] as IAvancedFilteringTag[]\n  filterColumns.map(item => {\n    const value = filterAllValue(values[item.key], item)\n\n    if (!isNil(value)) {\n      let tagValue = ''\n\n      if (item?.options) {\n        let options = [] as FormColumn['options']\n        if (item.fieldNames) {\n          options = treeDataFormat(options, item.fieldNames)\n        } else {\n          options = item.options\n        }\n        if (Array.isArray(value)) {\n          let tagArr: any = []\n          tagArr = value.map((val: string) => {\n            return findLabelByValue(options, val)\n          })\n\n          tagValue = tagArr.join(',')\n        } else {\n          tagValue = findLabelByValue(options, value)\n        }\n      } else {\n        tagValue = value\n      }\n\n      if (item.type === 'date-picker') {\n        tagValue = dayjs(value).format(item?.format ?? 'YYYY-MM-DD')\n      }\n      if (item.type === 'time-picker') {\n        tagValue = dayjs(value).format(item?.format ?? 'YYYY/MM/DD hh:mm:ss')\n      }\n      if (item.type === 'date-range') {\n        tagValue = `${dayjs(value[0]).format(\n          item?.format ?? 'YYYY-MM-DD'\n        )} - ${dayjs(value[1]).format(item?.format ?? 'YYYY-MM-DD')}`\n      }\n\n      if (item.type === 'number-range') {\n        tagValue = `${value[0]}${value[1] ? ` - ${value[1]}` : ''}`\n      }\n\n      if (item.type === 'time-range') {\n        tagValue = `${dayjs(value[0]).format(\n          item?.format ?? 'YYYY/MM/DD HH:mm:ss'\n        )} - ${dayjs(value[1]).format(item?.format ?? 'YYYY/MM/DD HH:mm:ss')}`\n      }\n\n      if (item.type === 'switch') {\n        if (\n          has(item, 'checkedChildren') &&\n          has(item, 'checkedValue') &&\n          has(item, 'unCheckedChildren') &&\n          has(item, 'unCheckedValue')\n        ) {\n          tagValue =\n            value === item.checkedValue\n              ? item.checkedChildren\n              : item.unCheckedChildren\n        }\n\n        if (has(item, 'checkedChildren') && !has(item, 'checkedValue')) {\n          tagValue = value ? item.checkedChildren : false\n        }\n      }\n      if (tagValue) {\n        arr.push({\n          label: item.label || '',\n          key: item.key,\n          value: value,\n          showValue: tagValue\n        })\n      }\n    }\n  })\n  return arr\n}\n\nwatchEffect(() => {\n  tags.value = getTags(props.filterColumns, props.value)\n})\n</script>\n"],"names":["createNamespace","ref","filterAllValue","isNil","treeDataFormat","findLabelByValue","has","watchEffect"],"mappings":"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"}