pro-design-vue 1.0.0-rc.8 → 1.0.0

package/es/components/drawer/src/drawer.vue2.mjs

@@ -13,7 +13,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "drawer",
   props: {
     description: { type: String, required: false },
-    showFullscreen: { type: Boolean, required: false, default: true },
+    showFullscreen: { type: Boolean, required: false, default: false },
     defaultFullscreen: { type: Boolean, required: false },
     autofocus: { type: Boolean, required: false, default: false },
     closable: { type: Boolean, required: false, default: true },

package/es/components/drawer/src/drawer.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"drawer.vue2.mjs","sources":["../../../../../../packages/components/drawer/src/drawer.vue"],"sourcesContent":["<!--\n * @Author: shen\n * @Date: 2025-06-23 16:43:27\n * @LastEditors: shen\n * @LastEditTime: 2025-09-02 17:20:13\n * @Description:\n-->\n<script setup lang=\"ts\">\nimport type { DrawerProps } from 'ant-design-vue'\n\nimport { computed, ref } from 'vue'\nimport { Drawer } from 'ant-design-vue'\nimport { CloseOutlined, FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue'\nimport { ProButton } from '@pro-design-vue/components/button'\nimport { omitKeysAndUndefined } from '@pro-design-vue/utils'\nimport { useIsMobile, usePrefixCls } from '@pro-design-vue/hooks'\nexport interface Props extends DrawerProps {\n  description?: string\n  showFullscreen?: boolean\n  defaultFullscreen?: boolean\n}\ndefineOptions({\n  name: 'ProDrawer',\n})\n\nconst props = withDefaults(defineProps<Props>(), {\n  autofocus: false,\n  closable: true,\n  destroyOnClose: true,\n  getContainer: 'body',\n  mask: true,\n  maskClosable: true,\n  open: false,\n  showFullscreen: true,\n})\n\nconst emit = defineEmits<{ close: [e: Event]; fullScreen: [value: boolean] }>()\n\nconst prefixCls = usePrefixCls('drawer')\nconst { isMobile } = useIsMobile()\nconst fullscreen = ref(props.defaultFullscreen)\nconst hasFullscreen = computed(() => isMobile.value || fullscreen.value)\nconst drawerProps = computed(() =>\n  omitKeysAndUndefined(props, ['rootClassName', 'closable', 'onClose', 'title', 'width', 'height']),\n)\n\nconst width = computed(() => {\n  if (fullscreen.value) {\n    return '100%'\n  }\n  return props.width\n})\n\nconst height = computed(() => {\n  if (hasFullscreen.value) {\n    return '100%'\n  }\n  return props.height\n})\n\nconst handleClose = (e: Event) => {\n  fullscreen.value = props.defaultFullscreen\n  props['onUpdate:open']?.(false)\n  emit('close', e)\n}\n\nconst handleBtnClose = (e: Event) => {\n  handleClose(e)\n}\n\nconst handleFullScreen = () => {\n  fullscreen.value = !fullscreen.value\n  emit('fullScreen', fullscreen.value)\n}\n</script>\n\n<template>\n  <Drawer\n    v-bind=\"drawerProps\"\n    :root-class-name=\"`${prefixCls} ${rootClassName || ''}`\"\n    :closable=\"false\"\n    :width\n    :height\n    @close=\"handleClose\"\n  >\n    <template #title>\n      <slot name=\"title\">\n        <div :class=\"`${prefixCls}-title`\">{{ title }}</div>\n      </slot>\n      <slot name=\"description\">\n        <div :class=\"`${prefixCls}-description`\">{{ description }}</div>\n      </slot>\n    </template>\n    <template #extra>\n      <slot name=\"extra\" />\n      <ProButton\n        v-if=\"showFullscreen && !isMobile\"\n        :class=\"`${prefixCls}-fullscreen`\"\n        size=\"small\"\n        shape=\"circle\"\n        type=\"text\"\n        @click=\"handleFullScreen\"\n      >\n        <template #icon>\n          <FullscreenOutlined v-if=\"!fullscreen\" />\n          <FullscreenExitOutlined v-else />\n        </template>\n      </ProButton>\n      <ProButton\n        v-if=\"closable\"\n        :class=\"`${prefixCls}-close`\"\n        size=\"small\"\n        shape=\"circle\"\n        type=\"text\"\n        @click=\"handleBtnClose\"\n      >\n        <template #icon>\n          <CloseOutlined />\n        </template>\n      </ProButton>\n    </template>\n    <template #default>\n      <slot />\n    </template>\n\n    <template #footer v-if=\"$slots.footer\">\n      <slot name=\"footer\" />\n    </template>\n  </Drawer>\n</template>\n"],"names":["_createBlock","_unref","_mergeProps","rootClassName","_renderSlot","_createElementVNode","title","description","showFullscreen","closable","_createVNode","$slots"],"mappings":"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"}
+{"version":3,"file":"drawer.vue2.mjs","sources":["../../../../../../packages/components/drawer/src/drawer.vue"],"sourcesContent":["<!--\n * @Author: shen\n * @Date: 2025-06-23 16:43:27\n * @LastEditors: shen\n * @LastEditTime: 2025-09-24 16:34:05\n * @Description:\n-->\n<script setup lang=\"ts\">\nimport type { DrawerProps } from 'ant-design-vue'\n\nimport { computed, ref } from 'vue'\nimport { Drawer } from 'ant-design-vue'\nimport { CloseOutlined, FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue'\nimport { ProButton } from '@pro-design-vue/components/button'\nimport { omitKeysAndUndefined } from '@pro-design-vue/utils'\nimport { useIsMobile, usePrefixCls } from '@pro-design-vue/hooks'\nexport interface Props extends DrawerProps {\n  description?: string\n  showFullscreen?: boolean\n  defaultFullscreen?: boolean\n}\ndefineOptions({\n  name: 'ProDrawer',\n})\n\nconst props = withDefaults(defineProps<Props>(), {\n  autofocus: false,\n  closable: true,\n  destroyOnClose: true,\n  getContainer: 'body',\n  mask: true,\n  maskClosable: true,\n  open: false,\n  showFullscreen: false,\n})\n\nconst emit = defineEmits<{ close: [e: Event]; fullScreen: [value: boolean] }>()\n\nconst prefixCls = usePrefixCls('drawer')\nconst { isMobile } = useIsMobile()\nconst fullscreen = ref(props.defaultFullscreen)\nconst hasFullscreen = computed(() => isMobile.value || fullscreen.value)\nconst drawerProps = computed(() =>\n  omitKeysAndUndefined(props, ['rootClassName', 'closable', 'onClose', 'title', 'width', 'height']),\n)\n\nconst width = computed(() => {\n  if (fullscreen.value) {\n    return '100%'\n  }\n  return props.width\n})\n\nconst height = computed(() => {\n  if (hasFullscreen.value) {\n    return '100%'\n  }\n  return props.height\n})\n\nconst handleClose = (e: Event) => {\n  fullscreen.value = props.defaultFullscreen\n  props['onUpdate:open']?.(false)\n  emit('close', e)\n}\n\nconst handleBtnClose = (e: Event) => {\n  handleClose(e)\n}\n\nconst handleFullScreen = () => {\n  fullscreen.value = !fullscreen.value\n  emit('fullScreen', fullscreen.value)\n}\n</script>\n\n<template>\n  <Drawer\n    v-bind=\"drawerProps\"\n    :root-class-name=\"`${prefixCls} ${rootClassName || ''}`\"\n    :closable=\"false\"\n    :width\n    :height\n    @close=\"handleClose\"\n  >\n    <template #title>\n      <slot name=\"title\">\n        <div :class=\"`${prefixCls}-title`\">{{ title }}</div>\n      </slot>\n      <slot name=\"description\">\n        <div :class=\"`${prefixCls}-description`\">{{ description }}</div>\n      </slot>\n    </template>\n    <template #extra>\n      <slot name=\"extra\" />\n      <ProButton\n        v-if=\"showFullscreen && !isMobile\"\n        :class=\"`${prefixCls}-fullscreen`\"\n        size=\"small\"\n        shape=\"circle\"\n        type=\"text\"\n        @click=\"handleFullScreen\"\n      >\n        <template #icon>\n          <FullscreenOutlined v-if=\"!fullscreen\" />\n          <FullscreenExitOutlined v-else />\n        </template>\n      </ProButton>\n      <ProButton\n        v-if=\"closable\"\n        :class=\"`${prefixCls}-close`\"\n        size=\"small\"\n        shape=\"circle\"\n        type=\"text\"\n        @click=\"handleBtnClose\"\n      >\n        <template #icon>\n          <CloseOutlined />\n        </template>\n      </ProButton>\n    </template>\n    <template #default>\n      <slot />\n    </template>\n\n    <template #footer v-if=\"$slots.footer\">\n      <slot name=\"footer\" />\n    </template>\n  </Drawer>\n</template>\n"],"names":["_createBlock","_unref","_mergeProps","rootClassName","_renderSlot","_createElementVNode","title","description","showFullscreen","closable","_createVNode","$slots"],"mappings":"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"}

package/es/components/form/src/Form.d.ts

@@ -454,7 +454,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     validateTrigger: string | string[] | undefined;
     grid: boolean;
     dateFormatter: false | "string" | "number" | ((value: import("dayjs").Dayjs, fieldType: `${import("pro-design-vue").ProFieldType}`) => string | number) | undefined;
-    submitter: false | import("pro-design-vue").SubmitterProps<Record<string, any>> | undefined;
+    submitter: false | import("pro-design-vue").SubmitterProps<import("pro-design-vue").Entity> | undefined;
     showLoading: boolean;
     submitOnLoading: boolean;
     gridSubmitter: boolean;

package/es/components/form/src/base/BaseForm.d.ts

@@ -264,7 +264,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     validateTrigger: string | string[] | undefined;
     grid: boolean;
     dateFormatter: false | "string" | "number" | ((value: import("dayjs").Dayjs, fieldType: `${import("pro-design-vue").ProFieldType}`) => string | number) | undefined;
-    submitter: false | SubmitterProps<Record<string, any>> | undefined;
+    submitter: false | SubmitterProps<Entity> | undefined;
     showLoading: boolean;
     submitOnLoading: boolean;
     gridSubmitter: boolean;

package/es/components/form/src/base/BaseForm.mjs

@@ -1,15 +1,16 @@
-import { defineComponent, ref, computed, watch, createVNode, mergeProps, Teleport, onMounted, isVNode } from 'vue';
+import { defineComponent, ref, shallowRef, computed, watch, createVNode, mergeProps, Teleport, onMounted, isVNode } from 'vue';
 import { Form, Spin, Col, FormItem } from 'ant-design-vue';
 import { baseFormProps } from '../props.mjs';
 import { useProvideForm } from '../context/FormContext.mjs';
 import { useInitialValues } from '../hooks/useInitialValues.mjs';
 import { useLinkage } from '../hooks/useLinkage.mjs';
-import { useAction } from '../hooks/useAction.mjs';
+import { convertKeyInitialValue, transformKeySubmitValue, useAction } from '../hooks/useAction.mjs';
 import covertFormName from '../utils/namePath.mjs';
 import FormSlotsContextProvider from '../context/FormSlotsContext.mjs';
 import FormRowWrapper from '../components/FormRowWrapper.mjs';
 import FormItems from '../components/FormItems.mjs';
 import FormSubmitter from '../components/FormSubmitter.mjs';
+import transformer from '../utils/transformer.mjs';
 import { useMergedState } from '../../../../hooks/use-merged-state/index.mjs';
 import { usePrefixCls } from '../../../../hooks/use-prefix-cls/index.mjs';
 import { omitUndefined, omit } from '../../../../utils/omit.mjs';
@@ -32,6 +33,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     attrs
   }) {
     const mountedRef = ref(false);
+    const transformerMap = shallowRef(/* @__PURE__ */ new Map());
     const formRef = ref();
     const prefixCls = usePrefixCls("form");
     const formData = ref({});
@@ -40,7 +42,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.formKey) != null ? _a : requestFormCacheId.toString();
     });
-    const [loading, setloading] = useMergedState(false, {
+    const [loading, setLoading] = useMergedState(false, {
       value: computed(() => props.loading),
       onChange: (val) => {
         var _a;
@@ -85,8 +87,9 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       });
     };
     watch(() => props.items, () => {
-      var _a;
-      formItems.value = formatItems((_a = props.items) != null ? _a : []);
+      var _a, _b;
+      transformerMap.value = transformer((_a = props.items) != null ? _a : []);
+      formItems.value = formatItems((_b = props.items) != null ? _b : []);
     }, {
       immediate: true
     });
@@ -97,7 +100,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     } = useInitialValues(props);
     watch(initialValues, (newValues, oldValues) => {
       if (!isEqual(newValues, oldValues)) {
-        formData.value = cloneDeep(newValues);
+        formData.value = cloneDeep(convertKeyInitialValue(newValues, transformerMap.value));
         if (!props.request || props.requestAbort) {
           Promise.resolve().then(() => {
             hasInitial.value = false;
@@ -109,22 +112,22 @@ var BaseForm = /* @__PURE__ */ defineComponent({
     });
     const onValuesChange = debounce(() => {
       var _a;
-      (_a = props.onValuesChange) == null ? void 0 : _a.call(props, cloneDeep(formData.value));
+      (_a = props.onValuesChange) == null ? void 0 : _a.call(props, transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil));
     }, 200);
     const onFinish = async () => {
       if (!props.onFinish) return;
-      if (props.showLoading) {
+      if (props.submitOnLoading) {
         if (loading.value) return;
-        setloading(true);
+        setLoading(true);
       }
       try {
-        const finalValues = cloneDeep(formData.value);
+        const finalValues = transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil);
         await props.onFinish(finalValues);
       } catch (error) {
         console.log("\u{1F680} ~ onFinish ~ error:", error);
       } finally {
-        if (props.showLoading) {
-          setloading(false);
+        if (props.submitOnLoading) {
+          setLoading(false);
         }
       }
     };
@@ -142,6 +145,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       formData,
       initialValues,
       hasInitial,
+      transformerMap,
       onFinish,
       onReset: props.onReset,
       onFinishFailed: props.onFinishFailed
@@ -178,6 +182,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       }), null);
       if (submitterProps.value.teleport) {
         return createVNode(Teleport, {
+          "defer": true,
           "to": submitterProps.value.teleport
         }, _isSlot(dom) ? dom : {
           default: () => [dom]
@@ -189,8 +194,11 @@ var BaseForm = /* @__PURE__ */ defineComponent({
       var _a, _b, _c;
       mountedRef.value = true;
       requestFormCacheId += 1;
-      const finalValues = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true);
-      (_c = props.onInit) == null ? void 0 : _c.call(props, finalValues, action);
+      const finalValues = (_c = (_b = (_a = formRef.value) == null ? void 0 : _a.getFieldsValue) == null ? void 0 : _b.call(_a, true)) != null ? _c : {};
+      Promise.resolve().then(() => {
+        var _a2;
+        (_a2 = props.onInit) == null ? void 0 : _a2.call(props, transformKeySubmitValue(finalValues, transformerMap.value, props.omitNil), action);
+      });
     });
     useProvideForm({
       ...linkage,
@@ -237,7 +245,7 @@ var BaseForm = /* @__PURE__ */ defineComponent({
         "style": attrs.style
       }), {
         default: () => [createVNode(Spin, {
-          "spinning": requestLoading.value || props.submitOnLoading && loading.value
+          "spinning": props.showLoading && (requestLoading.value || loading.value)
         }, {
           default: () => [createVNode(FormRowWrapper, null, {
             default: () => [createVNode(FormItems, {

package/es/components/form/src/base/BaseForm.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"BaseForm.mjs","sources":["../../../../../../../packages/components/form/src/base/BaseForm.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-27 12:04:01\n * @LastEditors: shen\n * @LastEditTime: 2025-08-31 22:27:50\n * @Description:\n */\nimport type { ColProps, FormInstance } from 'ant-design-vue'\nimport type { Entity, ProFormItemType, ProFormPropsType, SubmitterProps } from '../type'\n\nimport { ref, computed, watch, onMounted, defineComponent, Teleport } from 'vue'\nimport { Col, Form, FormItem, Spin } from 'ant-design-vue'\nimport { cloneDeep, debounce, isEqual, isObject, omit, omitUndefined } from '@pro-design-vue/utils'\nimport { baseFormProps } from '../props'\nimport { useProvideForm } from '../context/FormContext'\nimport { useMergedState, usePrefixCls } from '@pro-design-vue/hooks'\nimport { useInitialValues } from '../hooks/useInitialValues'\nimport { useLinkage } from '../hooks/useLinkage'\nimport { useAction } from '../hooks/useAction'\nimport covertFormName from '../utils/namePath'\nimport FormSlotsContextProvider from '../context/FormSlotsContext'\nimport FormRowWrapper from '../components/FormRowWrapper'\nimport FormItems from '../components/FormItems'\nimport FormSubmitter from '../components/FormSubmitter'\n\nlet requestFormCacheId = 0\n\nexport default defineComponent({\n  name: 'BaseForm',\n  inheritAttrs: false,\n  props: {\n    ...baseFormProps(),\n  },\n  setup(props, { slots, expose, attrs }) {\n    // const loading = ref(false)\n    const mountedRef = ref(false)\n    const formRef = ref<FormInstance>()\n    const prefixCls = usePrefixCls('form')\n    const formData = ref<Entity>({})\n    const formItems = ref<ProFormItemType[]>([])\n    const formKey = computed(() => {\n      return props.formKey ?? requestFormCacheId.toString()\n    })\n\n    const [loading, setloading] = useMergedState<boolean | undefined>(false, {\n      value: computed(() => props.loading),\n      onChange: (val) => {\n        props.onLoadingChange?.(val!)\n      },\n    })\n\n    const formClass = computed(() => ({\n      [prefixCls]: true,\n      [`${attrs.class ?? ''}`]: true,\n    }))\n    const formProps = computed(() => {\n      return {\n        ...omitUndefined(\n          omit(props, [\n            'colProps',\n            'submitter',\n            'loading',\n            'showLoading',\n            'omitNil',\n            'grid',\n            'theme',\n            'customUi',\n            'gridSubmitter',\n            'requestAbort',\n            'isKeyPressSubmit',\n            'formKey',\n            'initialValues',\n            'rowProps',\n            'dateFormatter',\n            'params',\n            'readonly',\n            'readonlyProps',\n            'items',\n            'request',\n            'submitOnLoading',\n            'onLoadingChange',\n            'onFinish',\n            'onValuesChange',\n          ]),\n        ),\n        layout: props.layout ?? 'vertical',\n      }\n    })\n\n    const formatItems = (items: ProFormItemType[]): ProFormItemType[] => {\n      return items\n        .filter((originItem) => {\n          return !originItem.hidden\n        })\n        .sort((a, b) => {\n          if (b.order || a.order) {\n            return (b.order ?? 0) - (a.order ?? 0)\n          }\n          return 0\n        })\n        .map((originItem, index) => {\n          const name = covertFormName(originItem.name)\n          const key = originItem.key ?? (name ? (name ?? []).join('_') : index)\n          return omitUndefined<ProFormItemType>({\n            ...originItem,\n            originName: originItem.originName ?? originItem.name,\n            name,\n            key,\n          })\n        })\n        .filter((field) => {\n          return Boolean(field)\n        })\n    }\n\n    watch(\n      () => props.items,\n      () => {\n        formItems.value = formatItems(props.items ?? [])\n      },\n      {\n        immediate: true,\n      },\n    )\n\n    // watch(loading, () => {\n    //   props.onLoadingChange?.(loading.value)\n    // })\n\n    // watch(\n    //   () => props.loading,\n    //   (newVal) => {\n    //     loading.value = newVal\n    //   },\n    // )\n\n    const { initialValues, hasInitial, requestLoading } = useInitialValues(\n      props as ProFormPropsType,\n    )\n\n    watch(\n      initialValues,\n      (newValues, oldValues) => {\n        if (!isEqual(newValues, oldValues)) {\n          formData.value = cloneDeep(newValues)\n          if (!props.request || props.requestAbort) {\n            Promise.resolve().then(() => {\n              hasInitial.value = false\n            })\n          }\n        }\n      },\n      {\n        immediate: true,\n      },\n    )\n    const onValuesChange = debounce(() => {\n      props.onValuesChange?.(cloneDeep(formData.value))\n    }, 200)\n\n    const onFinish = async () => {\n      if (!props.onFinish) return\n      if (props.showLoading) {\n        if (loading.value) return\n        // loading.value = true\n        setloading(true)\n      }\n\n      try {\n        const finalValues = cloneDeep(formData.value)\n        await props.onFinish(finalValues)\n      } catch (error) {\n        console.log('🚀 ~ onFinish ~ error:', error)\n      } finally {\n        if (props.showLoading) {\n          // loading.value = false\n          setloading(false)\n        }\n      }\n    }\n\n    watch(\n      formData,\n      () => {\n        if (!hasInitial.value) {\n          onValuesChange()\n        }\n      },\n      {\n        deep: true,\n      },\n    )\n\n    const linkage = useLinkage()\n    const action = useAction({\n      props,\n      formRef,\n      formData,\n      initialValues,\n      hasInitial,\n      onFinish,\n      onReset: props.onReset,\n      onFinishFailed: props.onFinishFailed,\n    })\n\n    const submitterProps = computed<SubmitterProps>(() =>\n      typeof props.submitter === 'boolean' || !props.submitter\n        ? {}\n        : omit(props.submitter, ['colProps']),\n    )\n\n    const submitterColProps = computed<ColProps>(() => {\n      if (props.submitter === false || props.readonly) return {}\n      if (props.gridSubmitter) {\n        if (isObject(props.submitter) && isObject(props.submitter.colProps)) {\n          return { ...props.submitter.colProps }\n        }\n      }\n      return { span: 24 } as ColProps\n    })\n\n    const submitterNode = computed(() => {\n      if (props.submitter === false || props.readonly) return undefined\n      const submitButtonProps =\n        submitterProps.value.submitButtonProps === false\n          ? false\n          : {\n              loading: loading.value,\n              ...submitterProps.value.submitButtonProps,\n            }\n      const resetButtonProps =\n        submitterProps.value.resetButtonProps === false\n          ? false\n          : {\n              disabled: loading.value,\n              ...submitterProps.value.resetButtonProps,\n            }\n      const dom = (\n        <FormSubmitter\n          key=\"submitter\"\n          {...submitterProps.value}\n          submitButtonProps={submitButtonProps}\n          resetButtonProps={resetButtonProps}\n        />\n      )\n      if (submitterProps.value.teleport) {\n        return <Teleport to={submitterProps.value.teleport}>{dom}</Teleport>\n      }\n      return dom\n    })\n\n    onMounted(() => {\n      mountedRef.value = true\n      requestFormCacheId += 1\n      const finalValues = formRef.value?.getFieldsValue?.(true)\n      props.onInit?.(finalValues, action)\n    })\n\n    useProvideForm({\n      ...linkage,\n      action,\n      formKey,\n      mountedRef,\n      prefixCls,\n      initialValues,\n      formData,\n      hasInitial,\n      theme: computed(() => props.theme),\n      customUi: computed(() => props.customUi),\n      grid: computed(() => props.grid),\n      disabled: computed(() => props.disabled),\n      readonly: computed(() => props.readonly),\n      readonlyProps: computed(() => props.readonlyProps),\n      rowProps: computed(() => props.rowProps ?? { gutter: 16 }),\n      colProps: computed(() => props.colProps ?? { xs: 24 }),\n      formatItems,\n    })\n\n    expose({\n      ...action,\n    })\n    return () => (\n      <FormSlotsContextProvider value={{ ...slots }}>\n        <Form\n          ref={formRef}\n          {...formProps.value}\n          class={formClass.value}\n          model={formData.value}\n          style={attrs.style}\n        >\n          <Spin spinning={requestLoading.value || (props.submitOnLoading && loading.value)}>\n            <FormRowWrapper>\n              <FormItems list={formItems.value} />\n              {props.gridSubmitter && props.submitter !== false && (\n                <Col {...submitterColProps.value}>\n                  <FormItem label=\" \" colon={false} class={`${prefixCls}-submitter-form-item`}>\n                    {submitterNode.value}\n                  </FormItem>\n                </Col>\n              )}\n            </FormRowWrapper>\n            {!props.gridSubmitter && submitterNode.value}\n          </Spin>\n        </Form>\n      </FormSlotsContextProvider>\n    )\n  },\n})\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","requestFormCacheId","name","inheritAttrs","props","baseFormProps","setup","slots","expose","attrs","mountedRef","ref","formRef","prefixCls","usePrefixCls","formData","formItems","formKey","computed","loading","setloading","useMergedState","value","onChange","val","onLoadingChange","formClass","class","formProps","omitUndefined","omit","layout","formatItems","items","filter","originItem","hidden","sort","a","b","order","map","index","covertFormName","key","join","originName","field","Boolean","watch","immediate","initialValues","hasInitial","requestLoading","useInitialValues","newValues","oldValues","isEqual","cloneDeep","request","requestAbort","Promise","resolve","then","onValuesChange","debounce","onFinish","showLoading","finalValues","error","console","log","deep","linkage","useLinkage","action","useAction","onReset","onFinishFailed","submitterProps","submitter","submitterColProps","readonly","gridSubmitter","isObject","colProps","span","submitterNode","undefined","submitButtonProps","resetButtonProps","disabled","dom","_createVNode","FormSubmitter","_mergeProps","teleport","Teleport","default","onMounted","getFieldsValue","onInit","useProvideForm","theme","customUi","grid","readonlyProps","rowProps","gutter","xs","FormSlotsContextProvider","Form","style","Spin","submitOnLoading","FormRowWrapper","FormItems","Col","FormItem"],"mappings":"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"}
+{"version":3,"file":"BaseForm.mjs","sources":["../../../../../../../packages/components/form/src/base/BaseForm.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-27 12:04:01\n * @LastEditors: shen\n * @LastEditTime: 2025-09-26 10:11:32\n * @Description:\n */\nimport type { ColProps, FormInstance } from 'ant-design-vue'\nimport type {\n  Entity,\n  ProFormItemType,\n  ProFormPropsType,\n  SubmitterProps,\n  TransformerMapType,\n} from '../type'\n\nimport { ref, computed, watch, onMounted, defineComponent, Teleport, shallowRef } from 'vue'\nimport { Col, Form, FormItem, Spin } from 'ant-design-vue'\nimport { cloneDeep, debounce, isEqual, isObject, omit, omitUndefined } from '@pro-design-vue/utils'\nimport { baseFormProps } from '../props'\nimport { useProvideForm } from '../context/FormContext'\nimport { useMergedState, usePrefixCls } from '@pro-design-vue/hooks'\nimport { useInitialValues } from '../hooks/useInitialValues'\nimport { useLinkage } from '../hooks/useLinkage'\nimport { convertKeyInitialValue, transformKeySubmitValue, useAction } from '../hooks/useAction'\nimport covertFormName from '../utils/namePath'\nimport FormSlotsContextProvider from '../context/FormSlotsContext'\nimport FormRowWrapper from '../components/FormRowWrapper'\nimport FormItems from '../components/FormItems'\nimport FormSubmitter from '../components/FormSubmitter'\nimport transformer from '../utils/transformer'\n\nlet requestFormCacheId = 0\n\nexport default defineComponent({\n  name: 'BaseForm',\n  inheritAttrs: false,\n  props: {\n    ...baseFormProps(),\n  },\n  setup(props, { slots, expose, attrs }) {\n    const mountedRef = ref(false)\n    const transformerMap = shallowRef<TransformerMapType>(new Map())\n    const formRef = ref<FormInstance>()\n    const prefixCls = usePrefixCls('form')\n    const formData = ref<Entity>({})\n    const formItems = ref<ProFormItemType[]>([])\n    const formKey = computed(() => {\n      return props.formKey ?? requestFormCacheId.toString()\n    })\n\n    const [loading, setLoading] = useMergedState<boolean | undefined>(false, {\n      value: computed(() => props.loading),\n      onChange: (val) => {\n        props.onLoadingChange?.(val!)\n      },\n    })\n\n    const formClass = computed(() => ({\n      [prefixCls]: true,\n      [`${attrs.class ?? ''}`]: true,\n    }))\n    const formProps = computed(() => {\n      return {\n        ...omitUndefined(\n          omit(props, [\n            'colProps',\n            'submitter',\n            'loading',\n            'showLoading',\n            'omitNil',\n            'grid',\n            'theme',\n            'customUi',\n            'gridSubmitter',\n            'requestAbort',\n            'isKeyPressSubmit',\n            'formKey',\n            'initialValues',\n            'rowProps',\n            'dateFormatter',\n            'params',\n            'readonly',\n            'readonlyProps',\n            'items',\n            'request',\n            'submitOnLoading',\n            'onLoadingChange',\n            'onFinish',\n            'onValuesChange',\n          ]),\n        ),\n        layout: props.layout ?? 'vertical',\n      }\n    })\n\n    const formatItems = (items: ProFormItemType[]): ProFormItemType[] => {\n      return items\n        .filter((originItem) => {\n          return !originItem.hidden\n        })\n        .sort((a, b) => {\n          if (b.order || a.order) {\n            return (b.order ?? 0) - (a.order ?? 0)\n          }\n          return 0\n        })\n        .map((originItem, index) => {\n          const name = covertFormName(originItem.name)\n          const key = originItem.key ?? (name ? (name ?? []).join('_') : index)\n          return omitUndefined<ProFormItemType>({\n            ...originItem,\n            originName: originItem.originName ?? originItem.name,\n            name,\n            key,\n          })\n        })\n        .filter((field) => {\n          return Boolean(field)\n        })\n    }\n\n    watch(\n      () => props.items,\n      () => {\n        transformerMap.value = transformer(props.items ?? [])\n        formItems.value = formatItems(props.items ?? [])\n      },\n      {\n        immediate: true,\n      },\n    )\n\n    const { initialValues, hasInitial, requestLoading } = useInitialValues(\n      props as ProFormPropsType,\n    )\n\n    watch(\n      initialValues,\n      (newValues, oldValues) => {\n        if (!isEqual(newValues, oldValues)) {\n          formData.value = cloneDeep(convertKeyInitialValue(newValues, transformerMap.value))\n          if (!props.request || props.requestAbort) {\n            Promise.resolve().then(() => {\n              hasInitial.value = false\n            })\n          }\n        }\n      },\n      {\n        immediate: true,\n      },\n    )\n    const onValuesChange = debounce(() => {\n      props.onValuesChange?.(\n        transformKeySubmitValue(cloneDeep(formData.value), transformerMap.value, props.omitNil),\n      )\n    }, 200)\n\n    const onFinish = async () => {\n      if (!props.onFinish) return\n      if (props.submitOnLoading) {\n        if (loading.value) return\n        setLoading(true)\n      }\n\n      try {\n        const finalValues = transformKeySubmitValue(\n          cloneDeep(formData.value),\n          transformerMap.value,\n          props.omitNil,\n        )\n        await props.onFinish(finalValues)\n      } catch (error) {\n        console.log('🚀 ~ onFinish ~ error:', error)\n      } finally {\n        if (props.submitOnLoading) {\n          setLoading(false)\n        }\n      }\n    }\n\n    watch(\n      formData,\n      () => {\n        if (!hasInitial.value) {\n          onValuesChange()\n        }\n      },\n      {\n        deep: true,\n      },\n    )\n\n    const linkage = useLinkage()\n    const action = useAction({\n      props,\n      formRef,\n      formData,\n      initialValues,\n      hasInitial,\n      transformerMap,\n      onFinish,\n      onReset: props.onReset,\n      onFinishFailed: props.onFinishFailed,\n    })\n\n    const submitterProps = computed<SubmitterProps>(() =>\n      typeof props.submitter === 'boolean' || !props.submitter\n        ? {}\n        : omit(props.submitter, ['colProps']),\n    )\n\n    const submitterColProps = computed<ColProps>(() => {\n      if (props.submitter === false || props.readonly) return {}\n      if (props.gridSubmitter) {\n        if (isObject(props.submitter) && isObject(props.submitter.colProps)) {\n          return { ...props.submitter.colProps }\n        }\n      }\n      return { span: 24 } as ColProps\n    })\n\n    const submitterNode = computed(() => {\n      if (props.submitter === false || props.readonly) return undefined\n      const submitButtonProps =\n        submitterProps.value.submitButtonProps === false\n          ? false\n          : {\n              loading: loading.value,\n              ...submitterProps.value.submitButtonProps,\n            }\n      const resetButtonProps =\n        submitterProps.value.resetButtonProps === false\n          ? false\n          : {\n              disabled: loading.value,\n              ...submitterProps.value.resetButtonProps,\n            }\n      const dom = (\n        <FormSubmitter\n          key=\"submitter\"\n          {...submitterProps.value}\n          submitButtonProps={submitButtonProps}\n          resetButtonProps={resetButtonProps}\n        />\n      )\n      if (submitterProps.value.teleport) {\n        return (\n          <Teleport defer to={submitterProps.value.teleport}>\n            {dom}\n          </Teleport>\n        )\n      }\n      return dom\n    })\n\n    onMounted(() => {\n      mountedRef.value = true\n      requestFormCacheId += 1\n      const finalValues = formRef.value?.getFieldsValue?.(true) ?? {}\n      Promise.resolve().then(() => {\n        props.onInit?.(\n          transformKeySubmitValue(finalValues, transformerMap.value, props.omitNil),\n          action,\n        )\n      })\n    })\n\n    useProvideForm({\n      ...linkage,\n      action,\n      formKey,\n      mountedRef,\n      prefixCls,\n      initialValues,\n      formData,\n      hasInitial,\n      theme: computed(() => props.theme),\n      customUi: computed(() => props.customUi),\n      grid: computed(() => props.grid),\n      disabled: computed(() => props.disabled),\n      readonly: computed(() => props.readonly),\n      readonlyProps: computed(() => props.readonlyProps),\n      rowProps: computed(() => props.rowProps ?? { gutter: 16 }),\n      colProps: computed(() => props.colProps ?? { xs: 24 }),\n      formatItems,\n    })\n\n    expose({\n      ...action,\n    })\n    return () => (\n      <FormSlotsContextProvider value={{ ...slots }}>\n        <Form\n          ref={formRef}\n          {...formProps.value}\n          class={formClass.value}\n          model={formData.value}\n          style={attrs.style}\n        >\n          <Spin spinning={props.showLoading && (requestLoading.value || loading.value)}>\n            <FormRowWrapper>\n              <FormItems list={formItems.value} />\n              {props.gridSubmitter && props.submitter !== false && (\n                <Col {...submitterColProps.value}>\n                  <FormItem label=\" \" colon={false} class={`${prefixCls}-submitter-form-item`}>\n                    {submitterNode.value}\n                  </FormItem>\n                </Col>\n              )}\n            </FormRowWrapper>\n            {!props.gridSubmitter && submitterNode.value}\n          </Spin>\n        </Form>\n      </FormSlotsContextProvider>\n    )\n  },\n})\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","requestFormCacheId","name","inheritAttrs","props","baseFormProps","setup","slots","expose","attrs","mountedRef","ref","transformerMap","shallowRef","Map","formRef","prefixCls","usePrefixCls","formData","formItems","formKey","computed","loading","setLoading","useMergedState","value","onChange","val","onLoadingChange","formClass","class","formProps","omitUndefined","omit","layout","formatItems","items","filter","originItem","hidden","sort","a","b","order","map","index","covertFormName","key","join","originName","field","Boolean","watch","transformer","immediate","initialValues","hasInitial","requestLoading","useInitialValues","newValues","oldValues","isEqual","cloneDeep","convertKeyInitialValue","request","requestAbort","Promise","resolve","then","onValuesChange","debounce","transformKeySubmitValue","omitNil","onFinish","submitOnLoading","finalValues","error","console","log","deep","linkage","useLinkage","action","useAction","onReset","onFinishFailed","submitterProps","submitter","submitterColProps","readonly","gridSubmitter","isObject","colProps","span","submitterNode","undefined","submitButtonProps","resetButtonProps","disabled","dom","_createVNode","FormSubmitter","_mergeProps","teleport","Teleport","default","onMounted","getFieldsValue","_a","onInit","useProvideForm","theme","customUi","grid","readonlyProps","rowProps","gutter","xs","FormSlotsContextProvider","Form","style","Spin","showLoading","FormRowWrapper","FormItems","Col","FormItem"],"mappings":"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"}

package/es/components/form/src/base/StepForm.d.ts

@@ -268,7 +268,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     validateTrigger: string | string[] | undefined;
     grid: boolean;
     dateFormatter: false | "string" | "number" | ((value: import("dayjs").Dayjs, fieldType: `${import("pro-design-vue").ProFieldType}`) => string | number) | undefined;
-    submitter: false | import("pro-design-vue").SubmitterProps<Record<string, any>> | undefined;
+    submitter: false | import("pro-design-vue").SubmitterProps<import("pro-design-vue").Entity> | undefined;
     showLoading: boolean;
     submitOnLoading: boolean;
     gridSubmitter: boolean;

package/es/components/form/src/components/FormColWrapper.d.ts

@@ -5,6 +5,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<ColProps>;
         default: undefined;
     };
+    grid: {
+        type: BooleanConstructor;
+        default: undefined;
+    };
 }>, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>[] | import("vue/jsx-runtime").JSX.Element | undefined, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -12,6 +16,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<ColProps>;
         default: undefined;
     };
+    grid: {
+        type: BooleanConstructor;
+        default: undefined;
+    };
 }>> & Readonly<{}>, {
     colProps: Partial<import("vue").ExtractPropTypes<{
         span: (StringConstructor | NumberConstructor)[];
@@ -46,5 +54,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         prefixCls: StringConstructor;
         flex: (StringConstructor | NumberConstructor)[];
     }>>;
+    grid: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/components/form/src/components/FormColWrapper.mjs

@@ -9,6 +9,10 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
     colProps: {
       type: Object,
       default: void 0
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props, {
@@ -22,9 +26,13 @@ var FormColWrapper = /* @__PURE__ */ defineComponent({
       var _a;
       return (_a = props.colProps) != null ? _a : colProps == null ? void 0 : colProps.value;
     });
+    const mergeGrid = computed(() => {
+      var _a;
+      return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+    });
     return () => {
       var _a;
-      if (grid == null ? void 0 : grid.value) {
+      if (mergeGrid.value) {
         return createVNode(Col, mergeColProps.value, {
           default: () => {
             var _a2;

package/es/components/form/src/components/FormColWrapper.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"FormColWrapper.mjs","sources":["../../../../../../../packages/components/form/src/components/FormColWrapper.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-08 14:51:29\n * @LastEditors: shen\n * @LastEditTime: 2023-08-10 11:16:43\n * @Description:\n */\nimport { defineComponent, computed } from 'vue'\nimport { Col } from 'ant-design-vue'\nimport { useInjectForm } from '../context/FormContext'\n\nimport type { ColProps } from 'ant-design-vue'\nimport type { PropType } from 'vue'\n\nexport default defineComponent({\n  name: 'FormColWrapper',\n  inheritAttrs: false,\n  props: {\n    colProps: {\n      type: Object as PropType<ColProps>,\n      default: undefined,\n    },\n  },\n  setup(props, { slots }) {\n    const { colProps, grid } = useInjectForm()\n    const mergeColProps = computed(() => props.colProps ?? colProps?.value)\n\n    return () => {\n      if (grid?.value) {\n        return <Col {...mergeColProps.value}>{slots.default?.()}</Col>\n      }\n      return slots.default?.()\n    }\n  },\n})\n"],"names":["name","inheritAttrs","props","colProps","type","Object","default","undefined","setup","slots","grid","useInjectForm","mergeColProps","computed","value","_createVNode","Col","_a"],"mappings":";;;;AAcA,qDAA+B;AAAA,EAC7BA,IAAAA,EAAM,gBAAA;AAAA,EACNC,YAAAA,EAAc,KAAA;AAAA,EACdC,KAAAA,EAAO;AAAA,IACLC,QAAAA,EAAU;AAAA,MACRC,IAAAA,EAAMC,MAAAA;AAAAA,MACNC,OAAAA,EAASC;AAAAA;AACX,GACF;AAAA,EACAC,MAAMN,KAAAA,EAAO;AAAA,IAAEO;AAAAA,GAAM,EAAG;AACtB,IAAA,MAAM;AAAA,MAAEN,QAAAA;AAAAA,MAAUO;AAAAA,QAASC,aAAAA,EAAc;AACzC,IAAA,MAAMC,aAAAA,GAAgBC,SAAS,MAAA;AAzBnC,MAAA,IAAA,EAAA;AAyByCX,MAAAA,OAAAA,CAAAA,EAAAA,GAAAA,KAAAA,CAAMC,QAAAA,KAAND,YAAkBC,QAAAA,IAAAA,IAAAA,GAAAA,MAAAA,GAAAA,QAAAA,CAAUW,KAAAA;AAAAA,IAAAA,CAAK,CAAA;AAEtE,IAAA,OAAO,MAAM;AA3BjB,MAAA,IAAA,EAAA;AA4BM,MAAA,IAAIJ,6BAAMI,KAAAA,EAAO;AACf,QAAA,OAAAC,WAAAA,CAAAC,GAAAA,EAAgBJ,aAAAA,CAAcE,KAAAA,EAAK;AAAA,UAAAR,SAAAA,MAAA;AA7B3C,YAAA,IAAAW,GAAAA;AA6B2C,YAAA,OAAA,CAAA,CAAGR,GAAAA,GAAAA,KAAAA,CAAMH,OAAAA,KAANG,IAAAA,GAAAA,MAAAA,GAAAA,IAAAA,IAAAA,CAAAA,KAAAA,CAAiB,CAAA;AAAA,UAAA;AAAA,SAAA,CAAA;AAAA,MACzD;AACA,MAAA,OAAA,CAAOA,WAAMH,OAAAA,KAANG,IAAAA,GAAAA,MAAAA,GAAAA,EAAAA,CAAAA,IAAAA,CAAAA,KAAAA,CAAAA;AAAAA,IACT,CAAA;AAAA,EACF;AACF,CAAC,CAAA;;;;"}
+{"version":3,"file":"FormColWrapper.mjs","sources":["../../../../../../../packages/components/form/src/components/FormColWrapper.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-08 14:51:29\n * @LastEditors: shen\n * @LastEditTime: 2025-09-22 13:41:48\n * @Description:\n */\nimport { defineComponent, computed } from 'vue'\nimport { Col } from 'ant-design-vue'\nimport { useInjectForm } from '../context/FormContext'\n\nimport type { ColProps } from 'ant-design-vue'\nimport type { PropType } from 'vue'\n\nexport default defineComponent({\n  name: 'FormColWrapper',\n  inheritAttrs: false,\n  props: {\n    colProps: {\n      type: Object as PropType<ColProps>,\n      default: undefined,\n    },\n    grid: {\n      type: Boolean,\n      default: undefined,\n    },\n  },\n  setup(props, { slots }) {\n    const { colProps, grid } = useInjectForm()\n    const mergeColProps = computed(() => props.colProps ?? colProps?.value)\n    const mergeGrid = computed(() => props.grid ?? grid?.value)\n    return () => {\n      if (mergeGrid.value) {\n        return <Col {...mergeColProps.value}>{slots.default?.()}</Col>\n      }\n      return slots.default?.()\n    }\n  },\n})\n"],"names":["name","inheritAttrs","props","colProps","type","Object","default","undefined","grid","Boolean","setup","slots","useInjectForm","mergeColProps","computed","value","mergeGrid","_createVNode","Col","_a"],"mappings":";;;;AAcA,qDAA+B;AAAA,EAC7BA,IAAAA,EAAM,gBAAA;AAAA,EACNC,YAAAA,EAAc,KAAA;AAAA,EACdC,KAAAA,EAAO;AAAA,IACLC,QAAAA,EAAU;AAAA,MACRC,IAAAA,EAAMC,MAAAA;AAAAA,MACNC,OAAAA,EAASC;AAAAA,KACX;AAAA,IACAC,IAAAA,EAAM;AAAA,MACJJ,IAAAA,EAAMK,OAAAA;AAAAA,MACNH,OAAAA,EAASC;AAAAA;AACX,GACF;AAAA,EACAG,MAAMR,KAAAA,EAAO;AAAA,IAAES;AAAAA,GAAM,EAAG;AACtB,IAAA,MAAM;AAAA,MAAER,QAAAA;AAAAA,MAAUK;AAAAA,QAASI,aAAAA,EAAc;AACzC,IAAA,MAAMC,aAAAA,GAAgBC,SAAS,MAAA;AA7BnC,MAAA,IAAA,EAAA;AA6ByCZ,MAAAA,OAAAA,CAAAA,EAAAA,GAAAA,KAAAA,CAAMC,QAAAA,KAAND,YAAkBC,QAAAA,IAAAA,IAAAA,GAAAA,MAAAA,GAAAA,QAAAA,CAAUY,KAAAA;AAAAA,IAAAA,CAAK,CAAA;AACtE,IAAA,MAAMC,SAAAA,GAAYF,SAAS,MAAA;AA9B/B,MAAA,IAAA,EAAA;AA8BqCZ,MAAAA,OAAAA,CAAAA,EAAAA,GAAAA,KAAAA,CAAMM,IAAAA,KAANN,YAAcM,IAAAA,IAAAA,IAAAA,GAAAA,MAAAA,GAAAA,IAAAA,CAAMO,KAAAA;AAAAA,IAAAA,CAAK,CAAA;AAC1D,IAAA,OAAO,MAAM;AA/BjB,MAAA,IAAA,EAAA;AAgCM,MAAA,IAAIC,UAAUD,KAAAA,EAAO;AACnB,QAAA,OAAAE,WAAAA,CAAAC,GAAAA,EAAgBL,aAAAA,CAAcE,KAAAA,EAAK;AAAA,UAAAT,SAAAA,MAAA;AAjC3C,YAAA,IAAAa,GAAAA;AAiC2C,YAAA,OAAA,CAAA,CAAGR,GAAAA,GAAAA,KAAAA,CAAML,OAAAA,KAANK,IAAAA,GAAAA,MAAAA,GAAAA,IAAAA,IAAAA,CAAAA,KAAAA,CAAiB,CAAA;AAAA,UAAA;AAAA,SAAA,CAAA;AAAA,MACzD;AACA,MAAA,OAAA,CAAOA,WAAML,OAAAA,KAANK,IAAAA,GAAAA,MAAAA,GAAAA,EAAAA,CAAAA,IAAAA,CAAAA,KAAAA,CAAAA;AAAAA,IACT,CAAA;AAAA,EACF;AACF,CAAC,CAAA;;;;"}

package/es/components/form/src/components/FormGroup.d.ts

@@ -6,7 +6,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: undefined;
     };
     tooltip: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     colProps: {
@@ -43,7 +43,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: undefined;
     };
     tooltip: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     colProps: {
@@ -75,10 +75,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         default: () => {};
     };
 }>> & Readonly<{}>, {
-    title: import("pro-design-vue").ProVNode | ((formData: import("pro-design-vue").Entity) => import("pro-design-vue").ProVNode);
+    title: import("pro-design-vue").ProVNode | ((params: {
+        formData: import("pro-design-vue").Entity;
+    }) => import("pro-design-vue").ProVNode);
     items: ProFormItemType<import("pro-design-vue").Entity, "text" | "select" | "textarea" | "time" | "switch" | "formSet" | "formList" | "group" | "divider" | "digit" | "digitRange" | "treeSelect" | "cascader" | "password" | "checkbox" | "checkboxGroup" | "radioGroup" | "slider" | "rate" | "date" | "dateRange" | "timeRange" | "uploadButton" | "uploadDragger" | "uploadPicture" | "uploadPictureList" | "editor">[] | ((formData: import("pro-design-vue").Entity) => ProFormItemType<import("pro-design-vue").Entity, "text" | "select" | "textarea" | "time" | "switch" | "formSet" | "formList" | "group" | "divider" | "digit" | "digitRange" | "treeSelect" | "cascader" | "password" | "checkbox" | "checkboxGroup" | "radioGroup" | "slider" | "rate" | "date" | "dateRange" | "timeRange" | "uploadButton" | "uploadDragger" | "uploadPicture" | "uploadPictureList" | "editor">[]) | undefined;
     item: ProFormItemType;
-    tooltip: string;
+    tooltip: string | boolean;
     rowProps: (Partial<import("vue").ExtractPropTypes<{
         align: {
             type: import("vue").PropType<"top" | "bottom" | "stretch" | "middle" | {

package/es/components/form/src/components/FormGroup.mjs

@@ -22,7 +22,7 @@ var FormGroup = /* @__PURE__ */ defineComponent({
       default: void 0
     },
     tooltip: {
-      type: String,
+      type: [String, Boolean],
       default: void 0
     },
     colProps: {

package/es/components/form/src/components/FormGroup.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"FormGroup.mjs","sources":["../../../../../../../packages/components/form/src/components/FormGroup.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-09 10:36:49\n * @LastEditors: shen\n * @LastEditTime: 2025-07-26 11:47:47\n * @Description:\n */\nimport type { PropType } from 'vue'\nimport type { ProFormItemType } from '../type'\n\nimport { computed, defineComponent } from 'vue'\nimport { useInjectForm } from '../context/FormContext'\nimport { useInjectSlots } from '../context/FormSlotsContext'\nimport { isString, RenderVNode, runFunction } from '@pro-design-vue/utils'\n\nimport FormRowWrapper from './FormRowWrapper'\nimport FormColWrapper from './FormColWrapper'\nimport FormItems from './FormItems'\nimport FormTitle from './FormTitle'\nimport getSlot from '../utils/getSlot'\n\nexport default defineComponent({\n  name: 'FormGroup',\n  inheritAttrs: false,\n  props: {\n    title: {\n      type: [String, Object, Function] as PropType<ProFormItemType['title']>,\n      default: undefined,\n    },\n    tooltip: {\n      type: String,\n      default: undefined,\n    },\n    colProps: {\n      type: Object as PropType<ProFormItemType['colProps']>,\n      default: undefined,\n    },\n    rowProps: {\n      type: Object as PropType<ProFormItemType['rowProps']>,\n      default: undefined,\n    },\n    spaceProps: {\n      type: Object as PropType<ProFormItemType['spaceProps']>,\n      default: undefined,\n    },\n    items: {\n      type: [Array, Function] as PropType<ProFormItemType['children']>,\n      default: undefined,\n    },\n    grid: {\n      type: Boolean,\n      default: undefined,\n    },\n    formItemProps: {\n      type: [Object, Function] as PropType<ProFormItemType['formItemProps']>,\n      default: undefined,\n    },\n    item: {\n      type: Object as PropType<ProFormItemType>,\n      default: () => ({}),\n    },\n  },\n  setup(props) {\n    const formSlotsContext = useInjectSlots()\n    const { formatItems, prefixCls, formData } = useInjectForm()\n    const items = computed(\n      () => formatItems?.(runFunction(props.items ?? [], formData.value)) ?? [],\n    )\n    const formItemProps = computed(() => runFunction(props.formItemProps, formData.value) ?? {})\n    const isExistTitle = computed(() => {\n      if (!props.title) {\n        return false\n      }\n      if (isString(props.title) && props.title.startsWith('::')) {\n        return !!formSlotsContext[props.title.substring(2)]\n      }\n      return true\n    })\n    return () => {\n      const renderFormItem = getSlot(props.item.renderFormItem, formSlotsContext)\n      if (!items.value.length && !renderFormItem) return null\n\n      let defaultDom = (\n        <FormItems\n          spaceProps={props.spaceProps}\n          list={items.value}\n          type=\"space\"\n          grid={props.grid}\n        ></FormItems>\n      )\n\n      if (renderFormItem) {\n        defaultDom = (\n          <RenderVNode\n            vnode={renderFormItem}\n            props={{\n              defaultDom,\n              formData: formData.value,\n            }}\n          />\n        )\n      }\n      return (\n        <FormColWrapper colProps={props.colProps}>\n          <div class={`${prefixCls}-group`}>\n            {isExistTitle.value && (\n              <div class={`${prefixCls}-group-title`} style={formItemProps.value.titleStyles}>\n                <FormTitle title={props.title} tooltip={props.tooltip} />\n              </div>\n            )}\n\n            <div>\n              <FormRowWrapper rowProps={props.rowProps} grid={props.grid}>\n                {defaultDom}\n              </FormRowWrapper>\n            </div>\n          </div>\n        </FormColWrapper>\n      )\n    }\n  },\n})\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","name","inheritAttrs","props","title","type","String","Function","default","undefined","tooltip","colProps","rowProps","spaceProps","items","Array","grid","Boolean","formItemProps","item","setup","formSlotsContext","useInjectSlots","formatItems","prefixCls","formData","useInjectForm","computed","runFunction","value","isExistTitle","isString","startsWith","substring","renderFormItem","getSlot","length","defaultDom","_createVNode","FormItems","RenderVNode","FormColWrapper","titleStyles","FormTitle","FormRowWrapper"],"mappings":"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"}
+{"version":3,"file":"FormGroup.mjs","sources":["../../../../../../../packages/components/form/src/components/FormGroup.tsx"],"sourcesContent":["/*\n * @Author: shen\n * @Date: 2023-08-09 10:36:49\n * @LastEditors: shen\n * @LastEditTime: 2025-10-07 13:16:45\n * @Description:\n */\nimport type { PropType } from 'vue'\nimport type { ProFormItemType } from '../type'\n\nimport { computed, defineComponent } from 'vue'\nimport { useInjectForm } from '../context/FormContext'\nimport { useInjectSlots } from '../context/FormSlotsContext'\nimport { isString, RenderVNode, runFunction } from '@pro-design-vue/utils'\n\nimport FormRowWrapper from './FormRowWrapper'\nimport FormColWrapper from './FormColWrapper'\nimport FormItems from './FormItems'\nimport FormTitle from './FormTitle'\nimport getSlot from '../utils/getSlot'\n\nexport default defineComponent({\n  name: 'FormGroup',\n  inheritAttrs: false,\n  props: {\n    title: {\n      type: [String, Object, Function] as PropType<ProFormItemType['title']>,\n      default: undefined,\n    },\n    tooltip: {\n      type: [String, Boolean],\n      default: undefined,\n    },\n    colProps: {\n      type: Object as PropType<ProFormItemType['colProps']>,\n      default: undefined,\n    },\n    rowProps: {\n      type: Object as PropType<ProFormItemType['rowProps']>,\n      default: undefined,\n    },\n    spaceProps: {\n      type: Object as PropType<ProFormItemType['spaceProps']>,\n      default: undefined,\n    },\n    items: {\n      type: [Array, Function] as PropType<ProFormItemType['children']>,\n      default: undefined,\n    },\n    grid: {\n      type: Boolean,\n      default: undefined,\n    },\n    formItemProps: {\n      type: [Object, Function] as PropType<ProFormItemType['formItemProps']>,\n      default: undefined,\n    },\n    item: {\n      type: Object as PropType<ProFormItemType>,\n      default: () => ({}),\n    },\n  },\n  setup(props) {\n    const formSlotsContext = useInjectSlots()\n    const { formatItems, prefixCls, formData } = useInjectForm()\n    const items = computed(\n      () => formatItems?.(runFunction(props.items ?? [], formData.value)) ?? [],\n    )\n    const formItemProps = computed(() => runFunction(props.formItemProps, formData.value) ?? {})\n    const isExistTitle = computed(() => {\n      if (!props.title) {\n        return false\n      }\n      if (isString(props.title) && props.title.startsWith('::')) {\n        return !!formSlotsContext[props.title.substring(2)]\n      }\n      return true\n    })\n    return () => {\n      const renderFormItem = getSlot(props.item.renderFormItem, formSlotsContext)\n      if (!items.value.length && !renderFormItem) return null\n      let defaultDom = (\n        <FormItems\n          spaceProps={props.spaceProps}\n          list={items.value}\n          type=\"space\"\n          grid={props.grid}\n        ></FormItems>\n      )\n\n      if (renderFormItem) {\n        defaultDom = (\n          <RenderVNode\n            vnode={renderFormItem}\n            props={{\n              defaultDom,\n              formData: formData.value,\n            }}\n          />\n        )\n      }\n      return (\n        <FormColWrapper colProps={props.colProps}>\n          <div class={`${prefixCls}-group`}>\n            {isExistTitle.value && (\n              <div class={`${prefixCls}-group-title`} style={formItemProps.value.titleStyles}>\n                <FormTitle title={props.title} tooltip={props.tooltip} />\n              </div>\n            )}\n\n            <div>\n              <FormRowWrapper rowProps={props.rowProps} grid={props.grid}>\n                {defaultDom}\n              </FormRowWrapper>\n            </div>\n          </div>\n        </FormColWrapper>\n      )\n    }\n  },\n})\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","name","inheritAttrs","props","title","type","String","Function","default","undefined","tooltip","Boolean","colProps","rowProps","spaceProps","items","Array","grid","formItemProps","item","setup","formSlotsContext","useInjectSlots","formatItems","prefixCls","formData","useInjectForm","computed","runFunction","value","isExistTitle","isString","startsWith","substring","renderFormItem","getSlot","length","defaultDom","_createVNode","FormItems","RenderVNode","FormColWrapper","titleStyles","FormTitle","FormRowWrapper"],"mappings":"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"}

package/es/components/form/src/components/FormItem.d.ts

@@ -5,12 +5,21 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: PropType<ProFormItemType>;
         default: () => {};
     };
+    grid: {
+        type: BooleanConstructor;
+        default: undefined;
+    };
 }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     item: {
         type: PropType<ProFormItemType>;
         default: () => {};
     };
+    grid: {
+        type: BooleanConstructor;
+        default: undefined;
+    };
 }>> & Readonly<{}>, {
     item: ProFormItemType;
+    grid: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/components/form/src/components/FormItem.mjs

@@ -28,6 +28,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
     item: {
       type: Object,
       default: () => ({})
+    },
+    grid: {
+      type: Boolean,
+      default: void 0
     }
   },
   setup(props) {
@@ -62,6 +66,10 @@ var FormItem = /* @__PURE__ */ defineComponent({
       transform: props.item.transform
     });
     const fieldRef = ref();
+    const mergeGrid = computed(() => {
+      var _a;
+      return (_a = props.grid) != null ? _a : grid == null ? void 0 : grid.value;
+    });
     const fieldType = computed(() => {
       var _a;
       return (_a = props.item.fieldType) != null ? _a : "text";
@@ -118,7 +126,7 @@ var FormItem = /* @__PURE__ */ defineComponent({
         disabled: ((_e = runFunction((_d = props.item.disabled) != null ? _d : baseProps == null ? void 0 : baseProps.disabled, formData.value, rowData == null ? void 0 : rowData.value)) != null ? _e : allDisabledKeys.value.includes(props.item.key)) ? true : void 0,
         placeholder: (_f = props.item.placeholder) != null ? _f : baseProps == null ? void 0 : baseProps.placeholder,
         options: (_h = (_g = props.item.options) != null ? _g : baseProps == null ? void 0 : baseProps.options) != null ? _h : baseProps == null ? void 0 : baseProps.treeData,
-        allowClear: (_j = (_i = props.item.allowClear) != null ? _i : baseProps == null ? void 0 : baseProps.allowClear) != null ? _j : false
+        allowClear: (_j = (_i = props.item.allowClear) != null ? _i : baseProps == null ? void 0 : baseProps.allowClear) != null ? _j : true
       };
       return omitUndefined({
         valueEnum: props.item.valueEnum,
@@ -144,7 +152,7 @@ var FormItem = /* @__PURE__ */ defineComponent({
       };
       if (props.item.width && !fieldWidthSizeMap[props.item.width]) {
         newStyle.width = isNumber(props.item.width) ? props.item.width + "px" : props.item.width;
-      } else if (grid == null ? void 0 : grid.value) {
+      } else if (mergeGrid == null ? void 0 : mergeGrid.value) {
         newStyle.maxWidth = "100%";
         newStyle.width = "100%";
       }
@@ -184,12 +192,14 @@ var FormItem = /* @__PURE__ */ defineComponent({
         }, [createVNode(FormTitle, {
           "title": props.item.title,
           "tooltip": props.item.tooltip
-        }, null)]), createVNode(RenderVNode, {
+        }, null)]), createVNode("div", {
+          "class": `${prefixCls}-item-title-extra`
+        }, [createVNode(RenderVNode, {
           "vnode": extraRender,
           "props": {
             formData: formData.value
           }
-        }, null)]);
+        }, null)])]);
       }
       return temp;
     });
@@ -236,19 +246,6 @@ var FormItem = /* @__PURE__ */ defineComponent({
     });
     return () => {
       var _a, _b;
-      const render = getSlot(props.item.render, formSlotsContext);
-      if (render) {
-        return createVNode(FormColWrapper, {
-          "colProps": props.item.colProps
-        }, {
-          default: () => [createVNode(RenderVNode, {
-            "vnode": render,
-            "props": {
-              formData: formData.value
-            }
-          }, null)]
-        });
-      }
       const renderFormItem = getSlot(props.item.renderFormItem, formSlotsContext);
       const extraRender = getSlot((_a = props.item.extra) == null ? void 0 : _a.item, formSlotsContext);
       const FieldComponent = (_b = fieldComponentMap[fieldType.value]) != null ? _b : fieldComponentMap["text"];
@@ -276,22 +273,33 @@ var FormItem = /* @__PURE__ */ defineComponent({
       if (extraRender) {
         defaultDom = createVNode("div", {
           "style": "display: flex; flex-direction: row; justify-content: flex-start; align-items: center;"
-        }, [defaultDom, createVNode(RenderVNode, {
+        }, [defaultDom, createVNode("div", {
+          "style": "margin-inline-start: 5px; flex-shrink: 0;"
+        }, [createVNode(RenderVNode, {
           "vnode": extraRender,
           "props": {
             formData: formData.value,
             listName: listName == null ? void 0 : listName.value,
             name: props.item.name
           }
-        }, null)]);
+        }, null)])]);
       }
+      const formItemDom = createVNode(Form.Item, restItemProps.value, {
+        default: () => [defaultDom],
+        ...slotsGetter.value
+      });
+      const render = getSlot(props.item.render, formSlotsContext);
       return createVNode(FormColWrapper, {
-        "colProps": props.item.colProps
+        "colProps": props.item.colProps,
+        "grid": mergeGrid.value
       }, {
-        default: () => [createVNode(Form.Item, restItemProps.value, {
-          default: () => [defaultDom],
-          ...slotsGetter.value
-        })]
+        default: () => [render ? createVNode(RenderVNode, {
+          "vnode": render,
+          "props": {
+            formData: formData.value,
+            defaultDom: formItemDom
+          }
+        }, null) : formItemDom]
       });
     };
   }