@vunk/form 2.12.1 → 2.13.0

package/components/dialog-input-collection/index.mjs

@@ -1,20 +1,22 @@
-import { defineComponent, openBlock, createBlock, withCtx, createVNode, renderSlot, ref, watch, resolveComponent, createTextVNode, mergeProps, computed, Fragment, reactive, createElementBlock, normalizeProps, guardReactiveProps, createSlots, createCommentVNode, createElementVNode, toDisplayString } from 'vue';
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, renderSlot, createVNode, createTextVNode, mergeProps, computed, Fragment, reactive, createElementBlock, normalizeProps, guardReactiveProps, createSlots, createCommentVNode, createElementVNode, toDisplayString } from 'vue';
 import { p as plus_default, e as edit_default, d as delete_default } from '../index.mjs';
 import { setData, ensetData, getValue } from '@vunk/core';
 import { _VkfFormItemCtx, VkfFormItem } from '@vunk/form/components/form-item';
-import { VkfInformationTemplates, VkfInformationData, VkfInformationRenderer } from '@vunk/form/components/information-renderer';
+import { VkfInformationData, VkfInformationTemplates, VkfInformationRenderer } from '@vunk/form/components/information-renderer';
 import { useComputedReadonly } from '@vunk/form/composables';
+import { VkAvatar } from '@vunk/plus/components/avatar';
 import { VkTableColumns } from '@vunk/plus/components/table-columns';
+import { CRUD } from '@vunk/shared/enum';
+import { isCallable } from '@vunk/shared/function';
 import { ElDialog, ElButton, ElPopconfirm, ElTable } from 'element-plus';
+import { useDeferred } from '@vunk/core/composables';
+import { VkfForm } from '@vunk/form/components/form';
+import { validateCatch } from '@vunk/form/shared/form';
+import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
+import { VkfInformationTemplatesDefault } from '@vunk/form/components/information-templates-default';
 import { VkfRendererData } from '@vunk/form/components/renderer-data';
 import { VkfTemplateInstancesProvider } from '@vunk/form/components/template-instances-provider';
-import { VkfInformationTemplatesDefault } from '@vunk/form/components/information-templates-default';
 import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
-import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
-import { CRUD } from '@vunk/shared/enum';
-import { VkAvatar } from '@vunk/plus/components/avatar';
-import { VkfForm } from '@vunk/form/components/form';
-import { isCallable } from '@vunk/shared/function';
 import { c as cloneDeep } from '../cloneDeep.mjs';
 import '../isObject.mjs';
 
@@ -60,6 +62,9 @@ const props = {
     type: Object,
     default: () => ({})
   },
+  validateCatch: {
+    type: Function
+  },
   modules: {
     type: Array,
     default: () => ["operations:add"]
@@ -70,76 +75,6 @@ const emits = {
 };
 
 var _sfc_main$2 = /* @__PURE__ */ defineComponent({
-  __name: "layout",
-  props: {
-    data: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  emits: ["setData"],
-  setup(__props, { expose: __expose }) {
-    __expose();
-    const __returned__ = { get VkfRendererData() {
-      return VkfRendererData;
-    }, get VkfTemplateInstancesProvider() {
-      return VkfTemplateInstancesProvider;
-    }, get VkfInformationTemplates() {
-      return VkfInformationTemplates;
-    }, get VkfInformationData() {
-      return VkfInformationData;
-    }, get VkfInformationTemplatesDefault() {
-      return VkfInformationTemplatesDefault;
-    }, get VkfTemplatesDefault() {
-      return VkfTemplatesDefault;
-    } };
-    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
-    return __returned__;
-  }
-});
-
-function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createBlock($setup["VkfTemplateInstancesProvider"], null, {
-    placeholder: withCtx(() => [
-      createVNode($setup["VkfTemplatesDefault"])
-    ]),
-    default: withCtx(() => [
-      createVNode($setup["VkfInformationTemplates"], null, {
-        placeholder: withCtx(() => [
-          createVNode($setup["VkfInformationTemplatesDefault"])
-        ]),
-        default: withCtx(() => [
-          createVNode($setup["VkfRendererData"], {
-            data: $props.data,
-            onSetData: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("setData", $event))
-          }, {
-            default: withCtx(() => [
-              createVNode($setup["VkfInformationData"], {
-                data: $props.data,
-                onSetData: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("setData", $event))
-              }, {
-                default: withCtx(() => [
-                  renderSlot(_ctx.$slots, "default")
-                ]),
-                _: 3
-                /* FORWARDED */
-              }, 8, ["data"])
-            ]),
-            _: 3
-            /* FORWARDED */
-          }, 8, ["data"])
-        ]),
-        _: 3
-        /* FORWARDED */
-      })
-    ]),
-    _: 3
-    /* FORWARDED */
-  });
-}
-var TemplatesLayout = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/dialog-input-collection/src/layout.vue"]]);
-
-var _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "dialog-form",
   props: {
     title: {
@@ -165,6 +100,10 @@ var _sfc_main$1 = /* @__PURE__ */ defineComponent({
     dialogFormProps: {
       type: Object,
       default: () => ({})
+    },
+    validateCatch: {
+      type: Function,
+      default: validateCatch
     }
   },
   emits: ["update:modelValue", "update:visible", "change"],
@@ -173,32 +112,42 @@ var _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const formData = ref(props.modelValue);
+    const formDef = useDeferred();
+    formDef.promise.then((form) => {
+      props.dialogFormProps.elRef?.(form);
+    });
     watch(() => props.visible, (v) => {
       if (props.openReset && v) {
         formData.value = { ...props.modelValue };
+        setTimeout(() => {
+          formDef.value?.clearValidate();
+        });
       }
     });
     function handleSubmit() {
-      emit("update:modelValue", formData.value);
-      emit("change", formData.value);
-      emit("update:visible", false);
+      formDef.value?.validate().then(() => {
+        emit("update:modelValue", formData.value);
+        emit("change", formData.value);
+        emit("update:visible", false);
+      }).catch(props.validateCatch);
     }
-    const __returned__ = { props, emit, formData, handleSubmit, get VkfForm() {
+    const __returned__ = { props, emit, formData, formDef, handleSubmit, get setData() {
+      return setData;
+    }, get VkfForm() {
       return VkfForm;
     }, get ElDialog() {
       return ElDialog;
-    }, get setData() {
-      return setData;
     } };
     Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
     return __returned__;
   }
 });
 
-function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElButton = resolveComponent("ElButton");
   return openBlock(), createBlock($setup["ElDialog"], {
     "model-value": $props.visible,
+    "append-to-body": "",
     "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => _ctx.$emit("update:visible", $event))
   }, {
     header: withCtx(() => [
@@ -227,20 +176,92 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     default: withCtx(() => [
       createVNode($setup["VkfForm"], mergeProps($props.dialogFormProps, {
+        "el-ref": $setup.formDef.resolve,
         "form-items": $props.formItems,
         data: $setup.formData,
         onSetData: _cache[0] || (_cache[0] = ($event) => $setup.setData($setup.formData, $event))
-      }), null, 16, ["form-items", "data"])
+      }), null, 16, ["el-ref", "form-items", "data"])
     ]),
     _: 3
     /* FORWARDED */
   }, 8, ["model-value"]);
 }
-var DialogForm = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/dialog-input-collection/src/dialog-form.vue"]]);
+var DialogForm = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render$2], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/dialog-input-collection/src/dialog-form.vue"]]);
+
+var _sfc_main$1 = /* @__PURE__ */ defineComponent({
+  __name: "layout",
+  props: {
+    data: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  emits: ["setData"],
+  setup(__props, { expose: __expose }) {
+    __expose();
+    const __returned__ = { get VkfInformationData() {
+      return VkfInformationData;
+    }, get VkfInformationTemplates() {
+      return VkfInformationTemplates;
+    }, get VkfInformationTemplatesDefault() {
+      return VkfInformationTemplatesDefault;
+    }, get VkfRendererData() {
+      return VkfRendererData;
+    }, get VkfTemplateInstancesProvider() {
+      return VkfTemplateInstancesProvider;
+    }, get VkfTemplatesDefault() {
+      return VkfTemplatesDefault;
+    } };
+    Object.defineProperty(__returned__, "__isScriptSetup", { enumerable: false, value: true });
+    return __returned__;
+  }
+});
+
+function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
+  return openBlock(), createBlock($setup["VkfTemplateInstancesProvider"], null, {
+    placeholder: withCtx(() => [
+      createVNode($setup["VkfTemplatesDefault"])
+    ]),
+    default: withCtx(() => [
+      createVNode($setup["VkfInformationTemplates"], null, {
+        placeholder: withCtx(() => [
+          createVNode($setup["VkfInformationTemplatesDefault"])
+        ]),
+        default: withCtx(() => [
+          createVNode($setup["VkfRendererData"], {
+            data: $props.data,
+            onSetData: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("setData", $event))
+          }, {
+            default: withCtx(() => [
+              createVNode($setup["VkfInformationData"], {
+                data: $props.data,
+                onSetData: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("setData", $event))
+              }, {
+                default: withCtx(() => [
+                  renderSlot(_ctx.$slots, "default")
+                ]),
+                _: 3
+                /* FORWARDED */
+              }, 8, ["data"])
+            ]),
+            _: 3
+            /* FORWARDED */
+          }, 8, ["data"])
+        ]),
+        _: 3
+        /* FORWARDED */
+      })
+    ]),
+    _: 3
+    /* FORWARDED */
+  });
+}
+var TemplatesLayout = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__file", "/home/runner/work/private-vunk-form/private-vunk-form/packages/components/dialog-input-collection/src/layout.vue"]]);
 
 var _sfc_main = /* @__PURE__ */defineComponent({
   ...{
-    name: "VkfDialogInputCollection"
+    name: "VkfDialogInputCollection",
+    inheritAttrs: false
   },
   __name: "index",
   props: props,
@@ -250,9 +271,9 @@ var _sfc_main = /* @__PURE__ */defineComponent({
     emit: __emit
   }) {
     __expose();
-    const ElTable$1 = ElTable;
     const props = __props;
     const emit = __emit;
+    const ElTable$1 = ElTable;
     const hasColAdd = computed(() => {
       return props.modules.includes("operations:add");
     });
@@ -388,9 +409,9 @@ var _sfc_main = /* @__PURE__ */defineComponent({
       emit("update:modelValue", getValue(data, props.prop));
     };
     const __returned__ = {
-      ElTable: ElTable$1,
       props,
       emit,
+      ElTable: ElTable$1,
       hasColAdd,
       formItemBindProps,
       readonly,
@@ -405,29 +426,29 @@ var _sfc_main = /* @__PURE__ */defineComponent({
       handleEdit,
       handleDialogFormChange,
       handleFormSetData,
-      get Plus() {
-        return plus_default;
-      },
       get Edit() {
         return edit_default;
       },
+      get Plus() {
+        return plus_default;
+      },
       get VkfFormItem() {
         return VkfFormItem;
       },
+      get VkAvatar() {
+        return VkAvatar;
+      },
       get VkTableColumns() {
         return VkTableColumns;
       },
-      get ElButton() {
-        return ElButton;
-      },
-      TemplatesLayout,
       get CRUD() {
         return CRUD;
       },
-      get VkAvatar() {
-        return VkAvatar;
+      get ElButton() {
+        return ElButton;
       },
-      DialogForm
+      DialogForm,
+      TemplatesLayout
     };
     Object.defineProperty(__returned__, "__isScriptSetup", {
       enumerable: false,
@@ -455,7 +476,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           createVNode(
             $setup["VkfFormItem"],
-            normalizeProps(guardReactiveProps($setup.formItemBindProps)),
+            normalizeProps(guardReactiveProps({
+              ...$setup.formItemBindProps,
+              ..._ctx.$attrs
+            })),
             createSlots({
               default: withCtx(() => [
                 !$setup.readonly && _ctx.splicable && !_ctx.labelActions ? (openBlock(), createElementBlock("div", _hoisted_1, [
@@ -514,6 +538,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => $setup.cuState.data = $event),
             "form-items": $setup.cuFormItems,
             "dialog-form-props": _ctx.dialogFormProps,
+            "validate-catch": _ctx.validateCatch,
             onChange: $setup.handleDialogFormChange
           }, {
             header: withCtx(() => [
@@ -532,7 +557,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ]),
             _: 1
             /* STABLE */
-          }, 8, ["visible", "modelValue", "form-items", "dialog-form-props"])
+          }, 8, ["visible", "modelValue", "form-items", "dialog-form-props", "validate-catch"])
         ]),
         _: 3
         /* FORWARDED */

package/components/dialog-input-collection/src/ctx.d.ts

@@ -1,6 +1,6 @@
-import { PropType } from 'vue';
-import { NormalObject } from '@vunk/shared';
-import { Modules } from './types';
+import type { AnyFunc, NormalObject } from '@vunk/shared';
+import type { PropType } from 'vue';
+import type { Modules } from './types';
 export declare const props: {
     columns: {
         type: PropType<any[]>;
@@ -42,6 +42,9 @@ export declare const props: {
         type: ObjectConstructor;
         default: () => {};
     };
+    validateCatch: {
+        type: PropType<AnyFunc>;
+    };
     modules: {
         type: PropType<Modules[]>;
         default: () => string[];
@@ -83,6 +86,7 @@ export declare const props: {
         type: BooleanConstructor;
         default: boolean;
     };
+    prop: any;
     label: StringConstructor;
     labelWidth: {
         readonly type: PropType<string | number>;
@@ -100,12 +104,6 @@ export declare const props: {
     } & {
         readonly default: "";
     };
-    prop: {
-        readonly type: PropType<import("element-plus").FormItemProp>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     rules: {
         readonly type: PropType<unknown>;
         readonly required: false;