@qin-ui/antd-vue-pro 1.0.19 → 1.0.21

package/es/component-provider/index.js

@@ -1,6 +1,7 @@
 import { defineComponent, provide, renderSlot } from "vue";
 import "ant-design-vue";
 import { I as INJECT_COMPONENT_PROPS_KEYS } from "../form/index-2b6aeb25.js";
+import { PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS } from "../table/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -10,7 +11,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     if (props.componentVars) {
       Object.values(props.componentVars).forEach((item) => {
-        const injectKeys = { ...INJECT_COMPONENT_PROPS_KEYS };
+        const injectKeys = {
+          ...INJECT_COMPONENT_PROPS_KEYS,
+          ...PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS
+        };
         Object.entries(item).forEach(([key, value]) => {
           if (Object.hasOwn(injectKeys, key)) {
             provide(injectKeys[key], value);

package/es/index.d.ts

@@ -281,6 +281,7 @@ export declare type ComponentVars = {
     proForm?: Record<string, Record<string, any>>;
     proFormItems?: Record<string, Record<string, any>>;
     proFormField?: Partial<Record<keyof typeof INJECT_COMPONENT_PROPS_KEYS, Record<string, any>>>;
+    proTable?: Partial<Record<keyof typeof PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS, Record<string, any>>>;
 };
 
 /**
@@ -465,7 +466,6 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     rowKey?: string | GetRowKey<any> | undefined;
     pagination?: false | TablePaginationConfig | undefined;
     title?: PanelRender<any> | undefined;
-    footer?: PanelRender<any> | undefined;
     table?: ({
         dataSource: Ref<D[]>;
         columns: Ref<Columns<D>>;
@@ -658,6 +658,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         }>>) => void;
         resetQueryParams: () => void;
     }) | undefined;
+    footer?: PanelRender<any> | undefined;
     tableLayout?: TableLayout | undefined;
     columns?: ColumnsType<any> | undefined;
     sortDirections?: SortOrder[] | undefined;
@@ -694,10 +695,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     searchContainer?: ContainerComponent | any;
     controlContainer?: ContainerComponent | any;
     tableContainer?: ContainerComponent | any;
-    pageCache?: {
-        get(): any;
-        set(val: Record<string, any>): void;
-    } | undefined;
+    paramCache?: ParamCache | undefined;
     onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
 } & VNodeProps & AllowedComponentProps & ComponentCustomProps, __VLS_ctx?: {
@@ -910,7 +908,6 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         rowKey?: string | GetRowKey<any> | undefined;
         pagination?: false | TablePaginationConfig | undefined;
         title?: PanelRender<any> | undefined;
-        footer?: PanelRender<any> | undefined;
         table?: ({
             dataSource: Ref<D[]>;
             columns: Ref<Columns<D>>;
@@ -1103,6 +1100,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             }>>) => void;
             resetQueryParams: () => void;
         }) | undefined;
+        footer?: PanelRender<any> | undefined;
         tableLayout?: TableLayout | undefined;
         columns?: ColumnsType<any> | undefined;
         sortDirections?: SortOrder[] | undefined;
@@ -1139,10 +1137,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         searchContainer?: ContainerComponent | any;
         controlContainer?: ContainerComponent | any;
         tableContainer?: ContainerComponent | any;
-        pageCache?: {
-            get(): any;
-            set(val: Record<string, any>): void;
-        } | undefined;
+        paramCache?: ParamCache | undefined;
         onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
     } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -1359,7 +1354,6 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             rowKey?: string | GetRowKey<any> | undefined;
             pagination?: false | TablePaginationConfig | undefined;
             title?: PanelRender<any> | undefined;
-            footer?: PanelRender<any> | undefined;
             table?: ({
                 dataSource: Ref<D[]>;
                 columns: Ref<Columns<D>>;
@@ -1552,6 +1546,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
                 }>>) => void;
                 resetQueryParams: () => void;
             }) | undefined;
+            footer?: PanelRender<any> | undefined;
             tableLayout?: TableLayout | undefined;
             columns?: ColumnsType<any> | undefined;
             sortDirections?: SortOrder[] | undefined;
@@ -1588,10 +1583,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             searchContainer?: ContainerComponent | any;
             controlContainer?: ContainerComponent | any;
             tableContainer?: ContainerComponent | any;
-            pageCache?: {
-                get(): any;
-                set(val: Record<string, any>): void;
-            } | undefined;
+            paramCache?: ParamCache | undefined;
             onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -1956,8 +1948,21 @@ declare type Option_2 = {
 
 export declare type Options = Array<Option_2>;
 
+export declare type ParamCache = {
+    get(): any;
+    set(val: Data | ((v: Data) => Data)): void;
+};
+
 export declare type PrependField = (path: string | undefined, field: Field) => void;
 
+export declare const PRO_TABLE_INIT_COMPONENT_PROPS_MAP: Map<symbol, {}>;
+
+export declare const PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS: {
+    table: symbol;
+    searchForm: symbol;
+    control: symbol;
+};
+
 export declare const ProComponentProvider: SFCWithInstall<{
     new (...args: any[]): {
         $: ComponentInternalInstance;
@@ -3059,7 +3064,6 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     rowKey?: string | GetRowKey<any> | undefined;
     pagination?: false | TablePaginationConfig | undefined;
     title?: PanelRender<any> | undefined;
-    footer?: PanelRender<any> | undefined;
     table?: ({
         dataSource: Ref<D[]>;
         columns: Ref<Columns<D>>;
@@ -3252,6 +3256,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         }>>) => void;
         resetQueryParams: () => void;
     }) | undefined;
+    footer?: PanelRender<any> | undefined;
     tableLayout?: TableLayout | undefined;
     columns?: TableColumnsType<any> | undefined;
     sortDirections?: SortOrder[] | undefined;
@@ -3288,10 +3293,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     searchContainer?: any;
     controlContainer?: any;
     tableContainer?: any;
-    pageCache?: {
-        get(): any;
-        set(val: Record<string, any>): void;
-    } | undefined;
+    paramCache?: ParamCache | undefined;
     onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
 } & VNodeProps & AllowedComponentProps & ComponentCustomProps, __VLS_ctx?: {
@@ -3504,7 +3506,6 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         rowKey?: string | GetRowKey<any> | undefined;
         pagination?: false | TablePaginationConfig | undefined;
         title?: PanelRender<any> | undefined;
-        footer?: PanelRender<any> | undefined;
         table?: ({
             dataSource: Ref<D[]>;
             columns: Ref<Columns<D>>;
@@ -3697,6 +3698,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             }>>) => void;
             resetQueryParams: () => void;
         }) | undefined;
+        footer?: PanelRender<any> | undefined;
         tableLayout?: TableLayout | undefined;
         columns?: TableColumnsType<any> | undefined;
         sortDirections?: SortOrder[] | undefined;
@@ -3733,10 +3735,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         searchContainer?: any;
         controlContainer?: any;
         tableContainer?: any;
-        pageCache?: {
-            get(): any;
-            set(val: Record<string, any>): void;
-        } | undefined;
+        paramCache?: ParamCache | undefined;
         onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
     } & VNodeProps & AllowedComponentProps & ComponentCustomProps;
@@ -3953,7 +3952,6 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             rowKey?: string | GetRowKey<any> | undefined;
             pagination?: false | TablePaginationConfig | undefined;
             title?: PanelRender<any> | undefined;
-            footer?: PanelRender<any> | undefined;
             table?: ({
                 dataSource: Ref<D[]>;
                 columns: Ref<Columns<D>>;
@@ -4146,6 +4144,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
                 }>>) => void;
                 resetQueryParams: () => void;
             }) | undefined;
+            footer?: PanelRender<any> | undefined;
             tableLayout?: TableLayout | undefined;
             columns?: TableColumnsType<any> | undefined;
             sortDirections?: SortOrder[] | undefined;
@@ -4182,10 +4181,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             searchContainer?: any;
             controlContainer?: any;
             tableContainer?: any;
-            pageCache?: {
-                get(): any;
-                set(val: Record<string, any>): void;
-            } | undefined;
+            paramCache?: ParamCache | undefined;
             onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
         } & VNodeProps & AllowedComponentProps & ComponentCustomProps;

package/es/index.js

@@ -2,7 +2,7 @@ import "./style.css";
 import { _ as _sfc_main } from "./form/index-2b6aeb25.js";
 import { j, B, c, g, C, b, e, F, i, k, I, R, d, h, U, f, l, n, m, r, p, u, q, s } from "./form/index-2b6aeb25.js";
 import BaseTable from "./table/index.js";
-import { useTable } from "./table/index.js";
+import { PRO_TABLE_INIT_COMPONENT_PROPS_MAP, PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS, useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";
 import "vue";
 import "ant-design-vue";
@@ -35,6 +35,8 @@ export {
   i as FunctionRegexp,
   k as INIT_COMPONENT_PROPS_MAP,
   I as INJECT_COMPONENT_PROPS_KEYS,
+  PRO_TABLE_INIT_COMPONENT_PROPS_MAP,
+  PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS,
   ProComponentProvider,
   ProForm,
   ProTable,

package/es/style.css

@@ -41,11 +41,11 @@
   padding: 24px 24px 16px;
   background-color: #fff;
 }
-.pro-table[data-v-6c332a60] {
+.pro-table[data-v-b15d517d] {
   display: flex;
   flex-direction: column;
   min-width: 800px;
 }
-.pro-table[data-v-6c332a60] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-b15d517d] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/table/index.js

@@ -1,4 +1,4 @@
-import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, computed, watch, Fragment, renderList, withModifiers, renderSlot, useSlots, useAttrs, onBeforeUnmount, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
+import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, useSlots, useAttrs, inject, onBeforeUnmount, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { A as AntdIcon, _ as _sfc_main$6, a as _export_sfc, o as omit, b as _sfc_main$7, u as useForm } from "../form/index-2b6aeb25.js";
 var ColumnHeightOutlined$2 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M840 836H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zm0-724H184c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h656c4.4 0 8-3.6 8-8v-60c0-4.4-3.6-8-8-8zM610.8 378c6 0 9.4-7 5.7-11.7L515.7 238.7a7.14 7.14 0 00-11.3 0L403.6 366.3a7.23 7.23 0 005.7 11.7H476v268h-62.8c-6 0-9.4 7-5.7 11.7l100.8 127.5c2.9 3.7 8.5 3.7 11.3 0l100.8-127.5c3.7-4.7.4-11.7-5.7-11.7H548V378h62.8z" } }] }, "name": "column-height", "theme": "outlined" };
@@ -188,13 +188,16 @@ const SearchForm_vue_vue_type_style_index_0_scoped_41c82259_lang = "";
 const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-41c82259"]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "Control",
-  props: {
+  props: mergeModels({
     columns: {},
     table: { default: void 0 }
-  },
+  }, {
+    "size": { default: "large" }
+  }),
+  emits: ["update:size"],
   setup(__props) {
     const props = __props;
-    const size = defineModel("size", { default: "large" });
+    const size = useModel(__props, "size");
     const onSizeChange = (val) => {
       size.value = val.key;
     };
@@ -367,6 +370,17 @@ function _sfc_render(_ctx, _cache) {
   ]);
 }
 const DefaultControlContainer = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render], ["__scopeId", "data-v-1d26ef2f"]]);
+const PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS = {
+  "table": Symbol(""),
+  "searchForm": Symbol(""),
+  "control": Symbol("")
+};
+const PROPS_KEYS = PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS;
+const PRO_TABLE_INIT_COMPONENT_PROPS_MAP = /* @__PURE__ */ new Map([
+  [PROPS_KEYS.table, {}],
+  [PROPS_KEYS.searchForm, {}],
+  [PROPS_KEYS.control, {}]
+]);
 const _hoisted_1 = {
   key: 0,
   style: { "flex": "1" }
@@ -385,7 +399,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     searchContainer: { default: DefaultSearchContainer },
     controlContainer: { default: DefaultControlContainer },
     tableContainer: { default: DefaultTableContainer },
-    pageCache: { default: void 0 }
+    paramCache: { default: void 0 }
   },
   emits: ["search"],
   setup(__props, { emit: __emit }) {
@@ -436,18 +450,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       searchParam,
       setSearchParam
     } = table;
-    if (props.pageCache) {
+    const injectProps = inject(
+      PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS.table
+    );
+    const cache = props.paramCache ?? (injectProps == null ? void 0 : injectProps.paramCache);
+    if (cache) {
       setPagination({
         ...unref(pagination),
-        ...unref(((_e = props.pageCache.get()) == null ? void 0 : _e.pagination) ?? {})
+        ...unref(((_e = cache.get()) == null ? void 0 : _e.pagination) ?? {})
       });
       setSearchParam(void 0, {
         ...unref(searchParam),
-        ...unref(((_f = props.pageCache.get()) == null ? void 0 : _f.searchParam) ?? {})
+        ...unref(((_f = cache.get()) == null ? void 0 : _f.searchParam) ?? {})
       });
       onBeforeUnmount(() => {
-        var _a2;
-        (_a2 = props.pageCache) == null ? void 0 : _a2.set({
+        cache == null ? void 0 : cache.set({
+          ...(cache == null ? void 0 : cache.get()) || {},
           pagination: unref(pagination),
           searchParam: unref(searchParam)
         });
@@ -564,8 +582,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_6c332a60_lang = "";
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6c332a60"]]);
+const Table_vue_vue_type_style_index_0_scoped_b15d517d_lang = "";
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b15d517d"]]);
 const getDefaultPagination = () => ({ current: 1, pageSize: 10, total: 0 });
 const useTable = ({
   columns: initColumns = [],
@@ -619,6 +637,8 @@ const useTable = ({
   };
 };
 export {
+  PRO_TABLE_INIT_COMPONENT_PROPS_MAP,
+  PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS,
   BaseTable as default,
   useTable
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",