@qin-ui/antdv-next-pro 1.0.2 → 1.0.3

package/es/antdv-next-pro.css

@@ -10,11 +10,11 @@
 .pro-table_search-form .transition[data-v-37368080] {
   transition: all 0.25s;
 }
-.pro-table_search-form-container[data-v-8f67830d] {
+.pro-table_search-form-container[data-v-f115fbbe] {
   margin-bottom: 24px;
   padding: 24px;
 }
-.pro-table_table-container[data-v-02fe26ae] {
+.pro-table_table-container[data-v-bdd22db3] {
   flex: 1;
   padding: 24px 24px 0;
 }
@@ -36,23 +36,23 @@
 .pro-table_column-control_button[data-v-246b0faf] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-270ae6c9] {
+.pro-table_header[data-v-a5d71b88] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-270ae6c9]:empty {
+.pro-table_header[data-v-a5d71b88]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-270ae6c9] {
+.pro-table_header + .pro-table_header_content[data-v-a5d71b88] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-270ae6c9] {
+.pro-table_header_button-bar[data-v-a5d71b88] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-270ae6c9] {
+.pro-table_header_toolbar[data-v-a5d71b88] {
   margin-left: 12px;
 }
-.pro-table[data-v-270ae6c9] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-a5d71b88] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/component-provider/{index-B-Yy-eoc.js → index-Cy8dTKpN.js}

@@ -60,7 +60,7 @@ const INJECT_CONFIG = {
       style: { width: "100%" }
     }
   },
-  "input-opt": {
+  "input-otp": {
     injectionKey: Symbol(""),
     default: {}
   },
@@ -118,7 +118,7 @@ const INJECT_CONFIG = {
   },
   switch: {
     injectionKey: Symbol(""),
-    default: { modelName: "checked" }
+    default: { modelProp: "checked" }
   },
   slider: {
     injectionKey: Symbol(""),

package/es/component-provider/index.js

@@ -1,4 +1,4 @@
-import { a, _ } from "./index-B-Yy-eoc.js";
+import { a, _ } from "./index-Cy8dTKpN.js";
 export {
   a as INJECT_CONFIG,
   _ as default

package/es/form/{index-DnjfDQC_.js → index-DShboSl2.js}

@@ -1,8 +1,8 @@
-import { defineComponent, provide, inject, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, renderSlot, toValue, computed, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
+import { defineComponent, provide, computed, inject, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, renderSlot, toValue, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
 import { FormItem, Row, Table, Form, Input, TextArea, InputSearch, InputPassword, InputNumber, InputOTP, Select, Cascader, DatePicker, DateRangePicker, TimePicker, TimeRangePicker, CheckboxGroup, RadioGroup, Switch, Slider, TreeSelect, Transfer, Col } from "antdv-next";
 import { useDisabledContextProvider, useDisabledContext } from "antdv-next/dist/config-provider/DisabledContext";
 import "antdv-next/dist/config-provider/SizeContext";
-import { I as InjectionFormKey, a as INJECT_CONFIG, c as camelizeProperties, b as InjectionPathKey, g as getObject, u as useForm$1, d as useFields$1, e as useFormRef$1 } from "../component-provider/index-B-Yy-eoc.js";
+import { I as InjectionFormKey, a as INJECT_CONFIG, c as camelizeProperties, b as InjectionPathKey, g as getObject, u as useForm$1, d as useFields$1, e as useFormRef$1 } from "../component-provider/index-Cy8dTKpN.js";
 import { i as isPlainObject, t as toPath, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const tableProps = () => Table.props || {};
 const gridItemProps = () => Row.props || {};
@@ -17,6 +17,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     provide(InjectionFormKey, __props.form);
     const { formData, fields, setFormRef } = __props.form;
+    const _fields = computed(() => fields.value);
     const config = INJECT_CONFIG["pro-form"];
     const { grid: _injectGrid, ...injectAttrs } = inject(
       config.injectionKey,
@@ -39,7 +40,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       }, mergeProps(injectAttrs, unref(camelizeProperties)(_ctx.$attrs)), { class: "pro-form" }), {
         default: withCtx(() => [
           createVNode(unref(_sfc_main$3), {
-            fields: toValue(unref(fields)),
+            fields: _fields.value,
             grid: __props.grid
           }, null, 8, ["fields", "grid"]),
           renderSlot(_ctx.$slots, "default")
@@ -93,7 +94,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     field: {}
   },
   setup(__props) {
-    const formItemPropKeys = Object.keys(formItemProps()).concat(["container"]);
+    const formItemPropKeys = Object.keys(formItemProps());
     const gridItemPropKeys = Object.keys(gridItemProps());
     const props = __props;
     const config = INJECT_CONFIG["pro-form-item"];
@@ -104,11 +105,12 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       const componentProps = { slots: {} };
       const formItemSlots = {};
       if (isPlainObject(props.field)) {
-        const { path, name, fields, className, style, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, ...rest } = props.field;
+        const { path, name, fields, formItemClass, formItemStyle, formItemContainer, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, ...rest } = props.field;
         const {
           class: injectClassName,
           style: injectStyle,
           span: injectSpan,
+          formItemContainer: injectFormItemContainer,
           xs,
           sm,
           md,
@@ -122,8 +124,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         formItemProps2 = mergeProps(
           injectRest,
           { class: injectClassName, style: injectStyle },
-          { class: toValue(className), style: toValue(style) }
+          { class: toValue(formItemClass), style: toValue(formItemStyle) }
         );
+        formItemProps2.container = formItemContainer ?? injectFormItemContainer;
         Object.keys(rest).forEach((k) => {
           if (gridItemPropKeys.includes(k)) {
             gridItemProps2[k] = rest[k];
@@ -332,21 +335,26 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         component: __props.component,
         type: attrs.type
       });
+      const modelPropName = attrs.modelProp ?? initProps.modelProp ?? "value";
       const mergedProps = mergeProps(
         initProps,
         attrs,
-        { class: attrs.componentClassName, style: attrs.componentStyle },
-        { class: initProps.componentClassName, style: initProps.componentStyle },
+        { class: attrs.componentClass, style: attrs.componentStyle },
+        { class: initProps.componentClass, style: initProps.componentStyle },
         { disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
-        { modelName: attrs.modelName ?? initProps.modelName ?? "value" }
+        { modelProp: modelPropName }
       );
-      const { valueFormatter, modelName, slots, componentClassName, componentStyle, componentContainer, ...rest } = mergedProps;
-      const bindAttrs = omit(rest, [modelName, `onUpdate:${modelName}`]);
+      const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, ...rest } = mergedProps;
+      const modelBindingProp = modelProp ?? "value";
+      const bindAttrs = omit(rest, [
+        modelBindingProp,
+        `onUpdate:${modelBindingProp}`
+      ]);
       return {
         attrs: bindAttrs,
         slots,
         componentContainer,
-        modelName,
+        modelProp: modelBindingProp,
         valueFormatter
       };
     });
@@ -370,8 +378,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           is.value ? (openBlock(), createBlock(resolveDynamicComponent(is.value), mergeProps({ key: 0 }, groupedAttrs.value.attrs, {
             ref_key: "componentRef",
             ref: componentRef,
-            [`${groupedAttrs.value.modelName}`]: value.value,
-            [`onUpdate:${groupedAttrs.value.modelName}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
+            [`${groupedAttrs.value.modelProp}`]: value.value,
+            [`onUpdate:${groupedAttrs.value.modelProp}`]: _cache[0] || (_cache[0] = ($event) => value.value = $event),
             path: __props.path
           }), createSlots({ _: 2 }, [
             renderList(groupedAttrs.value.slots, (slot, name) => {

package/es/form/index.js

@@ -1,5 +1,5 @@
-import { c, _, b, C, a, F, d, T, _ as _2, g, e, u, f } from "./index-DnjfDQC_.js";
-import { I, b as b2, f as f2 } from "../component-provider/index-B-Yy-eoc.js";
+import { c, _, b, C, a, F, d, T, _ as _2, g, e, u, f } from "./index-DShboSl2.js";
+import { I, b as b2, f as f2 } from "../component-provider/index-Cy8dTKpN.js";
 export {
   c as BaseField,
   _ as BaseForm,

package/es/index.d.ts

@@ -159,12 +159,12 @@ export declare interface Base<D extends Data = Data> {
      * @description 字段formItem样式属性
      * @example { marginBottom: '8px', padding: '12px' }
      */
-    style?: CSSProperties;
+    formItemStyle?: CSSProperties;
     /**
      * @description 字段formItem样式类名
      * @example 'custom-form-item' | 'required-field'
      */
-    className?: string;
+    formItemClass?: string;
     /**
      * @description 嵌套子字段配置
      * @example [{ key: 'firstName', label: '名' }, { key: 'lastName', label: '姓' }]
@@ -179,7 +179,7 @@ export declare interface Base<D extends Data = Data> {
      * @description 字段formItem容器包裹组件
      * @example (props, ctx) => h('div', { class: 'custom-container' }, ctx.slots.default?.())
      */
-    container?: ContainerComponent;
+    formItemContainer?: ContainerComponent;
     /**
      * @description 字段component样式属性
      * @example { width: '100%', borderColor: '#d9d9d9' }
@@ -189,7 +189,7 @@ export declare interface Base<D extends Data = Data> {
      * @description 字段component样式类名
      * @example 'custom-input' | 'error-input'
      */
-    componentClassName?: string;
+    componentClass?: string;
     /**
      * @description 字段component容器包裹组件
      * @example (props, ctx) => h('div', { class: 'input-wrapper' }, ctx.slots.default?.())
@@ -203,7 +203,7 @@ export declare interface Base<D extends Data = Data> {
     /**
      * @description 组件v-model双向绑定更新属性名，默认'value'
      */
-    modelName?: string;
+    modelProp?: string;
     /**
      * @description 以data-form-item-开始的属性名将会被渲染至formItem的dom节点
      * @example { 'data-form-item-test': 'test-value' }
@@ -348,7 +348,7 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
             index: number;
             column: Column<T extends Table<infer U extends Data> ? U : never>;
         }) => void;
-    }> & Readonly<Partial<Record<"table" | "toolbar" | "search-form" | "button-bar", Slot>>>, "default">> & Omit<Omit<Readonly<{
+    }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">> & Omit<Omit<Readonly<{
         default?: (() => any) | undefined;
         title?: ((data: readonly AnyObject[]) => any) | undefined;
         footer?: ((data: readonly AnyObject[]) => any) | undefined;
@@ -387,7 +387,7 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
             index: number;
             column: Column<T extends Table<infer U extends Data> ? U : never>;
         }) => void;
-    }> & Readonly<Partial<Record<"table" | "toolbar" | "search-form" | "button-bar", Slot>>>, "default">;
+    }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">;
     emit: ((evt: "update:size", value: ButtonSize) => void) & ((evt: "update:loading", value: boolean) => void);
 }>) => VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;
@@ -511,7 +511,7 @@ declare type FormItemInstance = InstanceType<typeof FormItem>;
 
 declare type _FormProps = Pick<Partial<FormProps>, 'colon' | 'disabled' | 'labelAlign' | 'labelCol' | 'labelWrap' | 'name' | 'wrapperCol'>;
 
-declare type FP<T extends Record<string, any>> = Partial<T & Pick<Base, 'valueFormatter' | 'componentContainer' | 'modelName'> & AllowedComponentProps>;
+declare type FP<T extends Record<string, any>> = Partial<T & Pick<Base, 'valueFormatter' | 'componentContainer' | 'modelProp' | 'componentClass' | 'componentStyle'> & AllowedComponentProps>;
 
 export declare const getInitProps: (field: Field) => Record<string, any>;
 
@@ -533,7 +533,7 @@ declare type MaybeRefOrComputedRef<T = any> = MaybeRef<T> | ComputedRef<T>;
 /**
  * @description 不支持响应式的属性名
  */
-declare type NotSupportedRefOrGetterProps = 'component' | 'container' | 'componentContainer' | 'valueFormatter' | 'fields' | 'slots' | 'modelName';
+declare type NotSupportedRefOrGetterProps = 'component' | 'formItemContainer' | 'componentContainer' | 'valueFormatter' | 'fields' | 'slots' | 'modelProp';
 
 declare type Option_2 = {
     label: string;
@@ -695,13 +695,13 @@ export declare type RequiredComponentVars = {
     'pro-form': PP<Omit<ProFormProps, 'form' | 'grid'> & {
         grid: Exclude<Grid, undefined | boolean>;
     }>;
-    'pro-form-item': PP<FormItemProps & Pick<ColProps, 'span' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'> & Pick<Base, 'container'>>;
+    'pro-form-item': PP<FormItemProps & Pick<ColProps, 'span' | 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl'> & Pick<Base, 'formItemContainer'>>;
     'input': FP<InputProps>;
     'textarea': FP<TextAreaProps>;
     'input-password': FP<InputProps>;
     'input-search': FP<InputProps>;
     'input-number': FP<InputNumberProps>;
-    'input-opt': FP<InputOTPProps>;
+    'input-otp': FP<InputOTPProps>;
     'select': FP<SelectProps>;
     'cascader': FP<CascaderProps>;
     'date-picker': FP<DatePickerProps>;

package/es/index.js

@@ -1,8 +1,8 @@
 import "./antdv-next-pro.css";
-import { _ as _sfc_main } from "./form/index-DnjfDQC_.js";
-import { c, b, C, a, F, d, T, g, e, u, f } from "./form/index-DnjfDQC_.js";
-import { _ as _sfc_main$1 } from "./component-provider/index-B-Yy-eoc.js";
-import { a as a2, I, b as b2, f as f2 } from "./component-provider/index-B-Yy-eoc.js";
+import { _ as _sfc_main } from "./form/index-DShboSl2.js";
+import { c, b, C, a, F, d, T, g, e, u, f } from "./form/index-DShboSl2.js";
+import { _ as _sfc_main$1 } from "./component-provider/index-Cy8dTKpN.js";
+import { a as a2, I, b as b2, f as f2 } from "./component-provider/index-Cy8dTKpN.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 const withInstall = (comp) => {

package/es/table/index.js

@@ -2,8 +2,8 @@ import { createElementBlock, openBlock, createElementVNode, defineComponent, ref
 import { Space, Button, theme, useConfig, Dropdown, Menu, Checkbox, Table } from "antdv-next";
 import "antdv-next/dist/config-provider/DisabledContext";
 import "antdv-next/dist/config-provider/SizeContext";
-import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-DnjfDQC_.js";
-import { a as INJECT_CONFIG, g as getObject, c as camelizeProperties, h as useTable$1 } from "../component-provider/index-B-Yy-eoc.js";
+import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-DShboSl2.js";
+import { a as INJECT_CONFIG, g as getObject, c as camelizeProperties, h as useTable$1 } from "../component-provider/index-Cy8dTKpN.js";
 import { p as pick } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
@@ -227,34 +227,40 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "DefaultSearchFormContainer",
   setup(__props) {
     const { token } = theme.useToken();
-    return (_ctx, _cache) => {
+    const bgColor = computed(() => {
       var _a;
+      return (_a = token.value) == null ? void 0 : _a.colorBgContainer;
+    });
+    return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "pro-table_search-form-container",
-        style: normalizeStyle({ backgroundColor: (_a = unref(token).value) == null ? void 0 : _a.colorBgContainer })
+        style: normalizeStyle({ backgroundColor: bgColor.value })
       }, [
         renderSlot(_ctx.$slots, "default", {}, void 0, true)
       ], 4);
     };
   }
 });
-const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-8f67830d"]]);
+const DefaultSearchFormContainer = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-f115fbbe"]]);
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "DefaultTableContainer",
   setup(__props) {
     const { token } = theme.useToken();
-    return (_ctx, _cache) => {
+    const bgColor = computed(() => {
       var _a;
+      return (_a = token.value) == null ? void 0 : _a.colorBgContainer;
+    });
+    return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "pro-table_table-container",
-        style: normalizeStyle({ backgroundColor: (_a = unref(token).value) == null ? void 0 : _a.colorBgContainer })
+        style: normalizeStyle({ backgroundColor: bgColor.value })
       }, [
         renderSlot(_ctx.$slots, "default", {}, void 0, true)
       ], 4);
     };
   }
 });
-const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-02fe26ae"]]);
+const DefaultTableContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__scopeId", "data-v-bdd22db3"]]);
 const _sfc_main$4 = {};
 const _hoisted_1$2 = {
   focusable: "false",
@@ -671,7 +677,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-270ae6c9"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a5d71b88"]]);
 const useTable = useTable$1;
 export {
   BaseTable as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antdv-next-pro",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "基于 antdv-next 的二次封装组件",
   "type": "module",
   "module": "es/index.js",