@qin-ui/antdv-next-pro 1.1.6 → 1.1.8

package/es/component-provider/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, provide, renderSlot } from "vue";
-import { g as getObject } from "../core/index-BrBzu6aj.js";
+import { g as getObject } from "../core/index-BWMfavD1.js";
 const getPopupContainer = (triggerNode) => triggerNode.closest("form[class*='-form']");
 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-Br8U5Kva.js → index-CdBauDf0.js}

@@ -2,7 +2,7 @@ import { defineComponent, provide, computed, inject, useSlots, watchEffect, crea
 import { FormItem, Col, Table, Form, Transfer, TreeSelect, Slider, Switch, RadioGroup, CheckboxGroup, TimeRangePicker, TimePicker, DateRangePicker, DatePicker, Cascader, Select, AutoComplete, InputOTP, InputNumber, InputPassword, InputSearch, TextArea, Input, Row } from "antdv-next";
 import { useDisabledContextProvider, useDisabledContext } from "antdv-next/dist/config-provider/DisabledContext";
 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 { 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 { 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 = () => Col.props || {};
@@ -238,7 +238,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,
@@ -335,7 +335,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const groupedAttrs = computed(() => {
       const initProps = getInitProps({
         component: __props.component,
-        type: attrs.type
+        picker: attrs.picker
       });
       const modelPropName = attrs.modelProp ?? initProps.modelProp ?? "value";
       const mergedProps = mergeProps(

package/es/form/index.js

@@ -1,5 +1,5 @@
-import { c, _, b, a, F, d, T, e, _ as _2, h, f, u, g } from "./index-Br8U5Kva.js";
-import { I, a as a2, e as e2 } from "../core/index-BrBzu6aj.js";
+import { c, _, b, a, F, d, T, e, _ as _2, h, f, u, g } from "./index-CdBauDf0.js";
+import { I, a as a2, e as e2 } from "../core/index-BWMfavD1.js";
 export {
   c as BaseField,
   _ as BaseForm,

package/es/index.d.ts

@@ -128,7 +128,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' | ...
@@ -138,6 +147,10 @@ export declare interface Base<D extends Data = Data> {
      * @description 字段是否隐藏
      */
     hidden?: boolean;
+    /**
+     * @description 字段是否禁用
+     */
+    disabled?: boolean;
     /**
      * @description 字段中文名称，支持字符串或组件
      * @example '姓名' | '年龄' | '性别' | () => h('span', '自定义标签')
@@ -155,16 +168,6 @@ export declare interface Base<D extends Data = Data> {
      * ```
      */
     slots?: Partial<ComponentSlots<typeof FormItem>>;
-    /**
-     * @description 嵌套子字段配置
-     * @example [{ key: 'firstName', label: '名' }, { key: 'lastName', label: '姓' }]
-     */
-    fields?: Fields<D>;
-    /**
-     * @description 网格布局属性，true表示使用默认网格布局，针对具有嵌套字段的字段
-     * @example boolean | { gutter: 24 }
-     */
-    grid?: Grid;
     /**
      * @description 字段formItem样式属性
      * @example { marginBottom: '8px', padding: '12px' }
@@ -185,48 +188,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 将属性附加到表单组件的 DOM 节点
-     * @example { 'data-test': 'input-value', 'aria-label': 'name' }
-     */
-    componentDataAttrs?: Record<string, string>;
-    /**
-     * @description 字段值处理函数，在onUpdateValue前执行，函数返回值将作为更新值，也可设置get和set函数，用于处理字段值
-     * @example (val) => val?.trim()
-     */
-    valueFormatter?: ValueFormatter;
-    /**
-     * @description 组件v-model双向绑定更新属性名，默认'value'
-     */
-    modelProp?: 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;
@@ -293,6 +260,83 @@ 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;
+    /**
+     * @description 字段component样式属性
+     * @example { width: '100%', borderColor: '#d9d9d9' }
+     */
+    componentStyle?: never;
+    /**
+     * @description 字段component样式类名
+     * @example 'custom-input' | 'error-input'
+     */
+    componentClass?: never;
+    /**
+     * @description 字段component容器包裹组件
+     * @example (props, ctx) => h('div', { class: 'input-wrapper' }, ctx.slots.default?.())
+     */
+    componentContainer?: never;
+    /**
+     * @description 将属性附加到表单组件的 DOM 节点
+     * @example { 'data-test': 'input-value', 'aria-label': 'name' }
+     */
+    componentDataAttrs?: never;
+    /**
+     * @description 字段值处理函数，在onUpdateValue前执行，函数返回值将作为更新值，也可设置get和set函数，用于处理字段值
+     * @example (val) => val?.trim()
+     */
+    valueFormatter?: never;
+    /**
+     * @description 组件v-model双向绑定更新属性名，默认'value'
+     */
+    modelProp?: 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 将属性附加到表单组件的 DOM 节点
+     * @example { 'data-test': 'input-value', 'aria-label': 'name' }
+     */
+    componentDataAttrs?: Record<string, string>;
+    /**
+     * @description 字段值处理函数，在onUpdateValue前执行，函数返回值将作为更新值，也可设置get和set函数，用于处理字段值
+     * @example (val) => val?.trim()
+     */
+    valueFormatter?: ValueFormatter;
+    /**
+     * @description 组件v-model双向绑定更新属性名，默认'value'
+     */
+    modelProp?: string;
+};
+
 declare type ButtonProps = {
     onClick: () => void;
 };
@@ -474,9 +518,9 @@ 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] & {
     component?: C extends 'custom' ? FieldTypeMap<D>[C]['component'] : C;
-};
+}) | WithFields<D>;
 
 declare type FieldFindBy<D extends Data, F extends BaseField_2<D> = BaseField_2<D>> = (field: Readonly<F>) => boolean;
 
@@ -915,7 +959,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，并加上公共表单字段属性
@@ -923,8 +969,10 @@ declare type WithCommon<T, D extends Data = Data> = WithRef<T & Omit<FormItemPro
  * @template D - 数据对象类型
  */
 declare type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = WithCommon<{
-    slots?: ComponentSlots<T>;
-} & Omit<ComponentProps<T>, keyof VNodeProps>, D>;
+    slots?: Partial<ComponentSlots<T>>;
+} & Partial<Omit<ComponentProps<T>, keyof VNodeProps>>, D>;
+
+declare type WithFields<D extends Data = Data> = WithRef<WithCommonBase & BaseWithFields<D>>;
 
 /**
  * @description 为对象属性添加响应式支持的类型

package/es/index.js

@@ -1,7 +1,7 @@
 import "./antdv-next-pro.css";
-import { _ as _sfc_main } from "./form/index-Br8U5Kva.js";
-import { c, b, a, F, d, T, e, h, f, u, g } from "./form/index-Br8U5Kva.js";
-import { I, a as a2, e as e2 } from "./core/index-BrBzu6aj.js";
+import { _ as _sfc_main } from "./form/index-CdBauDf0.js";
+import { c, b, a, F, d, T, e, h, f, u, g } from "./form/index-CdBauDf0.js";
+import { I, a as a2, e as e2 } from "./core/index-BWMfavD1.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";

package/es/table/index.js

@@ -1,9 +1,9 @@
 import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, useModel, h, mergeModels, inject, useAttrs, useSlots, onMounted, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Space, Button, theme, useConfig, Dropdown, Menu, Checkbox, Table } from "antdv-next";
 import "antdv-next/dist/config-provider/DisabledContext";
-import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-Br8U5Kva.js";
+import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-CdBauDf0.js";
 import { INJECT_CONFIG } from "../component-provider/index.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 { p as pick } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;

package/package.json

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