@dt-frames/ui 1.0.50 → 1.0.51

package/es/components/table/src/index.d.ts

@@ -142,7 +142,10 @@ declare const _default: import("vue").DefineComponent<{
             'onUpdate:current': import("vue").PropType<(current: number) => void>;
             'onUpdate:pageSize': import("vue").PropType<(size: number) => void>;
         }>>>;
-        default: {};
+        default: {
+            pageSize: number;
+            current: number;
+        };
     };
     loading: {
         type: BooleanConstructor;
@@ -603,7 +606,10 @@ declare const _default: import("vue").DefineComponent<{
             'onUpdate:current': import("vue").PropType<(current: number) => void>;
             'onUpdate:pageSize': import("vue").PropType<(size: number) => void>;
         }>>>;
-        default: {};
+        default: {
+            pageSize: number;
+            current: number;
+        };
     };
     loading: {
         type: BooleanConstructor;
@@ -685,7 +691,10 @@ declare const _default: import("vue").DefineComponent<{
     customRow: (record: any, index: any) => void;
     childrenColumnName: string;
     dataSource: Recordable<any>[];
-    pagination: {};
+    pagination: {
+        pageSize: number;
+        current: number;
+    };
     rowSelection: {
         type: string;
         fixed: boolean;

package/es/components/table/src/props.d.ts

@@ -145,7 +145,10 @@ export declare const TableProps: {
             'onUpdate:current': PropType<(current: number) => void>;
             'onUpdate:pageSize': PropType<(size: number) => void>;
         }>>>;
-        default: {};
+        default: {
+            pageSize: number;
+            current: number;
+        };
     };
     loading: {
         type: BooleanConstructor;

package/es/index.js

@@ -3761,14 +3761,20 @@ function useFormEvents({
       console.error("\u6240\u6709\u7684\u5143\u7D20\u90FD\u5FC5\u987B\u8BBE\u7F6Ename\u5C5E\u6027");
       return;
     }
+    let schema = [];
     updateItems.forEach((it) => {
+      let isMerge = false;
       unref(getSchema).forEach((val) => {
         if (val.name === it.name) {
-          deepMerge(val, it);
+          const newSchema = deepMerge(val, it);
+          schema.push(newSchema);
+          isMerge = true;
         }
       });
+      if (!isMerge)
+        schema.push(it);
     });
-    schemaRef.value = uniqBy(updateItems, "name");
+    schemaRef.value = uniqBy(schema, "name");
   }
   function resetSchema(data) {
     let updateItems = [];
@@ -4954,7 +4960,10 @@ const TableProps = {
   canResize: { type: Boolean, default: false },
   pagination: {
     type: [Object, Boolean],
-    default: {}
+    default: {
+      pageSize: 20,
+      current: 1
+    }
   },
   loading: { type: Boolean, default: false },
   rowClassName: { type: Function },
@@ -5645,7 +5654,7 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
       var _a, _b;
       let els = (_a = unref(tableElRef)) == null ? void 0 : _a.$el.querySelectorAll(".__column");
       let allWidth = 0;
-      for (let i = 0; i < els.length; i++) {
+      for (let i = 0; i < (els == null ? void 0 : els.length); i++) {
         allWidth += (_b = els[i].offsetWidth) != null ? _b : 0;
       }
       let columnAllWidth = 0, noWidthNum = 0;
@@ -5818,7 +5827,7 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
               columns.splice(oldIndex, 1);
             }
             plainSortOptions.value = columns;
-            setColumns(columns);
+            setColumns(columns.map((col) => col.value).filter((value) => state.checkedList.includes(value)));
           }
         });
         sortableOrder = sortable.toArray();
@@ -6940,7 +6949,7 @@ function useDownload(exportUrl, exportName) {
   };
 }
 function useSource(opt) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const { t } = useI18n("UI");
   const loading = {
     onSearch: ref(false),
@@ -6967,7 +6976,7 @@ function useSource(opt) {
   const { appConf } = useAppStore();
   const pagination = ref({
     current: ((_b = (_a = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _a.table) == null ? void 0 : _b.defaultPageNo) || 1,
-    pageSize: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageSize) || 10,
+    pageSize: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageSize) || 20,
     total: 0
   });
   const dataSource = ref([]);
@@ -6975,7 +6984,7 @@ function useSource(opt) {
     entityDTO: {},
     pageDTO: {
       pageNo: 0,
-      pageSize: 10
+      pageSize: (_f = (_e = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _e.table) == null ? void 0 : _f.defaultPageSize
     },
     orderDTOs: []
   });
@@ -7016,7 +7025,7 @@ function useSource(opt) {
     const { fetch } = useFetch(queryPage, baseUrl);
     loading.onQuerypage.value = true;
     fetch(toRaw(baseData)).then((rsp) => {
-      var _a2, _b2, _c2;
+      var _a2, _b2, _c2, _d2, _e2;
       if (isArray$1(rsp)) {
         dataSource.value.splice(0, dataSource.value.length, ...rsp);
         return;
@@ -7025,8 +7034,8 @@ function useSource(opt) {
       dataSource.value.splice(0, dataSource.value.length, ...records);
       pagination.value = {
         current: ((_a2 = pageDTO == null ? void 0 : pageDTO.pageNo) != null ? _a2 : 0) + 1,
-        pageSize: (_b2 = pageDTO == null ? void 0 : pageDTO.pageSize) != null ? _b2 : 10,
-        total: (_c2 = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _c2 : 0
+        pageSize: (_d2 = pageDTO == null ? void 0 : pageDTO.pageSize) != null ? _d2 : (_c2 = (_b2 = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _b2.table) == null ? void 0 : _c2.defaultPageSize,
+        total: (_e2 = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _e2 : 0
       };
     }).finally(() => {
       loading.onSearch.value = false;
@@ -8957,11 +8966,13 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     const menuList = ref([]);
     const router = useRouter();
     const filter2 = ref("");
+    const visible = ref(false);
     const { getShowSearch, getIsZH } = useHeader();
     const isUseDef = computed(() => {
       return isBoolean(getShowSearch.value);
     });
     function visibleChange(e) {
+      visible.value = e;
       if (e) {
         filterMenu();
       } else {
@@ -8971,25 +8982,28 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     function filterMenu() {
       menuList.value = getFilterMenu(filter2.value, true);
     }
-    function navigation(url) {
+    function goPage(url) {
       router.push(url);
+      visible.value = false;
       setTimeout(() => {
         filter2.value = "";
         menuList.value = [];
-      });
+      }, 500);
     }
     return (_ctx, _cache) => {
       return unref(isUseDef) ? (openBlock(), createElementBlock("div", _hoisted_1$6, [
         createVNode(unref(Popover), {
           placement: "bottom",
           overlayClassName: "menu_search__popover",
-          trigger: "focus",
+          trigger: "click",
+          visible: visible.value,
+          "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => visible.value = $event),
           onVisibleChange: visibleChange
         }, {
           content: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(menuList.value, (menu) => {
               return openBlock(), createElementBlock("p", {
-                onClick: ($event) => navigation(menu.url)
+                onClick: ($event) => goPage(menu.url)
               }, toDisplayString(unref(getIsZH) ? menu.label : menu.enLabel), 9, _hoisted_2$3);
             }), 256)),
             !menuList.value.length ? (openBlock(), createElementBlock("div", _hoisted_3$1, [
@@ -9008,7 +9022,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
             }, null, 8, ["value", "placeholder"])
           ]),
           _: 1
-        })
+        }, 8, ["visible"])
       ])) : (openBlock(), createBlock(unref(getShowSearch), { key: 1 }));
     };
   }

package/es/theme/header/components/menu-search.d.ts

@@ -0,0 +1,284 @@
+declare const _sfc_main: import("vue").DefineComponent<{}, {
+    t: {
+        (key: string): string;
+        (key: string, locale: string): string;
+        (key: string, locale: string, list: unknown[]): string;
+        (key: string, locale: string, named: Record<string, unknown>): string;
+        (key: string, list: unknown[]): string;
+        (key: string, named: Record<string, unknown>): string;
+    };
+    menuList: import("vue").Ref<any[]>;
+    router: import("vue-router").Router;
+    filter: import("vue").Ref<string>;
+    getShowSearch: import("vue").ComputedRef<boolean | JSX.Element | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>>;
+    getIsZH: import("vue").ComputedRef<boolean>;
+    isUseDef: import("vue").ComputedRef<boolean>;
+    visibleChange: (e: any) => void;
+    filterMenu: () => void;
+    goPage: (url: string) => void;
+    Popover: {
+        new (...args: any[]): {
+            $: import("vue").ComponentInternalInstance;
+            $data: {};
+            $props: Partial<{
+                visible: boolean;
+                align: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+                builtinPlacements: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+                defaultVisible: boolean;
+                overlayStyle: import("vue").CSSProperties;
+                destroyTooltipOnHide: boolean;
+                autoAdjustOverflow: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+                arrowPointAtCenter: boolean;
+            }> & Omit<Readonly<import("vue").ExtractPropTypes<{
+                content: import("vue-types").VueTypeValidableDef<any>;
+                title: import("vue-types").VueTypeValidableDef<any>;
+                trigger: import("vue").PropType<import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType | import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType[]>;
+                visible: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                defaultVisible: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                placement: import("vue").PropType<import("ant-design-vue/lib/tooltip").TooltipPlacement>;
+                color: StringConstructor;
+                transitionName: StringConstructor;
+                overlayStyle: {
+                    type: import("vue").PropType<import("vue").CSSProperties>;
+                    default: import("vue").CSSProperties;
+                };
+                overlayClassName: StringConstructor;
+                openClassName: StringConstructor;
+                prefixCls: StringConstructor;
+                mouseEnterDelay: NumberConstructor;
+                mouseLeaveDelay: NumberConstructor;
+                getPopupContainer: import("vue").PropType<(triggerNode: HTMLElement) => HTMLElement>;
+                arrowPointAtCenter: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                autoAdjustOverflow: {
+                    type: import("vue").PropType<boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow>;
+                    default: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+                };
+                destroyTooltipOnHide: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                align: {
+                    type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").AlignType>;
+                    default: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+                };
+                builtinPlacements: {
+                    type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements>;
+                    default: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+                };
+                children: ArrayConstructor;
+                onVisibleChange: import("vue").PropType<(vis: boolean) => void>;
+                'onUpdate:visible': import("vue").PropType<(vis: boolean) => void>;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "visible" | "defaultVisible" | "overlayStyle" | "arrowPointAtCenter" | "autoAdjustOverflow" | "destroyTooltipOnHide" | "align" | "builtinPlacements">;
+            $attrs: {
+                [x: string]: unknown;
+            };
+            $refs: {
+                [x: string]: unknown;
+            };
+            $slots: Readonly<{
+                [name: string]: import("vue").Slot;
+            }>;
+            $root: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>>;
+            $parent: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>>;
+            $emit: (event: string, ...args: any[]) => void;
+            $el: any;
+            $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
+                content: import("vue-types").VueTypeValidableDef<any>;
+                title: import("vue-types").VueTypeValidableDef<any>;
+                trigger: import("vue").PropType<import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType | import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType[]>;
+                visible: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                defaultVisible: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                placement: import("vue").PropType<import("ant-design-vue/lib/tooltip").TooltipPlacement>;
+                color: StringConstructor;
+                transitionName: StringConstructor;
+                overlayStyle: {
+                    type: import("vue").PropType<import("vue").CSSProperties>;
+                    default: import("vue").CSSProperties;
+                };
+                overlayClassName: StringConstructor;
+                openClassName: StringConstructor;
+                prefixCls: StringConstructor;
+                mouseEnterDelay: NumberConstructor;
+                mouseLeaveDelay: NumberConstructor;
+                getPopupContainer: import("vue").PropType<(triggerNode: HTMLElement) => HTMLElement>;
+                arrowPointAtCenter: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                autoAdjustOverflow: {
+                    type: import("vue").PropType<boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow>;
+                    default: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+                };
+                destroyTooltipOnHide: {
+                    type: BooleanConstructor;
+                    default: any;
+                };
+                align: {
+                    type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").AlignType>;
+                    default: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+                };
+                builtinPlacements: {
+                    type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements>;
+                    default: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+                };
+                children: ArrayConstructor;
+                onVisibleChange: import("vue").PropType<(vis: boolean) => void>;
+                'onUpdate:visible': import("vue").PropType<(vis: boolean) => void>;
+            }>>, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, {
+                visible: boolean;
+                align: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+                builtinPlacements: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+                defaultVisible: boolean;
+                overlayStyle: import("vue").CSSProperties;
+                destroyTooltipOnHide: boolean;
+                autoAdjustOverflow: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+                arrowPointAtCenter: boolean;
+            }> & {
+                beforeCreate?: (() => void) | (() => void)[];
+                created?: (() => void) | (() => void)[];
+                beforeMount?: (() => void) | (() => void)[];
+                mounted?: (() => void) | (() => void)[];
+                beforeUpdate?: (() => void) | (() => void)[];
+                updated?: (() => void) | (() => void)[];
+                activated?: (() => void) | (() => void)[];
+                deactivated?: (() => void) | (() => void)[];
+                beforeDestroy?: (() => void) | (() => void)[];
+                beforeUnmount?: (() => void) | (() => void)[];
+                destroyed?: (() => void) | (() => void)[];
+                unmounted?: (() => void) | (() => void)[];
+                renderTracked?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                renderTriggered?: ((e: import("vue").DebuggerEvent) => void) | ((e: import("vue").DebuggerEvent) => void)[];
+                errorCaptured?: ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>>, info: string) => boolean | void) | ((err: unknown, instance: import("vue").ComponentPublicInstance<{}, {}, {}, {}, {}, {}, {}, {}, false, import("vue").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, {}>>, info: string) => boolean | void)[];
+            };
+            $forceUpdate: () => void;
+            $nextTick: typeof import("vue").nextTick;
+            $watch(source: string | Function, cb: Function, options?: import("vue").WatchOptions<boolean>): import("vue").WatchStopHandle;
+        } & Readonly<import("vue").ExtractPropTypes<{
+            content: import("vue-types").VueTypeValidableDef<any>;
+            title: import("vue-types").VueTypeValidableDef<any>;
+            trigger: import("vue").PropType<import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType | import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType[]>;
+            visible: {
+                type: BooleanConstructor;
+                default: any;
+            };
+            defaultVisible: {
+                type: BooleanConstructor;
+                default: any;
+            };
+            placement: import("vue").PropType<import("ant-design-vue/lib/tooltip").TooltipPlacement>;
+            color: StringConstructor;
+            transitionName: StringConstructor;
+            overlayStyle: {
+                type: import("vue").PropType<import("vue").CSSProperties>;
+                default: import("vue").CSSProperties;
+            };
+            overlayClassName: StringConstructor;
+            openClassName: StringConstructor;
+            prefixCls: StringConstructor;
+            mouseEnterDelay: NumberConstructor;
+            mouseLeaveDelay: NumberConstructor;
+            getPopupContainer: import("vue").PropType<(triggerNode: HTMLElement) => HTMLElement>;
+            arrowPointAtCenter: {
+                type: BooleanConstructor;
+                default: any;
+            };
+            autoAdjustOverflow: {
+                type: import("vue").PropType<boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow>;
+                default: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+            };
+            destroyTooltipOnHide: {
+                type: BooleanConstructor;
+                default: any;
+            };
+            align: {
+                type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").AlignType>;
+                default: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+            };
+            builtinPlacements: {
+                type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements>;
+                default: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+            };
+            children: ArrayConstructor;
+            onVisibleChange: import("vue").PropType<(vis: boolean) => void>;
+            'onUpdate:visible': import("vue").PropType<(vis: boolean) => void>;
+        }>> & import("vue").ShallowUnwrapRef<() => JSX.Element> & import("vue").ComponentCustomProperties;
+        __isFragment?: never;
+        __isTeleport?: never;
+        __isSuspense?: never;
+    } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
+        content: import("vue-types").VueTypeValidableDef<any>;
+        title: import("vue-types").VueTypeValidableDef<any>;
+        trigger: import("vue").PropType<import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType | import("ant-design-vue/lib/tooltip/abstractTooltipProps").TriggerType[]>;
+        visible: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        defaultVisible: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        placement: import("vue").PropType<import("ant-design-vue/lib/tooltip").TooltipPlacement>;
+        color: StringConstructor;
+        transitionName: StringConstructor;
+        overlayStyle: {
+            type: import("vue").PropType<import("vue").CSSProperties>;
+            default: import("vue").CSSProperties;
+        };
+        overlayClassName: StringConstructor;
+        openClassName: StringConstructor;
+        prefixCls: StringConstructor;
+        mouseEnterDelay: NumberConstructor;
+        mouseLeaveDelay: NumberConstructor;
+        getPopupContainer: import("vue").PropType<(triggerNode: HTMLElement) => HTMLElement>;
+        arrowPointAtCenter: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        autoAdjustOverflow: {
+            type: import("vue").PropType<boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow>;
+            default: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+        };
+        destroyTooltipOnHide: {
+            type: BooleanConstructor;
+            default: any;
+        };
+        align: {
+            type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").AlignType>;
+            default: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+        };
+        builtinPlacements: {
+            type: import("vue").PropType<import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements>;
+            default: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+        };
+        children: ArrayConstructor;
+        onVisibleChange: import("vue").PropType<(vis: boolean) => void>;
+        'onUpdate:visible': import("vue").PropType<(vis: boolean) => void>;
+    }>>, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, {
+        visible: boolean;
+        align: import("ant-design-vue/lib/vc-trigger/interface").AlignType;
+        builtinPlacements: import("ant-design-vue/lib/vc-trigger/interface").BuildInPlacements;
+        defaultVisible: boolean;
+        overlayStyle: import("vue").CSSProperties;
+        destroyTooltipOnHide: boolean;
+        autoAdjustOverflow: boolean | import("ant-design-vue/lib/tooltip").AdjustOverflow;
+        arrowPointAtCenter: boolean;
+    }> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("@vue/runtime-core").Plugin;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+export default _sfc_main;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.50",
+	"version": "1.0.51",
 	"keywords": [
 		"ui",
 		"dt-ui"