ll-plus 2.3.19 → 2.4.1

package/lib/components/advanced-filtering/src/advanced-filtering.vue.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -901,7 +901,7 @@ declare const _default: import("vue").DefineComponent<{
     }, boolean>;
 }, {
     props: import("@vue/shared").LooseRequired<{
-        readonly filterColumns: any[];
+        readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
         readonly value: Record<string, any>;
         readonly formOptions: Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -1587,7 +1587,7 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>>, {}, {}>>;
     AdvancedFilteringParams: import("vue").DefineComponent<{
-        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
         readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
         readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -2487,7 +2487,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly showFooter: import("ll-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     }, {
         props: import("@vue/shared").LooseRequired<{
-            readonly filterColumns: any[];
+            readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
             readonly value: Record<string, any>;
             readonly formOptions: Partial<import("vue").ExtractPropTypes<{
                 layout: import("vue-types").VueTypeDef<string>;
@@ -2714,11 +2714,12 @@ declare const _default: import("vue").DefineComponent<{
                 };
             }>>;
             readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+            readonly "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
             readonly onClose?: (() => any) | undefined;
             readonly onConfirm?: (() => any) | undefined;
             readonly onChangeValue?: ((value: Record<string, any>) => any) | undefined;
         } & {}>;
-        emits: ((event: "close") => void) & ((event: "confirm") => void) & ((event: "changeValue", value: Record<string, any>) => void);
+        emits: ((event: "update:value", value: Record<string, any>) => void) & ((event: "close") => void) & ((event: "confirm") => void) & ((event: "changeValue", value: Record<string, any>) => void);
         bem: {
             b: (blockSuffix?: string) => string;
             e: (element?: string) => string;
@@ -2729,10 +2730,13 @@ declare const _default: import("vue").DefineComponent<{
             bem: (blockSuffix: string, element: string, modifier: string) => string;
             is: (name?: string) => string;
         };
+        innerValue: import("vue").Ref<{}>;
         key: import("vue").Ref<number>;
+        computeFormColumns: import("vue").ComputedRef<import("ll-plus/es/components").FilterColumn[]>;
         handleClose: () => void;
         handleAdvancedFilterConfirm: () => void;
         handleChange: (val: Record<string, any>) => void;
+        setData: (val: Record<string, any>) => void;
         readonly LlForm: import("ll-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
             readonly formColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
             readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
@@ -4112,6 +4116,8 @@ declare const _default: import("vue").DefineComponent<{
             formRef: import("vue").Ref<any>;
             validate: () => Promise<any>;
             resetFields: () => Promise<any>;
+            clearValidate: (nameList?: import("ant-design-vue/es/form/interface").NamePath[] | undefined) => Promise<any>;
+            scrollToField: (name: import("ant-design-vue/es/form/interface").NamePath, options?: ScrollOptions | undefined) => Promise<any>;
             getBindValue: (item: any) => import("lodash").Omit<any, "label">;
             getFormItemClass: (item?: any) => string;
             readonly isEmpty: {
@@ -5528,8 +5534,9 @@ declare const _default: import("vue").DefineComponent<{
         close: () => boolean;
         confirm: () => boolean;
         changeValue: (value: Record<string, any>) => boolean;
+        'update:value': (value: Record<string, any>) => boolean;
     }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
         readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
         readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -6428,11 +6435,12 @@ declare const _default: import("vue").DefineComponent<{
         }, boolean>;
         readonly showFooter: import("ll-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     }>> & {
+        "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
         onClose?: (() => any) | undefined;
         onConfirm?: (() => any) | undefined;
         onChangeValue?: ((value: Record<string, any>) => any) | undefined;
     }, {
-        readonly filterColumns: any[];
+        readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
         readonly value: Record<string, any>;
         readonly formOptions: Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -6661,7 +6669,7 @@ declare const _default: import("vue").DefineComponent<{
         readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     }, {}>;
     AdvancedFilteringTags: import("vue").DefineComponent<{
-        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
         readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
         readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -7563,7 +7571,7 @@ declare const _default: import("vue").DefineComponent<{
         }, boolean>;
     }, {
         props: import("@vue/shared").LooseRequired<{
-            readonly filterColumns: any[];
+            readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
             readonly value: Record<string, any>;
             readonly formOptions: Partial<import("vue").ExtractPropTypes<{
                 layout: import("vue-types").VueTypeDef<string>;
@@ -7812,16 +7820,12 @@ declare const _default: import("vue").DefineComponent<{
         }[]>;
         handleClean: (tag?: import("ll-plus/es/components").IAvancedFilteringTag | null) => void;
         setData: (obj: Record<string, any>) => void;
-        treeDataFormat: (arr: any[] | undefined, fieldNames: {
-            [key: string]: string;
-        }) => any[];
-        findLabelByValue: (tree: any, value: any) => string;
-        getTags: (filterColumns: any[], value: Record<string, any>) => import("ll-plus/es/components").IAvancedFilteringTag[];
+        getTags: (filterColumns: any[], values: Record<string, any>) => import("ll-plus/es/components").IAvancedFilteringTag[];
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
         change: (value: Record<string, any>) => boolean;
         'update:value': (value: Record<string, any>) => boolean;
     }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+        readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
         readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
         readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -8725,7 +8729,7 @@ declare const _default: import("vue").DefineComponent<{
         onChange?: ((value: Record<string, any>) => any) | undefined;
         "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
     }, {
-        readonly filterColumns: any[];
+        readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
         readonly value: Record<string, any>;
         readonly formOptions: Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -8957,7 +8961,7 @@ declare const _default: import("vue").DefineComponent<{
     change: (value: Record<string, any>) => boolean;
     'update:value': (value: Record<string, any>) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -9861,7 +9865,7 @@ declare const _default: import("vue").DefineComponent<{
     onChange?: ((value: Record<string, any>) => any) | undefined;
     "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
 }, {
-    readonly filterColumns: any[];
+    readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
     readonly value: Record<string, any>;
     readonly formOptions: Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;

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

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

package/lib/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} 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}\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;AACA,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/lib/components/advanced-filtering/src/components/advanced-filtering-params.vue.d.ts

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -899,7 +899,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly showFooter: import("ll-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
 }, {
     props: import("@vue/shared").LooseRequired<{
-        readonly filterColumns: any[];
+        readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
         readonly value: Record<string, any>;
         readonly formOptions: Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -1126,11 +1126,12 @@ declare const _default: import("vue").DefineComponent<{
             };
         }>>;
         readonly showFooter: import("ll-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+        readonly "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
         readonly onClose?: (() => any) | undefined;
         readonly onConfirm?: (() => any) | undefined;
         readonly onChangeValue?: ((value: Record<string, any>) => any) | undefined;
     } & {}>;
-    emits: ((event: "close") => void) & ((event: "confirm") => void) & ((event: "changeValue", value: Record<string, any>) => void);
+    emits: ((event: "update:value", value: Record<string, any>) => void) & ((event: "close") => void) & ((event: "confirm") => void) & ((event: "changeValue", value: Record<string, any>) => void);
     bem: {
         b: (blockSuffix?: string) => string;
         e: (element?: string) => string;
@@ -1141,10 +1142,13 @@ declare const _default: import("vue").DefineComponent<{
         bem: (blockSuffix: string, element: string, modifier: string) => string;
         is: (name?: string) => string;
     };
+    innerValue: import("vue").Ref<{}>;
     key: import("vue").Ref<number>;
+    computeFormColumns: import("vue").ComputedRef<import("ll-plus/es/components").FilterColumn[]>;
     handleClose: () => void;
     handleAdvancedFilterConfirm: () => void;
     handleChange: (val: Record<string, any>) => void;
+    setData: (val: Record<string, any>) => void;
     readonly LlForm: import("ll-plus/es/utils").SFCWithInstall<import("vue").DefineComponent<{
         readonly formColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
         readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
@@ -2524,6 +2528,8 @@ declare const _default: import("vue").DefineComponent<{
         formRef: import("vue").Ref<any>;
         validate: () => Promise<any>;
         resetFields: () => Promise<any>;
+        clearValidate: (nameList?: import("ant-design-vue/es/form/interface").NamePath[] | undefined) => Promise<any>;
+        scrollToField: (name: import("ant-design-vue/es/form/interface").NamePath, options?: ScrollOptions | undefined) => Promise<any>;
         getBindValue: (item: any) => import("lodash").Omit<any, "label">;
         getFormItemClass: (item?: any) => string;
         readonly isEmpty: {
@@ -3940,8 +3946,9 @@ declare const _default: import("vue").DefineComponent<{
     close: () => boolean;
     confirm: () => boolean;
     changeValue: (value: Record<string, any>) => boolean;
+    'update:value': (value: Record<string, any>) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -4840,11 +4847,12 @@ declare const _default: import("vue").DefineComponent<{
     }, boolean>;
     readonly showFooter: import("ll-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
 }>> & {
+    "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
     onClose?: (() => any) | undefined;
     onConfirm?: (() => any) | undefined;
     onChangeValue?: ((value: Record<string, any>) => any) | undefined;
 }, {
-    readonly filterColumns: any[];
+    readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
     readonly value: Record<string, any>;
     readonly formOptions: Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;

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

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
+var lodashEs = require('lodash-es');
 require('../../../../utils/index.js');
 require('../../../index.js');
 var advancedFiltering = require('../advanced-filtering.js');
@@ -29,7 +30,25 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const props = __props;
     const emits = __emit;
     const bem = createNamespace.createNamespace("advanced-filtering-params");
+    const innerValue = vue.ref({});
     const key = vue.ref(0);
+    const computeFormColumns = vue.computed(() => {
+      return props.filterColumns.map((column) => {
+        if (lodashEs.has(column, "options")) {
+          if (column.options.length && column.options[0].value === advancedFiltering.ALL_VALUE || column.unUseDefaultOption) {
+            return column;
+          }
+          column.options = [
+            {
+              label: column?.defaultOptionLabel ?? "\u5168\u90E8",
+              value: advancedFiltering.ALL_VALUE
+            },
+            ...column.options
+          ];
+        }
+        return column;
+      });
+    });
     const handleClose = () => {
       emits("close");
     };
@@ -37,12 +56,51 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emits("confirm");
     };
     const handleChange = (val) => {
-      emits("changeValue", val);
+      setData(val);
+    };
+    const setData = (val) => {
+      const value = lodashEs.cloneDeep(val);
+      const obj = {};
+      for (const i in value) {
+        obj[i] = advancedFiltering.filterAllValue(value[i]);
+      }
+      emits("update:value", obj);
+      emits("changeValue", obj);
     };
     vue.watch(
       () => props.value,
-      () => {
-        key.value++;
+      (val) => {
+        const value = lodashEs.cloneDeep(val);
+        const cloneInnerValue = lodashEs.cloneDeep(innerValue.value);
+        const obj = {};
+        computeFormColumns.value.forEach((item) => {
+          obj[item.key] = advancedFiltering.initValue(item, value);
+        });
+        const comparedObj = {};
+        computeFormColumns.value.forEach((item) => {
+          comparedObj[item.key] = advancedFiltering.initValue(item, cloneInnerValue);
+        });
+        if (JSON.stringify(obj) !== JSON.stringify(comparedObj)) {
+          innerValue.value = lodashEs.cloneDeep(obj);
+        }
+        if (key.value === 0) {
+          innerValue.value = lodashEs.cloneDeep(obj);
+          key.value++;
+        }
+      },
+      {
+        deep: true,
+        immediate: true
+      }
+    );
+    vue.watch(
+      () => innerValue.value,
+      (val) => {
+        setData(val);
+      },
+      {
+        deep: true,
+        immediate: true
       }
     );
     return (_ctx, _cache) => {
@@ -71,13 +129,12 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               class: vue.normalizeClass(vue.unref(bem).m("content"))
             },
             [
-              props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index.LlForm), {
-                key: key.value,
-                "form-columns": props.filterColumns,
+              props.filterColumns.length > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(index.LlForm), vue.mergeProps({ key: 0 }, _ctx.$attrs, {
+                "form-columns": computeFormColumns.value,
                 "form-options": props.formOptions,
-                "form-data": props.value,
+                "form-data": innerValue.value,
                 onChange: handleChange
-              }, null, 8, ["form-columns", "form-options", "form-data"])) : (vue.openBlock(), vue.createElementBlock(
+              }), null, 16, ["form-columns", "form-options", "form-data"])) : (vue.openBlock(), vue.createElementBlock(
                 "div",
                 {
                   key: 1,

package/lib/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        :key=\"key\"\n        :form-columns=\"props.filterColumns\"\n        :form-options=\"props.formOptions\"\n        :form-data=\"props.value\"\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: 8px\"\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 } from 'vue'\nimport { createNamespace } from '@ll-plus/utils'\nimport { LlForm } from '@ll-plus/components'\nimport {\n  advancedFilteringParamsProps,\n  advancedFilteringParamsEmits\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 key = ref(0)\n\nconst handleClose = () => {\n  emits('close')\n}\nconst handleAdvancedFilterConfirm = () => {\n  emits('confirm')\n}\n\nconst handleChange = (val: Record<string, any>) => {\n  emits('changeValue', val)\n}\n\nwatch(\n  () => props.value,\n  () => {\n    key.value++\n  }\n)\n</script>\n"],"names":["createNamespace","ref","watch"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqDA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAEd,IAAA,MAAM,KAAQ,GAAA,MAAA,CAAA;AAEd,IAAM,MAAA,GAAA,GAAMA,gCAAgB,2BAA2B,CAAA,CAAA;AAEvD,IAAM,MAAA,GAAA,GAAMC,QAAI,CAAC,CAAA,CAAA;AAEjB,IAAA,MAAM,cAAc,MAAM;AACxB,MAAA,KAAA,CAAM,OAAO,CAAA,CAAA;AAAA,KACf,CAAA;AACA,IAAA,MAAM,8BAA8B,MAAM;AACxC,MAAA,KAAA,CAAM,SAAS,CAAA,CAAA;AAAA,KACjB,CAAA;AAEA,IAAM,MAAA,YAAA,GAAe,CAAC,GAA6B,KAAA;AACjD,MAAA,KAAA,CAAM,eAAe,GAAG,CAAA,CAAA;AAAA,KAC1B,CAAA;AAEA,IAAAC,SAAA;AAAA,MACE,MAAM,KAAM,CAAA,KAAA;AAAA,MACZ,MAAM;AACJ,QAAI,GAAA,CAAA,KAAA,EAAA,CAAA;AAAA,OACN;AAAA,KACF,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"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        @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: 8px\"\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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"}

package/lib/components/advanced-filtering/src/components/advanced-filtering-tags.vue.d.ts

@@ -1,7 +1,7 @@
 import { type IAvancedFilteringTag } from '../advanced-filtering';
 import type { FormColumn } from 'll-plus/es/components';
 declare const _default: import("vue").DefineComponent<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -903,7 +903,7 @@ declare const _default: import("vue").DefineComponent<{
     }, boolean>;
 }, {
     props: import("@vue/shared").LooseRequired<{
-        readonly filterColumns: any[];
+        readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
         readonly value: Record<string, any>;
         readonly formOptions: Partial<import("vue").ExtractPropTypes<{
             layout: import("vue-types").VueTypeDef<string>;
@@ -1152,16 +1152,12 @@ declare const _default: import("vue").DefineComponent<{
     }[]>;
     handleClean: (tag?: IAvancedFilteringTag | null) => void;
     setData: (obj: Record<string, any>) => void;
-    treeDataFormat: (arr: any[] | undefined, fieldNames: {
-        [key: string]: string;
-    }) => any[];
-    findLabelByValue: (tree: FormColumn['options'], value: any) => string;
-    getTags: (filterColumns: FormColumn[], value: Record<string, any>) => IAvancedFilteringTag[];
+    getTags: (filterColumns: FormColumn[], values: Record<string, any>) => IAvancedFilteringTag[];
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (value: Record<string, any>) => boolean;
     'update:value': (value: Record<string, any>) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => any[]) | (() => any[]) | ((new (...args: any[]) => any[]) | (() => any[]))[], unknown, unknown, () => never[], boolean>;
+    readonly filterColumns: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]) | ((new (...args: any[]) => import("ll-plus/es/components").FilterColumn[]) | (() => import("ll-plus/es/components").FilterColumn[]))[], unknown, unknown, () => never[], boolean>;
     readonly value: import("ll-plus/es/utils").EpPropFinalized<ObjectConstructor, unknown, unknown, () => {}, boolean>;
     readonly formOptions: import("ll-plus/es/utils").EpPropFinalized<(new (...args: any[]) => Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;
@@ -2065,7 +2061,7 @@ declare const _default: import("vue").DefineComponent<{
     onChange?: ((value: Record<string, any>) => any) | undefined;
     "onUpdate:value"?: ((value: Record<string, any>) => any) | undefined;
 }, {
-    readonly filterColumns: any[];
+    readonly filterColumns: import("ll-plus/es/components").FilterColumn[];
     readonly value: Record<string, any>;
     readonly formOptions: Partial<import("vue").ExtractPropTypes<{
         layout: import("vue-types").VueTypeDef<string>;

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

@@ -54,94 +54,66 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
       emits("update:value", obj);
       emits("change", obj);
     };
-    const treeDataFormat = (arr = [], fieldNames) => {
-      let options = [];
-      if (!arr)
-        return [];
-      options = arr.map((e) => {
-        const obj = {};
-        obj.label = e[fieldNames.label];
-        obj.value = e[fieldNames.value];
-        if (e[fieldNames.children] && e[fieldNames.children].length) {
-          obj.children = treeDataFormat(e[fieldNames.children], fieldNames);
-        }
-        return obj;
-      });
-      return options;
-    };
-    const findLabelByValue = (tree, value) => {
-      function _findLabel(nodes) {
-        const labels = [];
-        if (!nodes)
-          return [];
-        for (const node of nodes) {
-          if (node.value === value) {
-            labels.push(node.label);
-          }
-          if (node.children && node.children.length > 0) {
-            const childLabels = _findLabel(node.children);
-            if (childLabels) {
-              labels.push(...childLabels);
-            }
-          }
-        }
-        return labels.length > 0 ? labels : [];
-      }
-      return _findLabel(tree).join(",");
-    };
-    const getTags = (filterColumns, value) => {
+    const getTags = (filterColumns, values) => {
       const arr = [];
       filterColumns.map((item) => {
-        if (!lodashEs.isNil(value[item.key])) {
+        const value = advancedFiltering.filterAllValue(values[item.key]);
+        if (!lodashEs.isNil(value)) {
           let tagValue = "";
           if (item?.options) {
             let options = [];
             if (item.fieldNames) {
-              options = treeDataFormat(options, item.fieldNames);
+              options = advancedFiltering.treeDataFormat(options, item.fieldNames);
             } else {
               options = item.options;
             }
-            if (Array.isArray(value[item.key])) {
+            if (Array.isArray(value)) {
               let tagArr = [];
-              tagArr = value[item.key].map((val) => {
-                return findLabelByValue(options, val);
+              tagArr = value.map((val) => {
+                return advancedFiltering.findLabelByValue(options, val);
               });
               tagValue = tagArr.join(",");
             } else {
-              tagValue = findLabelByValue(options, value[item.key]);
+              tagValue = advancedFiltering.findLabelByValue(options, value);
             }
           } else {
-            tagValue = value[item.key];
+            tagValue = value;
           }
           if (item.type === "date-picker") {
-            tagValue = dayjs(value[item.key]).format(item?.format ?? "YYYY-MM-DD");
+            tagValue = dayjs(value).format(item?.format ?? "YYYY-MM-DD");
           }
           if (item.type === "time-picker") {
-            tagValue = dayjs(value[item.key]).format(
-              item?.format ?? "YYYY/MM/DD hh:mm:ss"
-            );
+            tagValue = dayjs(value).format(item?.format ?? "YYYY/MM/DD hh:mm:ss");
           }
           if (item.type === "date-range") {
-            tagValue = `${dayjs(value[item.key][0]).format(
+            tagValue = `${dayjs(value[0]).format(
               item?.format ?? "YYYY-MM-DD"
-            )}-${dayjs(value[item.key][1]).format(item?.format ?? "YYYY-MM-DD")}`;
+            )}-${dayjs(value[1]).format(item?.format ?? "YYYY-MM-DD")}`;
           }
           if (item.type === "number-range") {
-            tagValue = `${value[item.key][0]}${value[item.key][1] ? `-${value[item.key][1]}` : ""}`;
+            tagValue = `${value[0]}${value[1] ? `-${value[1]}` : ""}`;
           }
-          if (item.type === "time-picker") {
-            tagValue = `${dayjs(value[item.key][0]).format(
+          if (item.type === "time-range") {
+            tagValue = `${dayjs(value[0]).format(
               item?.format ?? "YYYY/MM/DD HH:mm:ss"
-            )}-${dayjs(value[item.key][1]).format(
-              item?.format ?? "YYYY/MM/DD HH:mm:ss"
-            )}`;
+            )}-${dayjs(value[1]).format(item?.format ?? "YYYY/MM/DD HH:mm:ss")}`;
+          }
+          if (item.type === "switch") {
+            if (lodashEs.has(item, "checkedChildren") && lodashEs.has(item, "checkedValue") && lodashEs.has(item, "unCheckedChildren") && lodashEs.has(item, "unCheckedValue")) {
+              tagValue = value === item.checkedValue ? item.checkedChildren : item.unCheckedChildren;
+            }
+            if (lodashEs.has(item, "checkedChildren") && !lodashEs.has(item, "checkedValue")) {
+              tagValue = value ? item.checkedChildren : false;
+            }
+          }
+          if (tagValue) {
+            arr.push({
+              label: item.label || "",
+              key: item.key,
+              value,
+              showValue: tagValue
+            });
           }
-          arr.push({
-            label: item.label || "",
-            key: item.key,
-            value: value[item.key],
-            showValue: tagValue
-          });
         }
       });
       return arr;