ll-plus 2.4.9 → 2.4.10

package/es/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/es/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/es/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/es/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/es/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/es/index.mjs

@@ -1,6 +1,6 @@
 import installer from './defaults.mjs';
 import './packages/components/index.mjs';
-export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, initValue, treeDataFormat } from './packages/components/advanced-filtering/src/advanced-filtering.mjs';
+export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, hasValue, initValue, treeDataFormat } from './packages/components/advanced-filtering/src/advanced-filtering.mjs';
 export { LlAdvancedFiltering, LlAdvancedFilteringParams, LlAdvancedFilteringTags } from './packages/components/advanced-filtering/index.mjs';
 export { DEFAULT_METHOD, apiComponentEmits, apiComponentProps, bodyList, requestList } from './packages/components/api-component/src/config/api-component.mjs';
 export { apiModalEmits, apiModalProps } from './packages/components/api-component/src/config/api-modal.mjs';

package/es/packages/components/advanced-filtering/index.mjs

@@ -2,7 +2,7 @@ import '../../utils/index.mjs';
 import AdvancedFiltering from './src/advanced-filtering.vue.mjs';
 import AdvancedFilteringParams from './src/components/advanced-filtering-params.vue.mjs';
 import AdvancedFilteringTags from './src/components/advanced-filtering-tags.vue.mjs';
-export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, initValue, treeDataFormat } from './src/advanced-filtering.mjs';
+export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, hasValue, initValue, treeDataFormat } from './src/advanced-filtering.mjs';
 import { withInstall } from '../../utils/with-install.mjs';
 
 "use strict";

package/es/packages/components/advanced-filtering/src/advanced-filtering.mjs

@@ -1,26 +1,32 @@
 import '../../../utils/index.mjs';
-import { has, isEmpty, isNil } from 'lodash-es';
+import { has, isNull, isUndefined, isEqual } from 'lodash-es';
 import { buildProps, definePropType } from '../../../utils/props/runtime.mjs';
 
 "use strict";
 const ALL_VALUE = "_ALL";
-const initValue = (column, values) => {
-  let value = has(values, column.key) ? values[column.key] : null;
-  if (has(column, "options") && !column.unUseDefaultOption) {
-    if (column.type === "checkbox-group" || has(column, "mode")) {
-      value = isEmpty(value) || isNil(value) ? [ALL_VALUE] : value;
-    } else {
-      value = isNil(value) ? ALL_VALUE : value;
-    }
+const initValue = (columns, values) => {
+  const copyValues = {};
+  if (columns.length) {
+    columns.forEach((column) => {
+      let value = has(values, column.key) ? values[column.key] : null;
+      if (has(column, "options") && !column.unUseDefaultOption) {
+        if (column.type === "checkbox-group" || has(column, "mode")) {
+          value = isNull(value) || isUndefined(value) || Array.isArray(value) && value.length === 0 ? [ALL_VALUE] : value;
+        } else {
+          value = isNull(value) || isUndefined(value) ? ALL_VALUE : value;
+        }
+      }
+      copyValues[column.key] = value;
+    });
   }
-  return value;
+  return copyValues;
 };
 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) => !isNil(e)) ? values : null : null;
+      value = values ? values.every((e) => !isNull(e)) ? values : null : null;
     }
   } else {
     value = values === ALL_VALUE ? null : values;
@@ -48,7 +54,7 @@ const findLabelByValue = (tree, value) => {
     if (!nodes)
       return [];
     for (const node of nodes) {
-      if (node.value === value) {
+      if (isEqual(node.value, value)) {
         labels.push(node.label);
       }
       if (node.children && node.children.length > 0) {
@@ -62,6 +68,9 @@ const findLabelByValue = (tree, value) => {
   }
   return _findLabel(tree).join(",");
 };
+const hasValue = (value) => {
+  return Array.isArray(value) ? value.length > 0 : !isNull(value) && !isUndefined(value);
+};
 const advancedFilteringProps = buildProps({
   filterColumns: {
     type: definePropType(Array),
@@ -115,5 +124,5 @@ const advancedFilteringTagsEmits = {
   "update:value": (value) => !!value
 };
 
-export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, initValue, treeDataFormat };
+export { ALL_VALUE, advancedFilteringEmits, advancedFilteringParamsEmits, advancedFilteringParamsProps, advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, findLabelByValue, hasValue, initValue, treeDataFormat };
 //# sourceMappingURL=advanced-filtering.mjs.map

package/es/packages/components/advanced-filtering/src/advanced-filtering.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering.mjs","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":[],"mappings":"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"}
+{"version":3,"file":"advanced-filtering.mjs","sources":["../../../../../../packages/components/advanced-filtering/src/advanced-filtering.ts"],"sourcesContent":["import { buildProps, definePropType } from '@ll-plus/utils'\nimport { has, isNull, isUndefined, isEqual } 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 = (columns: FilterColumn[], values: any) => {\n  const copyValues = {}\n  if (columns.length) {\n    columns.forEach(column => {\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 =\n            isNull(value) ||\n            isUndefined(value) ||\n            (Array.isArray(value) && value.length === 0)\n              ? [ALL_VALUE]\n              : value\n        } else {\n          value = isNull(value) || isUndefined(value) ? ALL_VALUE : value\n        }\n      }\n      copyValues[column.key] = value\n    })\n  }\n\n  return copyValues\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 => !isNull(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\n// const isEqual = (val1,val2)=>{\n\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 (isEqual(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 hasValue = (value: any) => {\n  return Array.isArray(value)\n    ? value.length > 0\n    : !isNull(value) && !isUndefined(value)\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":[],"mappings":"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"}

package/es/packages/components/advanced-filtering/src/components/advanced-filtering-params.vue2.mjs

@@ -69,14 +69,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       (val) => {
         const value = cloneDeep(val);
         const cloneInnerValue = cloneDeep(innerValue.value);
-        const obj = {};
-        computeFormColumns.value.forEach((item) => {
-          obj[item.key] = initValue(item, value);
-        });
-        const comparedObj = {};
-        computeFormColumns.value.forEach((item) => {
-          comparedObj[item.key] = initValue(item, cloneInnerValue);
-        });
+        const obj = initValue(computeFormColumns.value, value);
+        const comparedObj = initValue(
+          computeFormColumns.value,
+          cloneInnerValue
+        );
         if (JSON.stringify(obj) !== JSON.stringify(comparedObj)) {
           innerValue.value = cloneDeep(obj);
         }
@@ -97,7 +94,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return openBlock(), createBlock(_component_a_card, {
         title: "\u9AD8\u7EA7\u7B5B\u9009",
         class: normalizeClass(unref(bem).b()),
-        onselectstart: "return false",
         bordered: false
       }, {
         extra: withCtx(() => [

package/es/packages/components/advanced-filtering/src/components/advanced-filtering-params.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"advanced-filtering-params.vue2.mjs","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\nimport type { FormChangeEvent } from '@ll-plus/components'\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 = (params: FormChangeEvent) => {\n  setData(params)\n}\n\nconst setData = (params: FormChangeEvent) => {\n  const value = cloneDeep(params.formData)\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', { ...params, formData: 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)\n// watch(\n//   () => innerValue.value,\n//   val => {\n//     setData(val)\n//   },\n//   {\n//     deep: true,\n//     immediate: true\n//   }\n// )\n</script>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"advanced-filtering-params.vue2.mjs","sources":["../../../../../../../packages/components/advanced-filtering/src/components/advanced-filtering-params.vue"],"sourcesContent":["<template>\n  <a-card title=\"高级筛选\" :class=\"bem.b()\" :bordered=\"false\">\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\nimport type { FormChangeEvent } from '@ll-plus/components'\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 = (params: FormChangeEvent) => {\n  setData(params)\n}\n\nconst setData = (params: FormChangeEvent) => {\n  const value = cloneDeep(params.formData)\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', { ...params, formData: 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> = initValue(computeFormColumns.value, value)\n\n    const comparedObj: Record<string, any> = initValue(\n      computeFormColumns.value,\n      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)\n// watch(\n//   () => innerValue.value,\n//   val => {\n//     setData(val)\n//   },\n//   {\n//     deep: true,\n//     immediate: true\n//   }\n// )\n</script>\n"],"names":[],"mappings":"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"}

package/es/packages/components/advanced-filtering/src/components/advanced-filtering-tags.vue2.mjs

@@ -1,8 +1,8 @@
 import { createElementVNode, defineComponent, ref, watchEffect, resolveComponent, openBlock, createElementBlock, normalizeClass, unref, Fragment, renderList, toDisplayString, createVNode } from 'vue';
 import dayjs from 'dayjs';
 import '../../../../utils/index.mjs';
-import { isNil, has } from 'lodash-es';
-import { advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, treeDataFormat, findLabelByValue } from '../advanced-filtering.mjs';
+import { has } from 'lodash-es';
+import { advancedFilteringProps, advancedFilteringTagsEmits, filterAllValue, hasValue, treeDataFormat, findLabelByValue } from '../advanced-filtering.mjs';
 import { createNamespace } from '../../../../utils/create-namespace.mjs';
 
 "use strict";
@@ -54,7 +54,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const arr = [];
       filterColumns.map((item) => {
         const value = filterAllValue(values[item.key], item);
-        if (!isNil(value)) {
+        if (hasValue(value)) {
           let tagValue = "";
           if (item?.options) {
             let options = [];
@@ -71,6 +71,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
               tagValue = tagArr.join(",");
             } else {
               tagValue = findLabelByValue(options, value);
+              console.log({ value, tagValue });
             }
           } else {
             tagValue = value;