@qin-ui/antd-vue-pro 1.1.3 → 1.1.5

package/README.md

@@ -188,10 +188,10 @@ ant-design-vue ui组件库form组件的二次封装
 
 + UseForm
 
-  自定义hook，由两个hook（useFormData、useFields）内聚产生。接收两个参数（initFormData, initFields）返回一个对象
+  自定义hook，由数个hook（useFormData、useFields、useFormRef）内聚产生。接收两个参数（initFormData, initFields）返回一个对象
 
   ```typescript
-  type Form = ReturnType<UseFields> & ReturnType<UseFormData>;
+  type Form = ReturnType<UseFields> & ReturnType<UseFormData> & ReturnType<UseFormRef>;
   
   type UseForm = <T extends FormData>(
     initFormData?: T,
@@ -254,14 +254,11 @@ import {
   useForm,
   ProComponentProvider,
   type ComponentVars,
-  type ProFormInstance,
   type Field,
   type Fields,
 } from '@qin-ui/antd-vue-pro/src';
 import { h, ref } from 'vue';
 
-const proFormRef = ref<ProFormInstance | null>(null);
-
 const CodeContainer: Field['componentContainer'] = (p, ctx) => {
   return h(
     'div',
@@ -320,6 +317,7 @@ const initFields: Fields = [
 ];
 
 const form = useForm({}, initFields);
+const { formRef: proFormRef } = form
 
 const componentVars: ComponentVars = {
   input: { maxlength: 50, valueFormatter: val => val?.trim() },

package/es/form/{index-9d8a33fe.js → index-a2afc105.js}

@@ -15802,7 +15802,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       );
       const defaultProps = {
         validateFirst: true,
-        showFeedback: !field.fields
+        hideFeedback: field.fields
       };
       return {
         ...defaultProps,
@@ -15893,6 +15893,15 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const index_vue_vue_type_style_index_0_scoped_28824314_lang = "";
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-28824314"]]);
 const generateFieldMap = (fields, prePath = "", preFieldPath = "", fieldMap = {}) => {
   fields.forEach((field, index2) => {
     let path;
@@ -16031,10 +16040,15 @@ const useFormData = (initFormData) => {
   };
   return { formData, getFormData, setFormData, activePath, setActivePath };
 };
+const useFormRef = () => {
+  const formRef = ref();
+  return { formRef };
+};
 const useForm = (initFormData = {}, initFields = []) => {
   return {
     ...useFormData(initFormData),
-    ...useFields(initFields)
+    ...useFields(initFields),
+    ...useFormRef()
   };
 };
 const isFunctionString = (param) => {
@@ -16485,13 +16499,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   }
 });
 const index_vue_vue_type_style_index_0_scoped_060ffbee_lang = "";
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
 const BaseField = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-060ffbee"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{
@@ -16613,7 +16620,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         model: _formData.value
       }, { ...unref(injectAttrs), ..._ctx.$attrs }), {
         default: withCtx(() => [
-          createVNode(unref(_sfc_main$4), {
+          createVNode(unref(BaseFormItem), {
             fields: _fields.value,
             grid: _ctx.grid,
             disabled: _ctx.$attrs.disabled
@@ -16627,7 +16634,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 });
 export {
   AntdIcon as A,
-  BaseField as B,
+  BaseFormItem as B,
   COMPONENT_MAP as C,
   FORM_ITEM_SLOT_KEYS as F,
   RULE_TYPE_MAP as R,
@@ -16636,7 +16643,7 @@ export {
   _export_sfc as a,
   _sfc_main$2 as b,
   cloneDeep as c,
-  _sfc_main$4 as d,
+  BaseField as d,
   _sfc_main$1 as e,
   FORM_DATA as f,
   get$1 as g,

package/es/form/index.js

@@ -1,11 +1,11 @@
-import { l, B, d, i, C, b, f, F, k, R, e, j, U, h, _, m, p, n, s, q, u, r, t } from "./index-9d8a33fe.js";
+import { l, d, B, i, C, b, f, F, k, R, e, j, U, h, _, m, p, n, s, q, u, r, t } from "./index-a2afc105.js";
 import "vue";
 import "ant-design-vue";
 import "../component-provider/index.js";
 export {
   l as ArrowFunctionRegexp,
-  B as BaseField,
-  d as BaseFormItem,
+  d as BaseField,
+  B as BaseFormItem,
   i as COMMAND,
   C as COMPONENT_MAP,
   b as ContainerFragment,

package/es/index.d.ts

@@ -304,6 +304,8 @@ export declare interface Common<D extends FormData_2 = FormData_2> {
      * @example (val) => val?.trim()
      */
     valueFormatter?: (val: any) => any;
+    /** 是否隐藏校验错误信息 */
+    hideFeedback?: boolean;
     /** 以data-form-item-开头的属性将会被渲染至formItem的dom节点 */
     [key: `data-form-item-${string}`]: string;
     /** 以data-component-开头的属性将会被渲染至component的dom节点 */
@@ -1856,7 +1858,7 @@ export declare type FieldType = {
     } & Record<string, any>;
 };
 
-export declare type Form<D extends FormData_2 = FormData_2> = ReturnType<UseFormData<D>> & ReturnType<UseFields>;
+export declare type Form<D extends FormData_2 = FormData_2> = ReturnType<UseFormData<D>> & ReturnType<UseFields> & ReturnType<UseFormRef>;
 
 export declare const FORM_DATA: InjectionKey<Record<string, any>>;
 
@@ -2093,7 +2095,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     } | undefined;
                     readonly validateTrigger?: string | string[] | undefined;
                     readonly onSubmit?: ((e: Event) => void) | undefined;
-                    readonly form?: Form | undefined;
                     readonly layout?: string | undefined;
                     readonly labelWrap?: boolean | undefined;
                     readonly requiredMark?: "" | RequiredMark | undefined;
@@ -2109,6 +2110,7 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     readonly onFinish?: ((values: any) => void) | undefined;
                     readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                     readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+                    readonly form?: Form | undefined;
                     readonly activePath?: string | undefined;
                     "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
                     "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -2224,10 +2226,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         type: PropType<Fields>;
                         default: () => never[];
                     };
-                    form: {
-                        type: PropType<Form>;
-                        default: undefined;
-                    };
                     layout: {
                         type: PropType<string>;
                     };
@@ -2269,6 +2267,10 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     onValidate: {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     };
+                    form: {
+                        type: PropType<Form>;
+                        default: undefined;
+                    };
                     autoCommandDisabled: {
                         type: PropType<boolean>;
                         default: boolean;
@@ -2423,7 +2425,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         } | undefined;
                         readonly validateTrigger?: string | string[] | undefined;
                         readonly onSubmit?: ((e: Event) => void) | undefined;
-                        readonly form?: Form | undefined;
                         readonly layout?: string | undefined;
                         readonly labelWrap?: boolean | undefined;
                         readonly requiredMark?: "" | RequiredMark | undefined;
@@ -2439,6 +2440,7 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         readonly onFinish?: ((values: any) => void) | undefined;
                         readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                         readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+                        readonly form?: Form | undefined;
                         readonly activePath?: string | undefined;
                         "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
                         "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -2554,10 +2556,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                             type: PropType<Fields>;
                             default: () => never[];
                         };
-                        form: {
-                            type: PropType<Form>;
-                            default: undefined;
-                        };
                         layout: {
                             type: PropType<string>;
                         };
@@ -2599,6 +2597,10 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         onValidate: {
                             type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         };
+                        form: {
+                            type: PropType<Form>;
+                            default: undefined;
+                        };
                         autoCommandDisabled: {
                             type: PropType<boolean>;
                             default: boolean;
@@ -2769,7 +2771,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         } | undefined;
                         readonly validateTrigger?: string | string[] | undefined;
                         readonly onSubmit?: ((e: Event) => void) | undefined;
-                        readonly form?: Form | undefined;
                         readonly layout?: string | undefined;
                         readonly labelWrap?: boolean | undefined;
                         readonly requiredMark?: "" | RequiredMark | undefined;
@@ -2785,6 +2786,7 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         readonly onFinish?: ((values: any) => void) | undefined;
                         readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                         readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+                        readonly form?: Form | undefined;
                         readonly activePath?: string | undefined;
                         "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
                         "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -2900,10 +2902,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                             type: PropType<Fields>;
                             default: () => never[];
                         };
-                        form: {
-                            type: PropType<Form>;
-                            default: undefined;
-                        };
                         layout: {
                             type: PropType<string>;
                         };
@@ -2945,6 +2943,10 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         onValidate: {
                             type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                         };
+                        form: {
+                            type: PropType<Form>;
+                            default: undefined;
+                        };
                         autoCommandDisabled: {
                             type: PropType<boolean>;
                             default: boolean;
@@ -3121,7 +3123,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     } | undefined;
                     readonly validateTrigger?: string | string[] | undefined;
                     readonly onSubmit?: ((e: Event) => void) | undefined;
-                    readonly form?: Form | undefined;
                     readonly layout?: string | undefined;
                     readonly labelWrap?: boolean | undefined;
                     readonly requiredMark?: "" | RequiredMark | undefined;
@@ -3137,6 +3138,7 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     readonly onFinish?: ((values: any) => void) | undefined;
                     readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                     readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+                    readonly form?: Form | undefined;
                     readonly activePath?: string | undefined;
                     "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
                     "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -3252,10 +3254,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                         type: PropType<Fields>;
                         default: () => never[];
                     };
-                    form: {
-                        type: PropType<Form>;
-                        default: undefined;
-                    };
                     layout: {
                         type: PropType<string>;
                     };
@@ -3297,6 +3295,10 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     onValidate: {
                         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                     };
+                    form: {
+                        type: PropType<Form>;
+                        default: undefined;
+                    };
                     autoCommandDisabled: {
                         type: PropType<boolean>;
                         default: boolean;
@@ -3457,7 +3459,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                 } | undefined;
                 readonly validateTrigger?: string | string[] | undefined;
                 readonly onSubmit?: ((e: Event) => void) | undefined;
-                readonly form?: Form | undefined;
                 readonly layout?: string | undefined;
                 readonly labelWrap?: boolean | undefined;
                 readonly requiredMark?: "" | RequiredMark | undefined;
@@ -3473,6 +3474,7 @@ export declare const ProComponentProvider: SFCWithInstall<{
                 readonly onFinish?: ((values: any) => void) | undefined;
                 readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
                 readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+                readonly form?: Form | undefined;
                 readonly activePath?: string | undefined;
                 "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
                 "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -3588,10 +3590,6 @@ export declare const ProComponentProvider: SFCWithInstall<{
                     type: PropType<Fields>;
                     default: () => never[];
                 };
-                form: {
-                    type: PropType<Form>;
-                    default: undefined;
-                };
                 layout: {
                     type: PropType<string>;
                 };
@@ -3633,6 +3631,10 @@ export declare const ProComponentProvider: SFCWithInstall<{
                 onValidate: {
                     type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
                 };
+                form: {
+                    type: PropType<Form>;
+                    default: undefined;
+                };
                 autoCommandDisabled: {
                     type: PropType<boolean>;
                     default: boolean;
@@ -3795,7 +3797,6 @@ export declare const ProForm: SFCWithInstall<{
             } | undefined;
             readonly validateTrigger?: string | string[] | undefined;
             readonly onSubmit?: ((e: Event) => void) | undefined;
-            readonly form?: Form | undefined;
             readonly layout?: string | undefined;
             readonly labelWrap?: boolean | undefined;
             readonly requiredMark?: "" | RequiredMark | undefined;
@@ -3811,6 +3812,7 @@ export declare const ProForm: SFCWithInstall<{
             readonly onFinish?: ((values: any) => void) | undefined;
             readonly onFinishFailed?: ((errorInfo: ValidateErrorEntity<any>) => void) | undefined;
             readonly onValidate?: ((name: string | number | string[] | number[], status: boolean, errors: string[]) => void) | undefined;
+            readonly form?: Form | undefined;
             readonly activePath?: string | undefined;
             "onUpdate:formData"?: ((val: FormData_2) => any) | undefined;
             "onUpdate:activePath"?: ((val: string | undefined) => any) | undefined;
@@ -3926,10 +3928,6 @@ export declare const ProForm: SFCWithInstall<{
                 type: PropType<Fields>;
                 default: () => never[];
             };
-            form: {
-                type: PropType<Form>;
-                default: undefined;
-            };
             layout: {
                 type: PropType<string>;
             };
@@ -3971,6 +3969,10 @@ export declare const ProForm: SFCWithInstall<{
             onValidate: {
                 type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
             };
+            form: {
+                type: PropType<Form>;
+                default: undefined;
+            };
             autoCommandDisabled: {
                 type: PropType<boolean>;
                 default: boolean;
@@ -4108,10 +4110,6 @@ export declare const ProForm: SFCWithInstall<{
                 type: PropType<Fields>;
                 default: () => never[];
             };
-            form: {
-                type: PropType<Form>;
-                default: undefined;
-            };
             layout: {
                 type: PropType<string>;
             };
@@ -4153,6 +4151,10 @@ export declare const ProForm: SFCWithInstall<{
             onValidate: {
                 type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
             };
+            form: {
+                type: PropType<Form>;
+                default: undefined;
+            };
             autoCommandDisabled: {
                 type: PropType<boolean>;
                 default: boolean;
@@ -4320,10 +4322,6 @@ export declare const ProForm: SFCWithInstall<{
             type: PropType<Fields>;
             default: () => never[];
         };
-        form: {
-            type: PropType<Form>;
-            default: undefined;
-        };
         layout: {
             type: PropType<string>;
         };
@@ -4365,6 +4363,10 @@ export declare const ProForm: SFCWithInstall<{
         onValidate: {
             type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
         };
+        form: {
+            type: PropType<Form>;
+            default: undefined;
+        };
         autoCommandDisabled: {
             type: PropType<boolean>;
             default: boolean;
@@ -4506,10 +4508,6 @@ export declare const ProForm: SFCWithInstall<{
         type: PropType<Fields>;
         default: () => never[];
     };
-    form: {
-        type: PropType<Form>;
-        default: undefined;
-    };
     layout: {
         type: PropType<string>;
     };
@@ -4551,6 +4549,10 @@ export declare const ProForm: SFCWithInstall<{
     onValidate: {
         type: PropType<(name: string | number | string[] | number[], status: boolean, errors: string[]) => void>;
     };
+    form: {
+        type: PropType<Form>;
+        default: undefined;
+    };
     autoCommandDisabled: {
         type: PropType<boolean>;
         default: boolean;
@@ -6117,6 +6119,15 @@ export declare type UseFormData<D extends FormData_2 = FormData_2> = (initFormDa
 
 export declare const useFormData: UseFormData;
 
+/**
+ * @description useFormRef hook
+ * @returns {Object}
+ */
+export declare type UseFormRef = () => {
+    /** 表单组件实例引用Ref */
+    formRef: Ref<ProFormInstance | undefined>;
+};
+
 export declare const useInitProps: () => {
     getInitProps: (field: Field) => Record<string, any>;
 };

package/es/index.js

@@ -1,6 +1,6 @@
 import "./style.css";
-import { _ as _sfc_main } from "./form/index-9d8a33fe.js";
-import { l, B, d, i, C, b, f, F, k, R, e, j, U, h, m, p, n, s, q, u, r, t } from "./form/index-9d8a33fe.js";
+import { _ as _sfc_main } from "./form/index-a2afc105.js";
+import { l, d, B, i, C, b, f, F, k, R, e, j, U, h, m, p, n, s, q, u, r, t } from "./form/index-a2afc105.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";
@@ -26,8 +26,8 @@ const index = {
 };
 export {
   l as ArrowFunctionRegexp,
-  B as BaseField,
-  d as BaseFormItem,
+  d as BaseField,
+  B as BaseFormItem,
   i as COMMAND,
   C as COMPONENT_MAP,
   b as ContainerFragment,

package/es/style.css

@@ -1,3 +1,6 @@
+[data-v-28824314] .ant-form-item > [hideFeedback='true'] {
+  margin-bottom: 0;
+}
 .field-component[data-v-060ffbee]:not(.ant-switch) {
   width: 100%;
   min-width: 120px;

package/es/table/index.js

@@ -1,7 +1,7 @@
 import { createVNode, defineComponent, ref, onMounted, openBlock, createElementBlock, unref, normalizeStyle, createElementVNode, withCtx, createTextVNode, createBlock, toDisplayString, createCommentVNode, mergeModels, useModel, computed, watch, Fragment, renderList, withModifiers, renderSlot, useAttrs, useSlots, mergeProps, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Button, Space, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { useInjectProps, INJECT_KEYS } from "../component-provider/index.js";
-import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-9d8a33fe.js";
+import { A as AntdIcon, _ as _sfc_main$6, g as get, a as _export_sfc, o as omit, b as _sfc_main$7, c as cloneDeep, u as useForm } from "../form/index-a2afc105.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" };
 const ColumnHeightOutlinedSvg = ColumnHeightOutlined$2;
 function _objectSpread$2(target) {

package/package.json

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