@qin-ui/antd-vue-pro 2.0.12 → 2.0.14

package/es/antd-vue-pro.css

@@ -1,52 +1,58 @@
-.search-form[data-v-a5f1b551] .ant-form-item {
+.pro-table_search-form[data-v-0bb2bc70] .ant-form-item {
   margin: 0;
 }
-.expand-toggle-button[data-v-a5f1b551] {
+.pro-table_search-form_expand-toggle-button[data-v-0bb2bc70] {
   display: flex;
   align-items: center;
   padding: 0;
   padding-left: 4px;
 }
-.transition[data-v-a5f1b551] {
+.pro-table_search-form .transition[data-v-0bb2bc70] {
   transition: all 0.25s;
 }
-.search-form-container[data-v-727c8aba] {
+.pro-table_search-form-container[data-v-c385cd54] {
   margin-bottom: 24px;
   padding: 24px;
 }
-.table-container[data-v-185690a3] {
+.pro-table_table-container[data-v-ac3cdb51] {
   flex: 1;
   padding: 24px 24px 0;
 }
-.size-control-button[data-v-b7eded53] {
+.pro-table_size-control_button[data-v-0df8d4ae] {
   display: flex;
   align-items: center;
   padding-right: 12px;
   padding-left: 12px;
 }
-.size-control-button[data-v-b7eded53] svg {
+.pro-table_size-control_button[data-v-0df8d4ae] svg {
   transform: scale(1.3);
 }
-.column-control-button[data-v-cdcab425] {
+.pro-table_column-control_button[data-v-49bb3de5] {
   display: flex;
   align-items: center;
   padding-right: 12px;
   padding-left: 12px;
 }
-.column-control-button[data-v-cdcab425] svg {
+.pro-table_column-control_button[data-v-49bb3de5] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table .pro-table-header[data-v-7b0601fa] {
+.pro-table_header[data-v-54982423] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table .pro-table-header[data-v-7b0601fa]:empty {
+.pro-table_header[data-v-54982423]:empty {
   display: none;
 }
-.pro-table .pro-table-header + .pro-table-content[data-v-7b0601fa] {
+.pro-table_header + .pro-table_header_content[data-v-54982423] {
   margin-top: 16px;
 }
-.pro-table[data-v-7b0601fa] .ant-pagination .ant-pagination-total-text {
+.pro-table_header_button-bar[data-v-54982423] {
+  flex: 1;
+}
+.pro-table_header_toolbar[data-v-54982423] {
+  margin-left: 12px;
+}
+.pro-table[data-v-54982423] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/component-provider/{index-DXPHmG1H.js → index-D8NF18a1.js}

@@ -1,5 +1,5 @@
 import { camelize, defineComponent, provide, renderSlot } from "vue";
-import { i as isPlainObject } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { i as isPlainObject } from "../vendor/utils/lodash-es-p6jau26B.js";
 const getPopupContainer = (triggerNode) => triggerNode.closest(".ant-form");
 const INJECT_CONFIG = {
   "pro-table": {
@@ -134,6 +134,9 @@ function camelizeProperties(obj) {
   );
 }
 const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    inheritAttrs: false
+  },
   __name: "index",
   props: {
     componentVars: {}

package/es/component-provider/index.js

@@ -1,4 +1,4 @@
-import { I, _ } from "./index-DXPHmG1H.js";
+import { I, _ } from "./index-D8NF18a1.js";
 export {
   I as INJECT_CONFIG,
   _ as default

package/es/form/index.js

@@ -5,8 +5,8 @@ import { useProviderDisabled, useInjectDisabled } from "ant-design-vue/es/config
 import { colProps } from "ant-design-vue/es/grid/Col";
 import { formItemProps, useInjectFormItemContext } from "ant-design-vue/es/form";
 import { defineComponent, provide, inject, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, renderSlot, computed, toValue, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, reactive, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
-import { I as INJECT_CONFIG, c as camelizeProperties, g as getObject } from "../component-provider/index-DXPHmG1H.js";
-import { i as isPlainObject, t as toPath, g as get, s as set, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { I as INJECT_CONFIG, c as camelizeProperties, g as getObject } from "../component-provider/index-D8NF18a1.js";
+import { i as isPlainObject, t as toPath, g as get, s as set, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
   __name: "index",
@@ -37,11 +37,11 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           return (_a = unref(setFormRef)) == null ? void 0 : _a(el);
         },
         model: unref(formData)
-      }, mergeProps(injectAttrs, unref(camelizeProperties)(_ctx.$attrs))), {
+      }, mergeProps(injectAttrs, unref(camelizeProperties)(_ctx.$attrs)), { class: "pro-form" }), {
         default: withCtx(() => [
           createVNode(unref(_sfc_main$3), {
             fields: unref(fields),
-            grid: _ctx.grid
+            grid: __props.grid
           }, null, 8, ["fields", "grid"]),
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -234,7 +234,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                               default: withCtx(() => [
                                 field.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
                                   key: 0,
-                                  grid: field.grid ?? _ctx.grid,
+                                  grid: field.grid ?? __props.grid,
                                   fields: field.fields,
                                   disabled: field.disabled
                                 }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$2), mergeProps({
@@ -495,7 +495,8 @@ function useForm(...args) {
 }
 const initPropsMap = /* @__PURE__ */ new Map();
 const getInitProps = (field) => {
-  const { component, type = "" } = field;
+  const { component } = field;
+  const type = component === "input" ? "" : field.type;
   if (COMPONENT_MAP.has(component)) {
     const k = [component, type].filter(Boolean).join(".");
     if (initPropsMap.has(k)) {
@@ -583,7 +584,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$1), {
         component: groupedAttrs.value.componentContainer,
-        path: _ctx.path
+        path: __props.path
       }, {
         default: withCtx(() => [
           is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
@@ -591,13 +592,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             ref: componentRef,
             [`${groupedAttrs.value.modelName}`]: value.value,
             [`onUpdate:${groupedAttrs.value.modelName}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
-            path: _ctx.path
+            path: __props.path
           }), createSlots({ _: 2 }, [
             renderList(groupedAttrs.value.slots, (slot, name) => {
               return {
                 name,
                 fn: withCtx((scoped) => [
-                  createVNode(unref(_sfc_main), mergeProps({ path: _ctx.path }, scoped, { component: slot }), null, 16, ["path", "component"])
+                  createVNode(unref(_sfc_main), mergeProps({ path: __props.path }, scoped, { component: slot }), null, 16, ["path", "component"])
                 ])
               };
             })
@@ -612,11 +613,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "ContainerFragment", inheritAttrs: false },
   __name: "index",
   props: {
-    component: {}
+    component: { type: [Object, Function] }
   },
   setup(__props) {
     return (_ctx, _cache) => {
-      return _ctx.component ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
+      return __props.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), {
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -629,12 +630,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "SlotComponent", inheritAttrs: false },
   __name: "index",
   props: {
-    component: { type: [Object, String, Number, Boolean, null, Function] }
+    component: { type: [Object, Function, String, Number, Boolean, null] }
   },
   setup(__props) {
     return (_ctx, _cache) => {
-      return isVNode(_ctx.component) || typeof _ctx.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-        createTextVNode(toDisplayString(_ctx.component), 1)
+      return isVNode(__props.component) || typeof __props.component === "function" ? (openBlock(), createBlock(resolveDynamicComponent(__props.component), normalizeProps(mergeProps({ key: 0 }, _ctx.$attrs)), null, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+        createTextVNode(toDisplayString(__props.component), 1)
       ], 64));
     };
   }
@@ -651,6 +652,7 @@ export {
   _sfc_main as SlotComponent,
   TeleportComponentNamePrefix,
   _sfc_main$6 as default,
+  getInitProps,
   useFields,
   useForm,
   useFormData

package/es/index.d.ts

@@ -260,7 +260,7 @@ declare type CompSlot<T extends string> = Partial<Record<KeyExpandString<T>, Slo
 /**
  * @description 容器组件类型
  */
-export declare type ContainerComponent = Component<PathProps> | null;
+export declare type ContainerComponent = Component<PathProps>;
 
 export declare const ContainerFragment: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 
@@ -289,13 +289,13 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
         }>;
         searchFormConfig?: Omit<SearchFormProps, "form"> & {
             hidden?: boolean;
-            container?: ContainerComponent;
+            container?: ContainerComponent | false;
         };
-        tableContainer?: ContainerComponent;
+        tableContainer?: ContainerComponent | false;
     } & TableProps<any>) & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<    {}>): void;
     attrs: any;
-    slots: Readonly<Omit<Readonly<{
+    slots: Readonly<Omit<Omit<Readonly<{
         emptyText?: any;
         expandIcon?: Slot<RenderExpandIconProps<any> | undefined> | undefined;
         title?: any;
@@ -317,7 +317,15 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
         customFilterIcon?: any;
         customFilterDropdown?: any;
         default: any;
-    }> & Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>, "default">> & Omit<Readonly<{
+    }>, "bodyCell"> & Readonly<{
+        bodyCell?: (props: {
+            text: any;
+            value: any;
+            record: T extends Table<infer U extends Data> ? U : never;
+            index: number;
+            column: Column<T extends Table<infer U extends Data> ? U : never>;
+        }) => void;
+    }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">> & Omit<Omit<Readonly<{
         emptyText?: any;
         expandIcon?: Slot<RenderExpandIconProps<any> | undefined> | undefined;
         title?: any;
@@ -339,7 +347,15 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
         customFilterIcon?: any;
         customFilterDropdown?: any;
         default: any;
-    }> & Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>, "default">;
+    }>, "bodyCell"> & Readonly<{
+        bodyCell?: (props: {
+            text: any;
+            value: any;
+            record: T extends Table<infer U extends Data> ? U : never;
+            index: number;
+            column: Column<T extends Table<infer U extends Data> ? U : never>;
+        }) => void;
+    }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">;
     emit: {};
 }>) => VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
@@ -464,6 +480,8 @@ declare type _FormProps = Pick<Partial<FormProps>, 'colon' | 'disabled' | 'hideR
 
 declare type FP<T extends Record<string, any>> = Partial<T & Pick<Base, 'valueFormatter' | 'componentContainer' | 'modelName'> & AllowedComponentProps>;
 
+export declare const getInitProps: (field: Field) => Record<string, any>;
+
 export declare type Grid = boolean | (RowProps & {});
 
 export declare const INJECT_CONFIG: {
@@ -724,7 +742,7 @@ declare type RangePickerSlots = CompSlot<'dateRender' | 'renderExtraFooter' | 's
 export declare type RenderComponentType = Component<VModelProps & PathProps>;
 
 export declare type RequiredComponentVars = {
-    'pro-table': PP<TableProps & Pick<ProTableProps, 'control' | 'searchFormConfig' | 'immediateSearch' | 'addIndexColumn'>>;
+    'pro-table': PP<TableProps & Pick<ProTableProps, 'control' | 'searchFormConfig' | 'immediateSearch' | 'addIndexColumn' | 'tableContainer'>>;
     'pro-form': PP<Omit<ProFormProps, 'form' | 'grid'> & {
         grid: Exclude<Grid, undefined | boolean>;
     }>;

package/es/index.js

@@ -1,10 +1,10 @@
 import "./antd-vue-pro.css";
 import _sfc_main from "./form/index.js";
-import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, useFields, useForm, useFormData } from "./form/index.js";
+import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, getInitProps, useFields, useForm, useFormData } from "./form/index.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
-import { _ as _sfc_main$1 } from "./component-provider/index-DXPHmG1H.js";
-import { I } from "./component-provider/index-DXPHmG1H.js";
+import { _ as _sfc_main$1 } from "./component-provider/index-D8NF18a1.js";
+import { I } from "./component-provider/index-D8NF18a1.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);
@@ -38,6 +38,7 @@ export {
   SlotComponent,
   TeleportComponentNamePrefix,
   index as default,
+  getInitProps,
   useFields,
   useForm,
   useFormData,

package/es/table/index.js

@@ -1,8 +1,8 @@
 import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, toValue, useAttrs, renderList, withModifiers, inject, useSlots, onMounted, normalizeClass, isRef, createSlots, normalizeProps, guardReactiveProps, nextTick, reactive } from "vue";
-import { I as INJECT_CONFIG, g as getObject, c as camelizeProperties } from "../component-provider/index-DXPHmG1H.js";
+import { I as INJECT_CONFIG, g as getObject, c as camelizeProperties } from "../component-provider/index-D8NF18a1.js";
 import _sfc_main$9, { ContainerFragment as _sfc_main$a, useForm } from "../form/index.js";
 import { Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
-import { p as pick, c as cloneDeep } from "../vendor/utils/lodash-es-B2uQdS28.js";
+import { p as pick, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 import { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
 import { tableProps } from "ant-design-vue/es/table";
 const _export_sfc = (sfc, props) => {
@@ -23,9 +23,9 @@ const _hoisted_1$3 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render$2(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$3, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$3, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { d: "M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z" }, null, -1)
-  ]));
+  ])]);
 }
 const DownOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render", _sfc_render$2]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
@@ -35,9 +35,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     form: {},
     layout: { default: "grid" },
     expand: { type: [Boolean, Object], default: true },
-    searchButton: { default: void 0 },
-    resetButton: { default: void 0 },
-    expandButton: { default: void 0 },
+    searchButton: { type: [Object, Function], default: void 0 },
+    resetButton: { type: [Object, Function], default: void 0 },
+    expandButton: { type: [Object, Function], default: void 0 },
     class: {},
     style: {}
   },
@@ -150,54 +150,57 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(_sfc_main$9), mergeProps(layoutProps.value, {
-        form: _ctx.form,
-        class: "search-form transition"
+        form: __props.form,
+        class: "pro-table_search-form transition"
       }), {
         default: withCtx(() => [
-          createVNode(unref(Space), { align: "start" }, {
+          createVNode(unref(Space), {
+            align: "start",
+            class: "pro-table_search-form_button-group"
+          }, {
             default: withCtx(() => [
               renderSlot(_ctx.$slots, "reset-button", { onClick: onReset }, () => [
-                _ctx.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.resetButton), {
+                __props.resetButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.resetButton), {
                   key: 0,
                   onClick: onReset
                 })) : (openBlock(), createBlock(unref(Button), {
                   key: 1,
+                  class: "pro-table_search-form_reset-button",
                   onClick: onReset
                 }, {
-                  default: withCtx(() => _cache[0] || (_cache[0] = [
+                  default: withCtx(() => [..._cache[0] || (_cache[0] = [
                     createTextVNode("重置", -1)
-                  ])),
-                  _: 1,
-                  __: [0]
+                  ])]),
+                  _: 1
                 }))
               ], true),
               renderSlot(_ctx.$slots, "search-button", { onClick: onSearch }, () => [
-                _ctx.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.searchButton), {
+                __props.searchButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.searchButton), {
                   key: 0,
                   onClick: onSearch
                 })) : (openBlock(), createBlock(unref(Button), {
                   key: 1,
+                  class: "pro-table_search-form_search-button",
                   type: "primary",
                   "html-type": "submit",
                   onClick: onSearch
                 }, {
-                  default: withCtx(() => _cache[1] || (_cache[1] = [
+                  default: withCtx(() => [..._cache[1] || (_cache[1] = [
                     createTextVNode(" 查询 ", -1)
-                  ])),
-                  _: 1,
-                  __: [1]
+                  ])]),
+                  _: 1
                 }))
               ], true),
               renderSlot(_ctx.$slots, "expand-button", { onClick: changeExpandStatus }, () => [
                 showExpandToggle.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                  _ctx.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.expandButton), {
+                  __props.expandButton ? (openBlock(), createBlock(resolveDynamicComponent(__props.expandButton), {
                     key: 0,
                     "expand-status": expandStatus.value,
                     onClick: changeExpandStatus
                   }, null, 8, ["expand-status"])) : (openBlock(), createBlock(unref(Button), {
                     key: 1,
                     type: "link",
-                    class: "expand-toggle-button",
+                    class: "pro-table_search-form_expand-toggle-button",
                     onClick: changeExpandStatus
                   }, {
                     default: withCtx(() => [
@@ -220,7 +223,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-a5f1b551"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-0bb2bc70"]]);
 function useModel(props, name, options) {
   const eventName = `onUpdate:${name}`;
   const emitUpdate = props[eventName];
@@ -240,7 +243,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     const { token } = theme.useToken();
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: "search-form-container",
+        class: "pro-table_search-form-container",
         style: normalizeStyle({ backgroundColor: unref(token).colorBgContainer })
       }, [
         renderSlot(_ctx.$slots, "default", {}, void 0, true)
@@ -248,14 +251,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-727c8aba"]]);
+const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-c385cd54"]]);
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "DefaultTableContainer",
   setup(__props) {
     const { token } = theme.useToken();
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: "table-container",
+        class: "pro-table_table-container",
         style: normalizeStyle({ backgroundColor: unref(token).colorBgContainer })
       }, [
         renderSlot(_ctx.$slots, "default", {}, void 0, true)
@@ -263,7 +266,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-185690a3"]]);
+const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-ac3cdb51"]]);
 const _sfc_main$4 = {};
 const _hoisted_1$2 = {
   focusable: "false",
@@ -275,9 +278,9 @@ const _hoisted_1$2 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render$1(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$2, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$2, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { 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" }, null, -1)
-  ]));
+  ])]);
 }
 const ColumnHeightOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["render", _sfc_render$1]]);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
@@ -308,12 +311,12 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             "selected-keys": unref(size) ? [unref(size)] : [],
             items: sizeOptions,
             onClick: onSizeChange
-          }, null, 8, ["selected-keys", "items"])
+          }, null, 8, ["selected-keys"])
         ]),
         default: withCtx(() => [
           createVNode(unref(Button), {
             type: "text",
-            class: "size-control-button"
+            class: "pro-table_size-control_button"
           }, {
             default: withCtx(() => [
               createVNode(ColumnHeightOutlined)
@@ -326,7 +329,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-b7eded53"]]);
+const SizeControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-0df8d4ae"]]);
 const _sfc_main$2 = {};
 const _hoisted_1$1 = {
   focusable: "false",
@@ -338,9 +341,9 @@ const _hoisted_1$1 = {
   viewBox: "64 64 896 896"
 };
 function _sfc_render(_ctx, _cache) {
-  return openBlock(), createElementBlock("svg", _hoisted_1$1, _cache[0] || (_cache[0] = [
+  return openBlock(), createElementBlock("svg", _hoisted_1$1, [..._cache[0] || (_cache[0] = [
     createElementVNode("path", { d: "M880.1 154H143.9c-24.5 0-39.8 26.7-27.5 48L349 597.4V838c0 17.7 14.2 32 31.8 32h262.4c17.6 0 31.8-14.3 31.8-32V597.4L907.7 202c12.2-21.3-3.1-48-27.6-48zM603.4 798H420.6V642h182.9v156zm9.6-236.6l-9.5 16.6h-183l-9.5-16.6L212.7 226h598.6L613 561.4z" }, null, -1)
-  ]));
+  ])]);
 }
 const FilterOutlined = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -408,61 +411,58 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         placement: "bottomRight"
       }, {
         overlay: withCtx(() => [
-          createElementVNode("div", null, [
-            createVNode(unref(Menu), {
-              style: { "min-width": "100px", "max-height": "500px", "overflow-y": "scroll" },
-              selectable: false
-            }, {
-              default: withCtx(() => [
-                (openBlock(), createBlock(unref(MenuItem), { key: 0 }, {
+          createVNode(unref(Menu), {
+            style: { "min-width": "100px", "max-height": "500px", "overflow-y": "scroll" },
+            selectable: false
+          }, {
+            default: withCtx(() => [
+              (openBlock(), createBlock(unref(MenuItem), { key: 0 }, {
+                default: withCtx(() => [
+                  createElementVNode("div", null, [
+                    createVNode(unref(Checkbox), {
+                      checked: checkAll.value,
+                      indeterminate: indeterminate.value,
+                      onChange: onCheckAllChange
+                    }, {
+                      default: withCtx(() => [..._cache[2] || (_cache[2] = [
+                        createTextVNode(" 全选 ", -1)
+                      ])]),
+                      _: 1
+                    }, 8, ["checked", "indeterminate"])
+                  ])
+                ]),
+                _: 1
+              })),
+              createVNode(unref(MenuDivider)),
+              (openBlock(true), createElementBlock(Fragment, null, renderList(checkedColumnsOptions.value, (item) => {
+                return openBlock(), createBlock(unref(MenuItem), {
+                  key: item.value,
+                  onClick: ($event) => checkColumnsMenuItemClick(item.value)
+                }, {
                   default: withCtx(() => [
-                    createElementVNode("div", null, [
-                      createVNode(unref(Checkbox), {
-                        checked: checkAll.value,
-                        indeterminate: indeterminate.value,
-                        onChange: onCheckAllChange
-                      }, {
-                        default: withCtx(() => _cache[2] || (_cache[2] = [
-                          createTextVNode(" 全选 ", -1)
-                        ])),
-                        _: 1,
-                        __: [2]
-                      }, 8, ["checked", "indeterminate"])
-                    ])
+                    createVNode(unref(Checkbox), {
+                      checked: checkedColumnKeys.value.includes(item.value)
+                    }, {
+                      default: withCtx(() => [
+                        createElementVNode("div", {
+                          onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+                          }, ["stop"]))
+                        }, toDisplayString(item.label), 1)
+                      ]),
+                      _: 2
+                    }, 1032, ["checked"])
                   ]),
-                  _: 1
-                })),
-                createVNode(unref(MenuDivider)),
-                (openBlock(true), createElementBlock(Fragment, null, renderList(checkedColumnsOptions.value, (item) => {
-                  return openBlock(), createBlock(unref(MenuItem), {
-                    key: item.value,
-                    onClick: ($event) => checkColumnsMenuItemClick(item.value)
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(unref(Checkbox), {
-                        checked: checkedColumnKeys.value.includes(item.value)
-                      }, {
-                        default: withCtx(() => [
-                          createElementVNode("div", {
-                            onClick: _cache[0] || (_cache[0] = withModifiers(() => {
-                            }, ["stop"]))
-                          }, toDisplayString(item.label), 1)
-                        ]),
-                        _: 2
-                      }, 1032, ["checked"])
-                    ]),
-                    _: 2
-                  }, 1032, ["onClick"]);
-                }), 128))
-              ]),
-              _: 1
-            })
-          ])
+                  _: 2
+                }, 1032, ["onClick"]);
+              }), 128))
+            ]),
+            _: 1
+          })
         ]),
         default: withCtx(() => [
           createVNode(unref(Button), {
             type: "text",
-            class: "column-control-button"
+            class: "pro-table_column-control_button"
           }, {
             default: withCtx(() => [
               createVNode(FilterOutlined)
@@ -475,18 +475,24 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-cdcab425"]]);
-const _hoisted_1 = { class: "pro-table-header" };
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-49bb3de5"]]);
+const _hoisted_1 = { class: "pro-table_header" };
 const _hoisted_2 = {
   key: 0,
-  style: { "flex": "1" }
+  class: "pro-table_header_button-bar"
 };
 const _hoisted_3 = {
   key: 1,
-  style: { "margin-left": "12px" }
+  class: "pro-table_header_toolbar"
+};
+const _hoisted_4 = {
+  key: 2,
+  class: "pro-table_header_size-control"
+};
+const _hoisted_5 = {
+  key: 3,
+  class: "pro-table_header_column-control"
 };
-const _hoisted_4 = { key: 2 };
-const _hoisted_5 = { key: 3 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "ProTable", inheritAttrs: false },
   __name: "BaseTable",
@@ -497,7 +503,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     immediateSearch: { type: Boolean, default: void 0 },
     control: { type: [Boolean, Object], default: void 0 },
     searchFormConfig: { default: void 0 },
-    tableContainer: { default: DefaultTableContainer }
+    tableContainer: { type: [Object, Function, Boolean], default: void 0 }
   },
   setup(__props) {
     const props = __props;
@@ -506,10 +512,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableProperties = Object.keys(tableProps());
     const injectAttrs = pick(injectProps, tableProperties);
     const computedSearchFormConfig = computed(() => {
+      var _a, _b;
+      const container = ((_a = props.searchFormConfig) == null ? void 0 : _a.container) ?? ((_b = injectProps.searchFormConfig) == null ? void 0 : _b.container) ?? DefaultSearchFormContainer;
       return {
-        container: DefaultSearchFormContainer,
         ...injectProps.searchFormConfig,
-        ...getObject(props.searchFormConfig)
+        ...getObject(props.searchFormConfig),
+        container: container ? container : void 0
       };
     });
     const attrs = useAttrs();
@@ -549,7 +557,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       _search();
     };
     const computedTableProps = computed(() => {
-      return { ...injectAttrs, ...tableAttrs.value, onChange: void 0 };
+      return {
+        ...injectAttrs,
+        ...tableAttrs.value,
+        pagination: void 0,
+        onChange: void 0
+      };
+    });
+    const computedTableContainer = computed(() => {
+      const container = props.tableContainer ?? injectProps.tableContainer ?? DefaultTableContainer;
+      return container ? container : void 0;
     });
     const indexColumn = {
       title: "序号",
@@ -557,19 +574,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       width: 80,
       customRender: ({ index }) => index + 1
     };
-    const computedColumns = computed(() => [
-      ...props.addIndexColumn ?? injectProps.addIndexColumn ? [indexColumn] : [],
-      ...(tableAttrs.value.columns ?? (columns == null ? void 0 : columns.value) ?? []).flatMap(
-        (item, index) => {
-          if (item.key) return [{ ...item, key: item.key }];
-          if (item.dataIndex) {
-            const dataIndexKey = Array.isArray(item.dataIndex) ? item.dataIndex.join(".") : item.dataIndex;
-            return [{ ...item, key: dataIndexKey }];
+    const computedColumns = computed(
+      () => [
+        ...props.addIndexColumn ?? injectProps.addIndexColumn ? [indexColumn] : [],
+        ...(tableAttrs.value.columns ?? (columns == null ? void 0 : columns.value) ?? []).flatMap(
+          (item, index) => {
+            if (item.key) return [{ ...item, key: item.key }];
+            if (item.dataIndex) {
+              const dataIndexKey = Array.isArray(item.dataIndex) ? item.dataIndex.join(".") : item.dataIndex;
+              return [{ ...item, key: dataIndexKey }];
+            }
+            return [{ ...item, key: index }];
           }
-          return [{ ...item, key: index }];
-        }
-      )
-    ]);
+        )
+      ]
+    );
     const visibleComputedColumns = computed(() => {
       return computedColumns.value.filter((item) => !item.hidden);
     });
@@ -627,7 +646,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["component"])) : createCommentVNode("", true),
-        createVNode(unref(_sfc_main$a), { component: _ctx.tableContainer }, {
+        createVNode(unref(_sfc_main$a), { component: computedTableContainer.value }, {
           default: withCtx(() => [
             createElementVNode("div", _hoisted_1, [
               unref(buttonBarSlot) ? (openBlock(), createElementBlock("div", _hoisted_2, [
@@ -650,7 +669,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])) : createCommentVNode("", true)
             ]),
             renderSlot(_ctx.$slots, "table", {}, () => [
-              createVNode(unref(Table), mergeProps({ class: "pro-table-content" }, computedTableProps.value, {
+              createVNode(unref(Table), mergeProps({ class: "pro-table_content" }, computedTableProps.value, {
                 size: unref(size),
                 loading: unref(loading),
                 columns: visibleComputedColumns.value,
@@ -675,7 +694,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7b0601fa"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-54982423"]]);
 const getDefaultPageParam = () => ({ current: 1, pageSize: 10, total: 0 });
 const pageParamProperty = ["current", "pageSize", "total"];
 const useTable = (params) => {

package/es/vendor/utils/{lodash-es-B2uQdS28.js → lodash-es-p6jau26B.js}

@@ -81,10 +81,10 @@ function isFunction(value) {
   return tag == funcTag$2 || tag == genTag$1 || tag == asyncTag || tag == proxyTag;
 }
 var coreJsData = root["__core-js_shared__"];
-var maskSrcKey = function() {
+var maskSrcKey = (function() {
   var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || "");
   return uid ? "Symbol(src)_1." + uid : "";
-}();
+})();
 function isMasked(func) {
   return !!maskSrcKey && maskSrcKey in func;
 }
@@ -127,7 +127,7 @@ function getNative(object, key) {
 }
 var WeakMap = getNative(root, "WeakMap");
 var objectCreate = Object.create;
-var baseCreate = /* @__PURE__ */ function() {
+var baseCreate = /* @__PURE__ */ (function() {
   function object() {
   }
   return function(proto) {
@@ -142,7 +142,7 @@ var baseCreate = /* @__PURE__ */ function() {
     object.prototype = void 0;
     return result;
   };
-}();
+})();
 function apply(func, thisArg, args) {
   switch (args.length) {
     case 0:
@@ -186,14 +186,14 @@ function constant(value) {
     return value;
   };
 }
-var defineProperty = function() {
+var defineProperty = (function() {
   try {
     var func = getNative(Object, "defineProperty");
     func({}, "", {});
     return func;
   } catch (e) {
   }
-}();
+})();
 var baseSetToString = !defineProperty ? identity : function(func, string) {
   return defineProperty(func, "toString", {
     "configurable": true,
@@ -303,9 +303,9 @@ function baseIsArguments(value) {
 var objectProto$8 = Object.prototype;
 var hasOwnProperty$7 = objectProto$8.hasOwnProperty;
 var propertyIsEnumerable$1 = objectProto$8.propertyIsEnumerable;
-var isArguments = baseIsArguments(/* @__PURE__ */ function() {
+var isArguments = baseIsArguments(/* @__PURE__ */ (function() {
   return arguments;
-}()) ? baseIsArguments : function(value) {
+})()) ? baseIsArguments : function(value) {
   return isObjectLike(value) && hasOwnProperty$7.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
 };
 function stubFalse() {
@@ -334,7 +334,7 @@ var freeExports$1 = typeof exports == "object" && exports && !exports.nodeType &
 var freeModule$1 = freeExports$1 && typeof module == "object" && module && !module.nodeType && module;
 var moduleExports$1 = freeModule$1 && freeModule$1.exports === freeExports$1;
 var freeProcess = moduleExports$1 && freeGlobal.process;
-var nodeUtil = function() {
+var nodeUtil = (function() {
   try {
     var types = freeModule$1 && freeModule$1.require && freeModule$1.require("util").types;
     if (types) {
@@ -343,7 +343,7 @@ var nodeUtil = function() {
     return freeProcess && freeProcess.binding && freeProcess.binding("util");
   } catch (e) {
   }
-}();
+})();
 var nodeIsTypedArray = nodeUtil && nodeUtil.isTypedArray;
 var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray;
 var objectProto$7 = Object.prototype;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.0.12",
+  "version": "2.0.14",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",
@@ -36,8 +36,10 @@
     "url": "https://github.com/dufan3715/pro-components/issues"
   },
   "devDependencies": {
+    "@types/lodash-es": "^4.17.12",
     "ant-design-vue": "^4",
     "lodash-es": "^4.17.21",
+    "scroll-into-view-if-needed": "^3.1.0",
     "vue": "^3.5.18",
     "vue-component-type-helpers": "^3.0.1"
   },