@qin-ui/antd-vue-pro 2.1.5 → 2.1.7

package/es/antd-vue-pro.css

@@ -1,13 +1,13 @@
-.pro-table_search-form[data-v-41da0f82] .ant-form-item {
+.pro-table_search-form[data-v-fffc2a28] [class*='-form-item'] {
   margin: 0;
 }
-.pro-table_search-form_expand-toggle-button[data-v-41da0f82] {
+.pro-table_search-form_expand-toggle-button[data-v-fffc2a28] {
   display: flex;
   align-items: center;
   padding: 0;
   padding-left: 4px;
 }
-.pro-table_search-form .transition[data-v-41da0f82] {
+.pro-table_search-form .transition[data-v-fffc2a28] {
   transition: all 0.25s;
 }
 .pro-table_search-form-container[data-v-c385cd54] {
@@ -36,23 +36,23 @@
 .pro-table_column-control_button[data-v-d503f78a] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-291baca6] {
+.pro-table_header[data-v-0e17ddec] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-291baca6]:empty {
+.pro-table_header[data-v-0e17ddec]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-291baca6] {
+.pro-table_header + .pro-table_header_content[data-v-0e17ddec] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-291baca6] {
+.pro-table_header_button-bar[data-v-0e17ddec] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-291baca6] {
+.pro-table_header_toolbar[data-v-0e17ddec] {
   margin-left: 12px;
 }
-.pro-table[data-v-291baca6] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-0e17ddec] [class*='-pagination'] [class*='-pagination-total-text'] {
   flex: 1;
 }

package/es/component-provider/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, provide, renderSlot } from "vue";
-import { g as getObject } from "../core/index-BrBzu6aj.js";
-const getPopupContainer = (triggerNode) => triggerNode.closest(".ant-form");
+import { g as getObject } from "../core/index-BWMfavD1.js";
+const getPopupContainer = (triggerNode) => triggerNode.closest("form[class*='-form']");
 const INJECT_COMPONENTS = Symbol("INJECT_COMPONENTS");
 const INJECT_CONFIG = {
   "pro-table": {

package/es/core/{index-BrBzu6aj.js → index-BWMfavD1.js}

@@ -210,7 +210,7 @@ function useForm(...args) {
   if (args.length === 1) {
     root = args[0];
   } else if (args.length >= 2) {
-    initFormData = args[0];
+    initFormData = args[0] ?? {};
     initFields = args[1];
     root = args[2] ?? root;
   }

package/es/form/index.js

@@ -6,8 +6,8 @@ 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, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
 import { INJECT_CONFIG, getInjectConfig, INJECT_COMPONENTS } from "../component-provider/index.js";
-import { I as InjectionFormKey, c as camelizeProperties, a as InjectionPathKey, g as getObject, u as useForm$1, b as useFields$1, d as useFormRef$1 } from "../core/index-BrBzu6aj.js";
-import { e } from "../core/index-BrBzu6aj.js";
+import { I as InjectionFormKey, c as camelizeProperties, a as InjectionPathKey, g as getObject, u as useForm$1, b as useFields$1, d as useFormRef$1 } from "../core/index-BWMfavD1.js";
+import { e } from "../core/index-BWMfavD1.js";
 import { i as isPlainObject, t as toPath, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },
@@ -241,7 +241,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
                                   key: 0,
                                   grid: field.grid ?? __props.grid,
                                   fields: field.fields,
-                                  disabled: field.disabled
+                                  disabled: toValue(field.disabled)
                                 }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$2), mergeProps({
                                   key: 1,
                                   ref_for: true,
@@ -343,7 +343,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const groupedAttrs = computed(() => {
       const initProps = getInitProps({
         component: __props.component,
-        type: attrs.type
+        picker: attrs.picker
       });
       const mergedProps = mergeProps(
         initProps,

package/es/index.d.ts

@@ -124,7 +124,16 @@ declare type AllowStringKey<T, Prefix extends string = ''> = {
 /**
  * @type {Object} Base - 基础公共字段类型
  */
-export declare interface Base<D extends Data = Data> {
+export declare type Base<D extends Data = Data> = BaseWithFields<D> | BaseWithoutFields<D>;
+
+declare interface BaseColumn<D extends Data = Data> {
+    key?: Path<D>;
+    dataIndex?: Path<D> | Path<D>[];
+    children?: BaseColumn<D>[];
+    [key: string]: any;
+}
+
+declare type BaseCommon<D extends Data = Data> = {
     /**
      * @description 字段标识namePath, 同name
      * @example 'name' | 'age' | 'sex' | ...
@@ -134,6 +143,10 @@ export declare interface Base<D extends Data = Data> {
      * @description 字段是否隐藏
      */
     hidden?: boolean;
+    /**
+     * @description 字段是否禁用
+     */
+    disabled?: boolean;
     /**
      * @description 字段中文名称，支持字符串或组件
      * @example '姓名' | '年龄' | '性别' | () => h('span', '自定义标签')
@@ -161,16 +174,6 @@ export declare interface Base<D extends Data = Data> {
      * @example 'custom-form-item' | 'required-field'
      */
     formItemClass?: string;
-    /**
-     * @description 嵌套子字段配置
-     * @example [{ key: 'firstName', label: '名' }, { key: 'lastName', label: '姓' }]
-     */
-    fields?: Fields<D>;
-    /**
-     * @description 网格布局属性，true表示使用默认网格布局，针对具有嵌套字段的字段
-     * @example boolean | { gutter: 24 }
-     */
-    grid?: Grid;
     /**
      * @description 字段formItem容器包裹组件
      * @example (props, ctx) => h('div', { class: 'custom-container' }, ctx.slots.default?.())
@@ -181,48 +184,12 @@ export declare interface Base<D extends Data = Data> {
      * @example { 'data-form-item-test': 'test-value', 'aria-label': 'name' }
      */
     formItemDataAttrs?: Record<string, string>;
-    /**
-     * @description 字段component样式属性
-     * @example { width: '100%', borderColor: '#d9d9d9' }
-     */
-    componentStyle?: CSSProperties;
-    /**
-     * @description 字段component样式类名
-     * @example 'custom-input' | 'error-input'
-     */
-    componentClass?: string;
-    /**
-     * @description 字段component容器包裹组件
-     * @example (props, ctx) => h('div', { class: 'input-wrapper' }, ctx.slots.default?.())
-     */
-    componentContainer?: ContainerComponent;
-    /**
-     * @description 字段值处理函数，在onUpdateValue前执行，函数返回值将作为更新值，也可设置get和set函数，用于处理字段值
-     * @example (val) => val?.trim()
-     */
-    valueFormatter?: ValueFormatter;
-    /**
-     * @description 组件v-model双向绑定更新属性名，默认'value'
-     */
-    modelProp?: string;
-    /**
-     * @description 将属性附加到表单组件的 DOM 节点
-     * @example { 'data-test': 'input-value', 'aria-label': 'name' }
-     */
-    componentDataAttrs?: Record<string, string>;
     /**
      * @description 额外的自定义属性，不会被当作组件参数，仅用做给字段添加标识属性等功能
      * @example { group: 'group-1' }
      */
     extraProps?: Record<string, any>;
-}
-
-declare interface BaseColumn<D extends Data = Data> {
-    key?: Path<D>;
-    dataIndex?: Path<D> | Path<D>[];
-    children?: BaseColumn<D>[];
-    [key: string]: any;
-}
+};
 
 export declare type BaseComponentMap = {
     'input': typeof Input;
@@ -286,6 +253,60 @@ export declare const BaseForm: <F extends Form<any> = Form>(__VLS_props: NonNull
 
 export declare const BaseFormItem: DefineComponent<Props_4, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Props_4> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 
+declare type BaseWithFields<D extends Data = Data> = BaseCommon<D> & {
+    /**
+     * @description 嵌套子字段配置
+     * @example [{ key: 'firstName', label: '名' }, { key: 'lastName', label: '姓' }]
+     */
+    fields: Fields<D>;
+    /**
+     * @description 网格布局属性，true表示使用默认网格布局，针对具有嵌套字段的字段
+     * @example boolean | { gutter: 24 }
+     */
+    grid?: Grid;
+    component?: never;
+    componentStyle?: never;
+    componentClass?: never;
+    componentContainer?: never;
+    valueFormatter?: never;
+    modelProp?: never;
+    componentDataAttrs?: never;
+};
+
+declare type BaseWithoutFields<D extends Data = Data> = BaseCommon<D> & {
+    fields?: undefined;
+    grid?: never;
+    /**
+     * @description 字段component样式属性
+     * @example { width: '100%', borderColor: '#d9d9d9' }
+     */
+    componentStyle?: CSSProperties;
+    /**
+     * @description 字段component样式类名
+     * @example 'custom-input' | 'error-input'
+     */
+    componentClass?: string;
+    /**
+     * @description 字段component容器包裹组件
+     * @example (props, ctx) => h('div', { class: 'input-wrapper' }, ctx.slots.default?.())
+     */
+    componentContainer?: ContainerComponent;
+    /**
+     * @description 字段值处理函数，在onUpdateValue前执行，函数返回值将作为更新值，也可设置get和set函数，用于处理字段值
+     * @example (val) => val?.trim()
+     */
+    valueFormatter?: ValueFormatter;
+    /**
+     * @description 组件v-model双向绑定更新属性名，默认'value'
+     */
+    modelProp?: string;
+    /**
+     * @description 将属性附加到表单组件的 DOM 节点
+     * @example { 'data-test': 'input-value', 'aria-label': 'name' }
+     */
+    componentDataAttrs?: Record<string, string>;
+};
+
 declare type ButtonProps = {
     onClick: () => void;
 };
@@ -449,7 +470,7 @@ declare type ExtendWithAny<D> = {
  * @description 字段配置类型，包含所有字段属性和响应式支持
  * @template D - 数据对象类型
  */
-export declare type Field<C extends ComponentName = ComponentName, D extends Data = Data> = FieldTypeMap<D>[C];
+export declare type Field<C extends ComponentName = ComponentName, D extends Data = Data> = FieldTypeMap<D>[C] | WithFields<D>;
 
 declare type FieldFindBy<D extends Data, F extends BaseField_2<D> = BaseField_2<D>> = (field: Readonly<F>) => boolean;
 
@@ -948,7 +969,9 @@ export declare type VModelProps<T = any> = {
     'onUpdate:value'?: (val: T) => void;
 };
 
-declare type WithCommon<T, D extends Data = Data> = WithRef<T & Omit<FormItemProps, 'label'> & ColProps & Base<D>>;
+declare type WithCommon<T, D extends Data = Data> = WithRef<WithCommonBase<T> & BaseWithoutFields<D>>;
+
+declare type WithCommonBase<T = unknown> = T & Omit<FormItemProps, 'label'> & ColProps;
 
 /**
  * @description 自动从 Vue 组件提取 Props 和 Slots，并加上公共表单字段属性
@@ -959,6 +982,8 @@ declare type WithComponent<T extends abstract new (...args: any) => any, D exten
     slots?: ComponentSlots<T>;
 } & Omit<ComponentProps<T>, keyof VNodeProps>, D>;
 
+declare type WithFields<D extends Data = Data> = WithRef<WithCommonBase & BaseWithFields<D>>;
+
 /**
  * @description 为对象属性添加响应式支持的类型
  * @template T - 原始类型

package/es/index.js

@@ -5,7 +5,7 @@ import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";
 import { INJECT_COMPONENTS, INJECT_CONFIG, ensureInjectConfig, getInjectConfig } from "./component-provider/index.js";
-import { I, a, e } from "./core/index-BrBzu6aj.js";
+import { I, a, e } from "./core/index-BWMfavD1.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);

package/es/table/index.js

@@ -3,7 +3,7 @@ import { INJECT_CONFIG } from "../component-provider/index.js";
 import _sfc_main$9, { ContainerFragment as _sfc_main$a } from "../form/index.js";
 import { Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { p as pick } from "../vendor/utils/lodash-es-p6jau26B.js";
-import { g as getObject, c as camelizeProperties, f as useTable$1 } from "../core/index-BrBzu6aj.js";
+import { g as getObject, c as camelizeProperties, f as useTable$1 } from "../core/index-BWMfavD1.js";
 import { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
 import { tableProps } from "ant-design-vue/es/table";
 const _export_sfc = (sfc, props) => {
@@ -68,7 +68,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       expandStatus.value = false;
       if (formRef.value && __props.expand) {
         const formEl = formRef.value.$el;
-        const formItemsEl = formEl.querySelectorAll(".ant-form-item>[path]");
+        const formItemsEl = formEl.querySelectorAll(
+          "[class*='-form-item'] > [path]"
+        );
         const observer = new IntersectionObserver(
           (entries) => {
             expandStatus.value = entries.some((e) => {
@@ -102,7 +104,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         const proFormEl = (_a = formRef.value) == null ? void 0 : _a.$el;
         const { height = 0 } = ((_b = proFormEl == null ? void 0 : proFormEl.getBoundingClientRect) == null ? void 0 : _b.call(proFormEl)) || {};
         proFormHeight.value = height;
-        rowHeight = (_e = (_d = (_c = proFormEl == null ? void 0 : proFormEl.querySelector(".ant-form-item")) == null ? void 0 : _c.getBoundingClientRect) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.height;
+        rowHeight = (_e = (_d = (_c = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _c.getBoundingClientRect) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.height;
       },
       { flush: "post", immediate: true }
     );
@@ -223,7 +225,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-41da0f82"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-fffc2a28"]]);
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "DefaultSearchFormContainer",
   setup(__props) {
@@ -688,7 +690,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-291baca6"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0e17ddec"]]);
 const useTable = useTable$1;
 export {
   BaseTable as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",