@aplus-frontend/ui 6.29.3 → 6.30.1

package/es/src/ap-table/utils.d.ts

@@ -60,7 +60,7 @@ export declare function getFieldProps<RecordType = any>(fieldProps: ApColumnType
  * @param item
  * @returns
  */
-export declare function getTableRenderType(item: ApColumnType | EditableColumnType): "number" | "select" | "date" | "checkbox" | "radio" | "text" | "switch" | "index" | "status" | "password" | "action" | "dateRange" | "textArea" | "treeSelect";
+export declare function getTableRenderType(item: ApColumnType | EditableColumnType): "number" | "select" | "date" | "checkbox" | "radio" | "text" | "switch" | "treeSelect" | "textArea" | "status" | "password" | "index" | "action" | "dateRange";
 export declare function getTableCellRenderNode(renderType: keyof typeof apTableRenderItemMap, renderProps: any, record: any, extraRenderMap?: Record<string, ValueTypeRenderConfig>): any;
 /**
  * 获取查询表单最终渲染的节点

package/es/src/ap-upload/components/MultipleFile.vue.d.ts

@@ -190,18 +190,18 @@ declare const _default: DefineComponent<{}, {
         disabled: boolean;
         method: "post" | "POST" | "PUT" | "PATCH" | "put" | "patch";
         locale: UploadLocale;
+        removeIcon: (opt: {
+            file: UploadFile<any>;
+        }) => VueNode;
         action: string | ((file: FileType) => string) | ((file: FileType) => PromiseLike<string>);
         remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         capture: boolean | "user" | "environment";
+        itemRender: ItemRender<any>;
         iconRender: (opt: {
             file: UploadFile<any>;
             listType?: UploadListType;
         }) => VueNode;
         onRemove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
-        removeIcon: (opt: {
-            file: UploadFile<any>;
-        }) => VueNode;
-        itemRender: ItemRender<any>;
         directory: boolean;
         headers: HttpRequestHeader;
         onReject: (fileList: FileType[]) => void;
@@ -416,18 +416,18 @@ declare const _default: DefineComponent<{}, {
         disabled: boolean;
         method: "post" | "POST" | "PUT" | "PATCH" | "put" | "patch";
         locale: UploadLocale;
+        removeIcon: (opt: {
+            file: UploadFile<any>;
+        }) => VueNode;
         action: string | ((file: FileType) => string) | ((file: FileType) => PromiseLike<string>);
         remove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
         capture: boolean | "user" | "environment";
+        itemRender: ItemRender<any>;
         iconRender: (opt: {
             file: UploadFile<any>;
             listType?: UploadListType;
         }) => VueNode;
         onRemove: (file: UploadFile<any>) => boolean | void | Promise<boolean | void>;
-        removeIcon: (opt: {
-            file: UploadFile<any>;
-        }) => VueNode;
-        itemRender: ItemRender<any>;
         directory: boolean;
         headers: HttpRequestHeader;
         onReject: (fileList: FileType[]) => void;

package/es/src/business/ap-batch-action-group/index.d.ts

@@ -1,7 +1,6 @@
 import { CreateComponentPublicInstanceWithMixins, ExtractPropTypes, PropType, VNodeChild, CSSProperties, ComputedRef, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, ComponentOptionsBase, VNodeProps, AllowedComponentProps, ComponentCustomProps, Plugin } from 'vue';
-import { ButtonType, ButtonShape } from '@aplus-frontend/antdv/es/button';
+import { ButtonType, ButtonShape, ButtonSize } from '@aplus-frontend/antdv/es/button';
 import { ButtonHTMLType, ButtonIconPosition, ButtonVariantType } from '@aplus-frontend/antdv/es/button/buttonTypes';
-import { SizeType } from '@aplus-frontend/antdv/es/config-provider';
 import { VueTypeValidableDef } from '../../../node_modules/vue-types';
 import { MouseEventHandler, FocusEventHandler } from '@aplus-frontend/antdv/es/_util/EventInterface';
 import { DropdownArrowOptions, Trigger, Align } from '@aplus-frontend/antdv/es/dropdown/props';
@@ -27,7 +26,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonShape>;
             };
             size: {
-                type: PropType<SizeType>;
+                type: PropType<ButtonSize>;
             };
             loading: {
                 type: PropType<boolean | {
@@ -68,7 +67,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonIconPosition>;
                 default: string;
             };
-            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
+            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "danger" | "primary">;
             variant: PropType<ButtonVariantType>;
         }>>, "type" | "onClick"> & {
             type?: ( ButtonType | undefined) | "borderLink";
@@ -337,7 +336,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonShape>;
             };
             size: {
-                type: PropType<SizeType>;
+                type: PropType<ButtonSize>;
             };
             loading: {
                 type: PropType<boolean | {
@@ -378,7 +377,7 @@ declare const ApBatchActionGroup: {
                 type: PropType<ButtonIconPosition>;
                 default: string;
             };
-            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
+            color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "danger" | "primary">;
             variant: PropType<ButtonVariantType>;
         }>>, "type" | "onClick"> & {
             type?: ( ButtonType | undefined) | "borderLink";
@@ -644,7 +643,7 @@ declare const ApBatchActionGroup: {
             type: PropType<ButtonShape>;
         };
         size: {
-            type: PropType<SizeType>;
+            type: PropType<ButtonSize>;
         };
         loading: {
             type: PropType<boolean | {
@@ -685,7 +684,7 @@ declare const ApBatchActionGroup: {
             type: PropType<ButtonIconPosition>;
             default: string;
         };
-        color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "primary" | "danger">;
+        color: PropType<"default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "volcano" | "geekblue" | "danger" | "primary">;
         variant: PropType<ButtonVariantType>;
     }>>, "type" | "onClick"> & {
         type?: ButtonProps["type"] | "borderLink";

package/es/src/business/ap-label/ApLabel.d.ts

@@ -49,7 +49,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     prefixCls: StringConstructor;
     scrollNumberPrefixCls: StringConstructor;
     status: {
-        type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+        type: PropType<"error" | "default" | "warning" | "success" | "processing">;
     };
     size: {
         type: PropType<"default" | "small">;
@@ -109,7 +109,7 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     prefixCls: StringConstructor;
     scrollNumberPrefixCls: StringConstructor;
     status: {
-        type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+        type: PropType<"error" | "default" | "warning" | "success" | "processing">;
     };
     size: {
         type: PropType<"default" | "small">;
@@ -133,10 +133,10 @@ declare const _default: DefineComponent<ExtractPropTypes<{
     showZero: boolean;
     overflowCount: number;
     numberStyle: CSSProperties;
+    iconColor: string;
+    iconSize: number;
     helpMessage: string | VNode< RendererNode, RendererElement, {
         [key: string]: any;
     }> | undefined;
-    iconColor: string;
-    iconSize: number;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/src/business/ap-label/constans.d.ts

@@ -67,7 +67,7 @@ export declare const ApLabelProps: () => {
     prefixCls: StringConstructor;
     scrollNumberPrefixCls: StringConstructor;
     status: {
-        type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+        type: PropType<"error" | "default" | "warning" | "success" | "processing">;
     };
     size: {
         type: PropType<"default" | "small">;

package/es/src/business/ap-label/index.d.ts

@@ -51,7 +51,7 @@ declare const ApLabel: {
         prefixCls: StringConstructor;
         scrollNumberPrefixCls: StringConstructor;
         status: {
-            type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+            type: PropType<"error" | "default" | "warning" | "success" | "processing">;
         };
         size: {
             type: PropType<"default" | "small">;
@@ -75,11 +75,11 @@ declare const ApLabel: {
         showZero: boolean;
         overflowCount: number;
         numberStyle: CSSProperties;
+        iconColor: string;
+        iconSize: number;
         helpMessage: string | VNode<RendererNode, RendererElement, {
             [key: string]: any;
         }> | undefined;
-        iconColor: string;
-        iconSize: number;
     }, true, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
         P: {};
         B: {};
@@ -133,7 +133,7 @@ declare const ApLabel: {
         prefixCls: StringConstructor;
         scrollNumberPrefixCls: StringConstructor;
         status: {
-            type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+            type: PropType<"error" | "default" | "warning" | "success" | "processing">;
         };
         size: {
             type: PropType<"default" | "small">;
@@ -157,11 +157,11 @@ declare const ApLabel: {
         showZero: boolean;
         overflowCount: number;
         numberStyle: CSSProperties;
+        iconColor: string;
+        iconSize: number;
         helpMessage: string | VNode<RendererNode, RendererElement, {
             [key: string]: any;
         }> | undefined;
-        iconColor: string;
-        iconSize: number;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -212,7 +212,7 @@ declare const ApLabel: {
     prefixCls: StringConstructor;
     scrollNumberPrefixCls: StringConstructor;
     status: {
-        type: PropType<"error" | "default" | "success" | "processing" | "warning">;
+        type: PropType<"error" | "default" | "warning" | "success" | "processing">;
     };
     size: {
         type: PropType<"default" | "small">;
@@ -236,11 +236,11 @@ declare const ApLabel: {
     showZero: boolean;
     overflowCount: number;
     numberStyle: CSSProperties;
+    iconColor: string;
+    iconSize: number;
     helpMessage: string | VNode<RendererNode, RendererElement, {
         [key: string]: any;
     }> | undefined;
-    iconColor: string;
-    iconSize: number;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {
         onClick?: () => void;

package/es/src/business/ap-radio-group/ap-radio-group.vue.d.ts

@@ -14,8 +14,8 @@ declare const _default: DefineComponent<__VLS_Props, {}, {}, {}, {}, ComponentOp
     "onUpdate:value"?: ((value: string | number) => any) | undefined;
 }>, {
     value: string | number;
-    delay: number;
     options: RadioOptionType[];
+    delay: number;
     optionStyle: RadioOptionStyleType;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {}, HTMLDivElement>;
 export default _default;

package/es/src/business/ap-radio-group/index.d.ts

@@ -15,8 +15,8 @@ declare const ApRadioGroup: {
         "update:value": (value: string | number) => any;
     }, PublicProps, {
         value: string | number;
-        delay: number;
         options: RadioOptionType[];
+        delay: number;
         optionStyle: RadioOptionStyleType;
     }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, HTMLDivElement, ComponentProvideOptions, {
         P: {};
@@ -35,8 +35,8 @@ declare const ApRadioGroup: {
         "onUpdate:value"?: ((value: string | number) => any) | undefined;
     }>, {}, {}, {}, {}, {
         value: string | number;
-        delay: number;
         options: RadioOptionType[];
+        delay: number;
         optionStyle: RadioOptionStyleType;
     }>;
     __isFragment?: never;
@@ -55,8 +55,8 @@ declare const ApRadioGroup: {
     "update:value": (value: string | number) => any;
 }, string, {
     value: string | number;
-    delay: number;
     options: RadioOptionType[];
+    delay: number;
     optionStyle: RadioOptionStyleType;
 }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & ( Plugin & (new (...args: any[]) => {
     $props: {

package/es/src/business/ap-table-modal/hooks/use-create-table-modal.d.ts

@@ -20,10 +20,10 @@ export declare function useCreateTableModal(props: UseCreateTableModalProps): {
             select: (item: any) => void;
             selectAll: () => void;
             unSelectAll: () => void;
-            clearAll: () => void;
             selectedRows: any[];
             unSelect: (item: any) => void;
             isSelected: (item: any) => boolean;
+            clearAll: () => void;
             toggleSelect: (item: any) => void;
             selectMulti: (items: any[]) => void;
             unSelectMulti: (items: any[]) => void;

package/es/src/business/ap-table-modal/hooks/use-table-modal.d.ts

@@ -18,10 +18,10 @@ export declare function useTableModal<TableRowType = Record<string, any>>(props:
             select: (item: any) => void;
             selectAll: () => void;
             unSelectAll: () => void;
-            clearAll: () => void;
             selectedRows: any[];
             unSelect: (item: any) => void;
             isSelected: (item: any) => boolean;
+            clearAll: () => void;
             toggleSelect: (item: any) => void;
             selectMulti: (items: any[]) => void;
             unSelectMulti: (items: any[]) => void;

package/es/src/business/ap-table-modal/hooks/use-table-select-modal.d.ts

@@ -17,10 +17,10 @@ export declare function useTableSelectModal<TableRowType = Record<string, any>>(
             select: (item: any) => void;
             selectAll: () => void;
             unSelectAll: () => void;
-            clearAll: () => void;
             selectedRows: any[];
             unSelect: (item: any) => void;
             isSelected: (item: any) => boolean;
+            clearAll: () => void;
             toggleSelect: (item: any) => void;
             selectMulti: (items: any[]) => void;
             unSelectMulti: (items: any[]) => void;

package/es/src/business/ap-table-modal/index.d.ts

@@ -26,10 +26,10 @@ declare const ApTableModal: {
                 select: (item: any) => void;
                 selectAll: () => void;
                 unSelectAll: () => void;
-                clearAll: () => void;
                 selectedRows: any[];
                 unSelect: (item: any) => void;
                 isSelected: (item: any) => boolean;
+                clearAll: () => void;
                 toggleSelect: (item: any) => void;
                 selectMulti: (items: any[]) => void;
                 unSelectMulti: (items: any[]) => void;
@@ -137,10 +137,10 @@ declare const ApTableModal: {
                 select: (item: any) => void;
                 selectAll: () => void;
                 unSelectAll: () => void;
-                clearAll: () => void;
                 selectedRows: any[];
                 unSelect: (item: any) => void;
                 isSelected: (item: any) => boolean;
+                clearAll: () => void;
                 toggleSelect: (item: any) => void;
                 selectMulti: (items: any[]) => void;
                 unSelectMulti: (items: any[]) => void;
@@ -202,10 +202,10 @@ declare const ApTableModal: {
             select: (item: any) => void;
             selectAll: () => void;
             unSelectAll: () => void;
-            clearAll: () => void;
             selectedRows: any[];
             unSelect: (item: any) => void;
             isSelected: (item: any) => boolean;
+            clearAll: () => void;
             toggleSelect: (item: any) => void;
             selectMulti: (items: any[]) => void;
             unSelectMulti: (items: any[]) => void;

package/es/src/business/ap-table-modal/table-modal.vue.d.ts

@@ -19,10 +19,10 @@ declare const _default: DefineComponent<__VLS_Props, {
             select: (item: any) => void;
             selectAll: () => void;
             unSelectAll: () => void;
-            clearAll: () => void;
             selectedRows: any[];
             unSelect: (item: any) => void;
             isSelected: (item: any) => boolean;
+            clearAll: () => void;
             toggleSelect: (item: any) => void;
             selectMulti: (items: any[]) => void;
             unSelectMulti: (items: any[]) => void;

package/es/src/business/ap-table-modal/table-modal.vue2.mjs

@@ -98,11 +98,12 @@ const ue = /* @__PURE__ */ E({
       }
       if (e.getRowKey) {
         const t = j(r(a)), o = t.map(e.getRowKey);
-        if (M("finish", o, t), f?.({ keys: o, rows: t }), e.onOk && await e.onOk({
+        if (e.onOk && await e.onOk({
           keys: o,
           rows: t
         }) === !1)
           return;
+        M("finish", o, t), f?.({ keys: o, rows: t });
       } else {
         u?.(y.NotFineGetRowKey);
         return;
@@ -142,7 +143,7 @@ const ue = /* @__PURE__ */ E({
               );
               return;
             }
-            a.value.push(o);
+            e.rowSelection?.type === "radio" ? a.value = [o] : a.value.push(o);
           } else {
             const l = a.value.findIndex(
               (c) => t(o) === t(c)

package/es/src/business/ap-view/ap-view.vue2.mjs

@@ -39,15 +39,15 @@ const Ke = /* @__PURE__ */ $({
   setup(F, {
     expose: N
   }) {
-    const s = F, _ = te("viewCacheOption"), {
+    const o = F, _ = te("viewCacheOption"), {
       b: V
     } = ae("ap-view"), {
-      t: O
+      t: I
     } = ie(), d = C(() => ({
       viewKey: u,
-      viewName: O("ap.apView.systemView")
+      viewName: I("ap.apView.systemView")
     })), {
-      getSearchFormValues: I,
+      getSearchFormValues: O,
       setSearchFormValues: L,
       submit: x,
       reset: B,
@@ -55,20 +55,20 @@ const Ke = /* @__PURE__ */ $({
       getSearchFormSorterItems: k,
       setSearchFormSorterItems: A,
       resetSearchFormSorterItems: P
-    } = Z(), T = p(!1), S = p(!1), v = p("");
+    } = Z(), T = p(!1), S = p(!1), w = p("");
     let c = !1, b = !1;
     const W = {
       dropdownType: "dropdown",
       content: K(se, {
-        maxViewNum: s.maxViewNum
+        maxViewNum: o.maxViewNum
       }, null)
-    }, a = p([d.value]), j = C(() => a.value.map((e) => ({
-      id: e.viewKey,
+    }, i = p([d.value]), j = C(() => i.value.map((t) => ({
+      id: t.viewKey,
       content: K(oe, {
-        view: e
+        view: t
       }, null)
-    }))), o = {
-      getSearchFormValues: I,
+    }))), r = {
+      getSearchFormValues: O,
       setSearchFormValues: L,
       submit: x,
       reset: B,
@@ -76,112 +76,112 @@ const Ke = /* @__PURE__ */ $({
       getSearchFormSorterItems: k,
       setSearchFormSorterItems: A,
       resetSearchFormSorterItems: P,
-      ...s.saveDataSource
-    }, w = {
+      ...o.saveDataSource
+    }, v = {
       ..._.value,
-      ...s.viewCacheOption
-    }, g = () => s.isDefaultSystemView ? u : (s.isFirstDefaultSystemView || b) && c ? u : a.value.find((i) => i.isDefault)?.viewKey ?? u, n = (e) => {
-      v.value = e;
-      const i = a.value.find((t) => t.viewKey === v.value);
-      i && setTimeout(() => {
-        i.viewKey === u ? c ? s.manual || o?.submitWith?.() : (o?.resetSearchFormSorterItems?.(), s.manual || o?.reset?.()) : (o?.setSearchFormValues?.({
-          ...Object.fromEntries(Object.keys(o?.getSearchFormValues?.() ?? {}).map((t) => [t, void 0])) ?? {},
-          ...i.viewConfig?.searchForm ?? {}
-        }), o?.setSearchFormSorterItems?.(i.viewConfig?.sorterItems ?? []), c ? s.manual || o?.submitWith?.() : o?.submit?.()), c = !1;
+      ...o.viewCacheOption
+    }, g = () => o.isDefaultSystemView ? u : (o.isFirstDefaultSystemView || b) && c ? u : i.value.find((a) => a.isDefault)?.viewKey ?? u, l = (t) => {
+      w.value = t;
+      const a = i.value.find((e) => e.viewKey === w.value);
+      a && setTimeout(() => {
+        a.viewKey === u ? c ? o.manual || r?.submitWith?.() : o.manual || (r?.resetSearchFormSorterItems?.(), r?.reset?.()) : (r?.setSearchFormValues?.({
+          ...Object.fromEntries(Object.keys(r?.getSearchFormValues?.() ?? {}).map((e) => [e, void 0])) ?? {},
+          ...r?.getSearchFormSorterItems?.()?.reduce((e, s) => (a.viewConfig?.searchForm?.[s.name] && (e[s.name] = a.viewConfig?.searchForm?.[s.name]), e), {}) ?? {}
+        }), r?.setSearchFormSorterItems?.(a.viewConfig?.sorterItems ?? []), c ? o.manual || r?.submitWith?.() : r?.submit?.()), c = !1;
       });
     }, D = {
-      getViewList: async (e) => {
+      getViewList: async (t) => {
         try {
           const {
-            tableKey: i
-          } = e, t = await w?.getViewList?.({
-            tableKey: i
+            tableKey: a
+          } = t, e = await v?.getViewList?.({
+            tableKey: a
           });
-          return a.value = [d.value, ...t ?? []], n(g()), a.value;
+          return i.value = [d.value, ...e ?? []], l(g()), i.value;
         } catch {
-          return a.value = [d.value], n(u), a.value;
+          return i.value = [d.value], l(u), i.value;
         }
       },
-      addView: async (e) => {
+      addView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        } = e;
-        await w?.addView?.({
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        } = t;
+        await v?.addView?.({
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }), l && (a.value = a.value.map((m) => ({
+        }), n && (i.value = i.value.map((m) => ({
           ...m,
           isDefault: !1
-        }))), a.value = [...a.value, {
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        }))), i.value = [...i.value, {
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }], n(t);
+        }], l(e);
       },
-      changeView: async (e) => {
+      changeView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        } = e;
-        await w?.changeView?.({
-          tableKey: i,
-          viewKey: t,
-          viewName: r,
-          isDefault: l,
+        } = t;
+        await v?.changeView?.({
+          tableKey: a,
+          viewKey: e,
+          viewName: s,
+          isDefault: n,
           viewConfig: f
-        }), l && (a.value = a.value.map((h) => ({
+        }), n && (i.value = i.value.map((h) => ({
           ...h,
           isDefault: !1
         })));
-        const m = a.value.find((h) => h.viewKey === t);
-        m && (m.viewName = r, m.isDefault = l, m.viewConfig = f), n(t);
+        const m = i.value.find((h) => h.viewKey === e);
+        m && (m.viewName = s, m.isDefault = n, m.viewConfig = f), l(e);
       },
-      removeView: async (e) => {
+      removeView: async (t) => {
         const {
-          tableKey: i,
-          viewKey: t
-        } = e;
-        await w?.removeView?.({
-          tableKey: i,
-          viewKey: t
-        }), a.value = a.value.filter((r) => r.viewKey !== t), t === v.value && n(g());
+          tableKey: a,
+          viewKey: e
+        } = t;
+        await v?.removeView?.({
+          tableKey: a,
+          viewKey: e
+        }), i.value = i.value.filter((s) => s.viewKey !== e), e === w.value && l(g());
       }
     }, G = {
-      tableKey: s.tableKey,
-      currentViewKey: v,
-      changeCurrentViewKey: n,
+      tableKey: o.tableKey,
+      currentViewKey: w,
+      changeCurrentViewKey: l,
       popoverOpen: T,
       menuOpen: S,
-      viewList: a,
+      viewList: i,
       viewListCRUD: D,
-      saveDataSource: o
+      saveDataSource: r
     };
-    return X(G), U(() => s.tableKey, (e) => {
-      ee(e) && (c = !0, D?.getViewList?.({
-        tableKey: e
+    return X(G), U(() => o.tableKey, (t) => {
+      ee(t) && (c = !0, D?.getViewList?.({
+        tableKey: t
       }));
     }, {
       immediate: !0
     }), N({
-      setFirstDefaultSystemView: (e) => {
-        b = e;
+      setFirstDefaultSystemView: (t) => {
+        b = t;
       }
-    }), (e, i) => (z(), Y(y(Q), M({
-      ...e.$attrs
+    }), (t, a) => (z(), Y(y(Q), M({
+      ...t.$attrs
     }, {
       open: S.value,
-      "onUpdate:open": i[0] || (i[0] = (t) => S.value = t),
+      "onUpdate:open": a[0] || (a[0] = (e) => S.value = e),
       class: [y(V)()],
       "button-props": W,
       "menu-list": j.value,