@vunk/form 1.1.7 → 1.1.9

package/components/form/src/index.vue.d.ts

@@ -376,7 +376,7 @@ declare const _default: import("vue").DefineComponent<{
     formEmits: {
         validate: (e: import("@vunk/core").SetDataEvent<any>) => void;
     };
-    getValue: (obj: any, k: any, intoUndefined?: import("@vunk/core").IntoUndefined | undefined) => any;
+    getValue: (obj: any, k: any, intoUndefined?: import("@vunk/core").IntoUndefined | undefined, safe?: boolean | undefined) => any;
     getRef: (e: InstanceType<typeof ElForm>) => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     setData: (e: import("@vunk/core").SetDataEvent<any>) => import("@vunk/core").SetDataEvent<any>;

package/components/form-item/index.js

@@ -1,8 +1,9 @@
 import { formItemProps, ElFormItem } from 'element-plus';
 import { bindPropsFactory } from '@vunk/core/shared/utils-vue';
-import { defineComponent, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, renderSlot, renderList, resolveDynamicComponent } from 'vue';
+import { defineComponent, computed, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, renderSlot, renderList, resolveDynamicComponent } from 'vue';
 import { createFormItemBindProps } from '@vunk/form/shared/element-plus';
 import { useComputedReadonly } from '@vunk/form/composables';
+import { isNotEmptyObject } from '@vunk/core/shared/utils-object';
 
 var __defProp = Object.defineProperty;
 var __defProps = Object.defineProperties;
@@ -70,11 +71,21 @@ const _sfc_main = defineComponent({
   },
   props,
   setup(props2) {
-    const formItemBindProps = createFormItemBindProps(props2);
+    const formItemBindProps = createFormItemBindProps(props2, ["rules"]);
     const readonly = useComputedReadonly(props2);
+    const rules = computed(() => {
+      let data = props2.rules;
+      if (Array.isArray(data)) {
+        data = data.filter((rule) => {
+          return isNotEmptyObject(rule);
+        });
+      }
+      return data;
+    });
     return {
       formItemBindProps,
-      readonly
+      readonly,
+      rules
     };
   }
 });
@@ -87,7 +98,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }
   }, _ctx.formItemBindProps, {
     size: _ctx.formItemSize,
-    ref: _ctx.elRef
+    ref: _ctx.elRef,
+    rules: _ctx.rules
   }), createSlots({
     default: withCtx(() => [
       renderSlot(_ctx.$slots, "default")
@@ -102,7 +114,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       };
     })
-  ]), 1040, ["class", "size"]);
+  ]), 1040, ["class", "size", "rules"]);
 }
 var VkfFormItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "index.vue"]]);
 

package/components/form-item/src/index.vue.d.ts

@@ -56,7 +56,6 @@ declare const _default: import("vue").DefineComponent<Omit<{
         label: string | undefined;
         labelWidth: import("element-plus/es/utils").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
         prop: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp) | ((new (...args: any[]) => import("element-plus").FormItemProp & {}) | (() => import("element-plus").FormItemProp))[], unknown, unknown> | undefined;
-        rules: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>) | ((new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>))[], unknown, unknown> | undefined;
         error: string | undefined;
         validateStatus: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "error" | "success" | "validating", unknown> | undefined;
         for: string | undefined;
@@ -64,6 +63,7 @@ declare const _default: import("vue").DefineComponent<Omit<{
         showMessage: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     }>;
     readonly: import("vue").ComputedRef<boolean>;
+    rules: import("vue").ComputedRef<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>) | ((new (...args: any[]) => import("element-plus").FormItemRule | import("element-plus").FormItemRule[]) | (() => import("element-plus/es/utils").Arrayable<import("element-plus").FormItemRule>))[], unknown, unknown> | undefined>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Omit<{
     formItemSize: {
         type: import("vue").PropType<"default" | "small" | "large">;

package/components/templates-default/index.js

@@ -1,4 +1,4 @@
-import { defaultIntoUndefined } from '@vunk/core';
+import { NOOP } from '@vunk/core/shared/utils-function';
 import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createBlock, normalizeProps, mergeProps, createCommentVNode, resolveDynamicComponent } from 'vue';
 import { VkfFormItemRendererTemplate } from '@vunk/form/components/form-item-renderer-template';
 import { VkfInput } from '@vunk/form/components/input';
@@ -16,7 +16,7 @@ import { VkfButton } from '@vunk/form/components/button';
 import { VkfCascader } from '@vunk/form/components/cascader';
 import { VkfInputLink } from '@vunk/form/components/input-link';
 
-const createIntoUndefined = () => defaultIntoUndefined;
+const createIntoUndefined = () => NOOP;
 const props = {
   data: {
     type: Object,
@@ -65,7 +65,7 @@ const _sfc_main = defineComponent({
         raw,
         data: props2.data
       });
-      return getValue(props2.data, prop, intoUndefined);
+      return getValue(props2.data, prop, intoUndefined, true);
     };
     return {
       pickObject,

package/components/templates-default/src/ctx.d.ts

@@ -9,11 +9,11 @@ export declare const props: {
         type: PropType<(arg: {
             raw: any;
             data: Record<string, any>;
-        }) => import("@vunk/core").IntoUndefined>;
+        }) => import("@vunk/core/shared/types").IntoUndefined>;
         default: (arg: {
             raw: any;
             data: Record<string, any>;
-        }) => import("@vunk/core").IntoUndefined;
+        }) => import("@vunk/core/shared/types").IntoUndefined;
     };
 };
 export declare const emits: {

package/components/templates-default/src/ctx.js

@@ -1,6 +1,6 @@
-import { defaultIntoUndefined } from '@vunk/core';
+import { NOOP } from '@vunk/core/shared/utils-function';
 
-const createIntoUndefined = () => defaultIntoUndefined;
+const createIntoUndefined = () => NOOP;
 const props = {
   data: {
     type: Object,

package/components/templates-mapbox/src/index.vue.d.ts

@@ -4,7 +4,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
 }, {
-    getValue: (obj: any, k: any, intoUndefined?: import("@vunk/core").IntoUndefined | undefined) => any;
+    getValue: (obj: any, k: any, intoUndefined?: import("@vunk/core").IntoUndefined | undefined, safe?: boolean | undefined) => any;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     setData: (data: import("@vunk/core").SetDataEvent<any>) => import("@vunk/core").SetDataEvent<any>;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "description": "",
   "main": "index.esm.js",
   "scripts": {