@vunk/form 0.0.1-alpha.10 → 0.0.1-alpha.11

package/components/form-item-renderer/index.js

@@ -65,11 +65,25 @@ const VkfFormItemRenderer = defineComponent({
           const slotData = __spreadValues({}, c);
           Reflect.deleteProperty(slotData, "templateType");
           Reflect.deleteProperty(slotData, "templateSlots");
+          Reflect.deleteProperty(slotData, "templateIf");
+          const createIsShow = () => {
+            if (typeof c.templateIf === "boolean") {
+              const flag = c.templateIf;
+              return () => flag;
+            } else if (typeof c.templateIf === "string") {
+              const templateIf = new Function("data", c.templateIf);
+              return templateIf;
+            } else if (typeof c.templateIf === "function") {
+              return c.templateIf;
+            }
+            return () => true;
+          };
           const nodes = (_b = (_a2 = templateInstances[c.templateType].slots).default) == null ? void 0 : _b.call(_a2, {
             data: slotData,
             raw: c,
             Renderer,
-            k: currentK
+            k: currentK,
+            isShow: createIsShow()
           });
           nodes && a.push(nodes);
         } else if ((_c = c.templateSlots) == null ? void 0 : _c.default) {

package/components/form-item-renderer/src/types.d.ts

@@ -1,5 +1,7 @@
+import { NormalObject } from '@vunk/core';
 export interface RendererTreeData {
     templateType?: string;
     templateSlots?: any;
+    templateIf?: string | ((e: NormalObject) => boolean) | boolean;
     [k: string]: any;
 }

package/components/form-item-renderer-template-default/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, mergeProps, createBlock, resolveDynamicComponent, normalizeProps, guardReactiveProps } from 'vue';
+import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createBlock, mergeProps, createCommentVNode, resolveDynamicComponent, normalizeProps } from 'vue';
 import { VkfFormItemRendererTemplate } from '@vunk/form/components/form-item-renderer-template';
 import { VkfInput } from '@vunk/form/components/input';
 import { VkfSwitch } from '@vunk/form/components/switch';
@@ -47,68 +47,73 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_VkfInputNumber = resolveComponent("VkfInputNumber");
   return openBlock(), createElementBlock(Fragment, null, [
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfInput" }, {
-      default: withCtx(({ data: sourceData }) => [
-        createVNode(_component_VkfInput, mergeProps({
+      default: withCtx(({ data: sourceData, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_VkfInput, mergeProps({
+          key: 0,
           modelValue: _ctx.getValue(_ctx.data, sourceData.prop),
           "onUpdate:modelValue": ($event) => _ctx.$emit("setData", {
             k: sourceData.prop,
             v: $event
           })
-        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])
+        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfSwitch" }, {
-      default: withCtx(({ data: sourceData }) => [
-        createVNode(_component_VkfSwitch, mergeProps({
+      default: withCtx(({ data: sourceData, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_VkfSwitch, mergeProps({
+          key: 0,
           modelValue: _ctx.getValue(_ctx.data, sourceData.prop),
           "onUpdate:modelValue": ($event) => _ctx.$emit("setData", {
             k: sourceData.prop,
             v: $event
           })
-        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])
+        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfSelect" }, {
-      default: withCtx(({ data: sourceData }) => [
-        createVNode(_component_VkfSelect, mergeProps({
+      default: withCtx(({ data: sourceData, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_VkfSelect, mergeProps({
+          key: 0,
           modelValue: _ctx.getValue(_ctx.data, sourceData.prop),
           "onUpdate:modelValue": ($event) => _ctx.$emit("setData", {
             k: sourceData.prop,
             v: $event
           })
-        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])
+        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfDatePicker" }, {
-      default: withCtx(({ data: sourceData }) => [
-        createVNode(_component_VkfDatePicker, mergeProps({
+      default: withCtx(({ data: sourceData, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_VkfDatePicker, mergeProps({
+          key: 0,
           modelValue: _ctx.getValue(_ctx.data, sourceData.prop),
           "onUpdate:modelValue": ($event) => _ctx.$emit("setData", {
             k: sourceData.prop,
             v: $event
           })
-        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])
+        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfInputNumber" }, {
-      default: withCtx(({ data: sourceData }) => [
-        createVNode(_component_VkfInputNumber, mergeProps({
+      default: withCtx(({ data: sourceData, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_VkfInputNumber, mergeProps({
+          key: 0,
           modelValue: _ctx.getValue(_ctx.data, sourceData.prop),
           "onUpdate:modelValue": ($event) => _ctx.$emit("setData", {
             k: sourceData.prop,
             v: $event
           })
-        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])
+        }, sourceData), null, 16, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "Component" }, {
-      default: withCtx(({ data, raw }) => [
-        (openBlock(), createBlock(resolveDynamicComponent(typeof data.is === "function" ? data.is(raw) : data.is), normalizeProps(guardReactiveProps(_ctx.pickObject(data, { excludes: ["is"] }))), null, 16))
+      default: withCtx(({ data, raw, isShow }) => [
+        isShow(data) ? (openBlock(), createBlock(resolveDynamicComponent(typeof data.is === "function" ? data.is(raw) : data.is), normalizeProps(mergeProps({ key: 0 }, _ctx.pickObject(data, { excludes: ["is"] }))), null, 16)) : createCommentVNode("v-if", true)
       ]),
       _: 1
     })

package/components/form-item-renderer-template-layout/index.js

@@ -1,10 +1,18 @@
-import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, normalizeProps, guardReactiveProps, createBlock, resolveDynamicComponent, createElementVNode, mergeProps } from 'vue';
+import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createBlock, normalizeProps, mergeProps, resolveDynamicComponent, createCommentVNode } from 'vue';
 import { VkfFormItemRendererTemplate } from '@vunk/form/components/form-item-renderer-template';
 import { ElRow, ElCol } from 'element-plus';
 import { pickObject } from '@vunk/core/shared/utils-object';
 
+const props = {
+  data: {
+    type: Object,
+    default: () => ({})
+  }
+};
+
 var script = defineComponent({
   name: "VkfFormItemRendererTemplateLayout",
+  props,
   components: {
     ElRow,
     ElCol,
@@ -23,8 +31,8 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElCol = resolveComponent("ElCol");
   return openBlock(), createElementBlock(Fragment, null, [
     createVNode(_component_VkfFormItemRendererTemplate, { type: "ElRow" }, {
-      default: withCtx(({ data, Renderer, raw, k }) => [
-        createVNode(_component_ElRow, normalizeProps(guardReactiveProps(data)), {
+      default: withCtx(({ data: props, Renderer, raw, k, isShow }) => [
+        isShow(_ctx.data) ? (openBlock(), createBlock(_component_ElRow, normalizeProps(mergeProps({ key: 0 }, props)), {
           default: withCtx(() => [
             (openBlock(), createBlock(resolveDynamicComponent(Renderer), {
               source: raw.templateSlots,
@@ -32,13 +40,13 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["source", "k"]))
           ]),
           _: 2
-        }, 1040)
+        }, 1040)) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "ElCol" }, {
-      default: withCtx(({ data, Renderer, raw, k }) => [
-        createVNode(_component_ElCol, normalizeProps(guardReactiveProps(data)), {
+      default: withCtx(({ data, Renderer, raw, k, isShow }) => [
+        isShow(data) ? (openBlock(), createBlock(_component_ElCol, normalizeProps(mergeProps({ key: 0 }, data)), {
           default: withCtx(() => [
             (openBlock(), createBlock(resolveDynamicComponent(Renderer), {
               source: raw.templateSlots,
@@ -46,13 +54,14 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["source", "k"]))
           ]),
           _: 2
-        }, 1040)
+        }, 1040)) : createCommentVNode("v-if", true)
       ]),
       _: 1
     }),
     createVNode(_component_VkfFormItemRendererTemplate, { type: "VkfFlex" }, {
-      default: withCtx(({ data, Renderer, raw, k }) => [
-        createElementVNode("div", mergeProps({
+      default: withCtx(({ data, Renderer, raw, k, isShow }) => [
+        isShow(data) ? (openBlock(), createElementBlock("div", mergeProps({
+          key: 0,
           class: "vkf-flex",
           style: {
             "justify-content": data.justify,
@@ -70,7 +79,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
             source: raw.templateSlots,
             k: [...k, "templateSlots"]
           }, null, 8, ["source", "k"]))
-        ], 16)
+        ], 16)) : createCommentVNode("v-if", true)
       ]),
       _: 1
     })

package/components/form-item-renderer-template-layout/src/ctx.d.ts

@@ -1,7 +1,8 @@
+import { NormalObject } from '@vunk/core';
 import { PropType } from 'vue';
 export declare const props: {
-    modelValue: {
-        type: PropType<unknown>;
+    data: {
+        type: PropType<NormalObject>;
         default: () => {};
     };
 };

package/components/form-item-renderer-template-layout/src/ctx.js

@@ -1,5 +1,5 @@
 const props = {
-  modelValue: {
+  data: {
     type: Object,
     default: () => ({})
   }

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

@@ -1,7 +1,19 @@
-declare const _default: import("vue").DefineComponent<{}, {
+declare const _default: import("vue").DefineComponent<{
+    data: {
+        type: import("vue").PropType<import("@vunk/core").NormalObject>;
+        default: () => {};
+    };
+}, {
     pickObject: <T extends import("@vunk/core").NormalObject, EX extends (keyof T)[] | undefined, KI extends keyof T>(data: T, opts?: {
         excludes?: EX | undefined;
         includes?: KI[] | undefined;
     } | undefined) => { [P in EX extends (infer KE)[] ? Exclude<KI, KE> : KI]: T[P]; };
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    data: {
+        type: import("vue").PropType<import("@vunk/core").NormalObject>;
+        default: () => {};
+    };
+}>>, {
+    data: import("@vunk/core").NormalObject;
+}>;
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vunk/form",
-  "version": "0.0.1-alpha.10",
+  "version": "0.0.1-alpha.11",
   "description": "",
   "main": "index.esm.js",
   "scripts": {

package/shared/types/basic-source/index.d.ts

@@ -0,0 +1,5 @@
+import { NormalObject } from '@vunk/core';
+export interface BasicSource {
+    templateIf?: ((data?: NormalObject) => boolean) | string | boolean;
+    templateType?: string;
+}

package/shared/types/basic-source/index.js

@@ -0,0 +1 @@
+

package/shared/types/layout-source/index.d.ts

@@ -1,10 +1,11 @@
 import { VueComponentPropsType } from '@vunk/core';
 import { ElCol, ElRow } from 'element-plus';
-export interface ElRowSource<S> extends VueComponentPropsType<typeof ElRow> {
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
+export interface ElRowSource<S> extends VueComponentPropsType<typeof ElRow>, BasicSource {
     templateType: 'ElRow';
     templateSlots: S[];
 }
-export interface ElColSource<S> extends VueComponentPropsType<typeof ElCol> {
+export interface ElColSource<S> extends VueComponentPropsType<typeof ElCol>, BasicSource {
     templateType: 'ElCol';
     templateSlots: S[];
 }
@@ -22,7 +23,7 @@ interface VkfFlexItem {
     basis?: string | IntrinsicSizing | GlobalValues | 'revert' | 'revert-layer' | 'content';
     overflow?: 'hidden' | 'visible' | 'scroll' | 'auto' | string;
 }
-export interface VkfFlexSource<S> extends VkfFlex, VkfFlexItem {
+export interface VkfFlexSource<S> extends VkfFlex, VkfFlexItem, BasicSource {
     templateType: 'VkfFlex';
     templateSlots?: S[];
     [s: string]: any;

package/shared/types/renderer-source/compoent.d.ts

@@ -1,5 +1,7 @@
 import type { Merge } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type ComponentSource<C = undefined> = Merge<{
     templateType: 'Component';
+    templateIf?: BasicSource['templateIf'];
     is: any;
 }, C>;

package/shared/types/renderer-source/date-picker.d.ts

@@ -1,7 +1,8 @@
 import { VkfDatePicker } from '@vunk/form/components/date-picker';
 import type { Merge, VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type VkfDatePickerProps<T = undefined> = Merge<VueComponentPropsType<typeof VkfDatePicker>, T>;
-export declare type VkfDatePickerSource<P = string> = VkfDatePickerProps<{
+export interface VkfDatePickerSource<P extends string = string> extends VkfDatePickerProps, BasicSource {
     prop: P;
     templateType: 'VkfDatePicker';
-}>;
+}

package/shared/types/renderer-source/index.d.ts

@@ -10,4 +10,4 @@ export * from './input';
 export * from './select';
 export * from './switch';
 export * from './input-number';
-export declare type FormItemRendererSource<P = string> = VkfInputSource<P> | VkfSwitchSource<P> | VkfSelectSource<P> | VkfDatePickerSource<P> | VkfInputNumberSource<P> | ComponentSource;
+export declare type FormItemRendererSource<P extends string = string> = VkfInputSource<P> | VkfSwitchSource<P> | VkfSelectSource<P> | VkfDatePickerSource<P> | VkfInputNumberSource<P> | ComponentSource;

package/shared/types/renderer-source/input-number.d.ts

@@ -1,7 +1,8 @@
 import { VkfInputNumber } from '@vunk/form/components/input-number';
 import type { Merge, VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type VkfInputNumberProps<T = undefined> = Merge<VueComponentPropsType<typeof VkfInputNumber>, T>;
-export declare type VkfInputNumberSource<P = string> = VkfInputNumberProps<{
+export interface VkfInputNumberSource<P extends string = string> extends VkfInputNumberProps, BasicSource {
     prop: P;
     templateType: 'VkfInputNumber';
-}>;
+}

package/shared/types/renderer-source/input.d.ts

@@ -1,7 +1,8 @@
 import { VkfInput } from '@vunk/form/components/input';
 import type { Merge, VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type VkfInputProps<T = undefined> = Merge<VueComponentPropsType<typeof VkfInput>, T>;
-export declare type VkfInputSource<P = string> = VkfInputProps<{
+export interface VkfInputSource<P extends string = string> extends VkfInputProps, BasicSource {
     prop: P;
     templateType: 'VkfInput';
-}>;
+}

package/shared/types/renderer-source/select.d.ts

@@ -1,7 +1,8 @@
 import { VkfSelect } from '@vunk/form/components/select';
 import type { Merge, VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type VkfSelectProps<T = undefined> = Merge<VueComponentPropsType<typeof VkfSelect>, T>;
-export declare type VkfSelectSource<P = string> = VkfSelectProps<{
+export interface VkfSelectSource<P extends string = string> extends VkfSelectProps, BasicSource {
     prop: P;
     templateType: 'VkfSelect';
-}>;
+}

package/shared/types/renderer-source/switch.d.ts

@@ -1,7 +1,8 @@
 import { VkfSwitch } from '@vunk/form/components/switch';
 import type { Merge, VueComponentPropsType } from '@vunk/core';
+import { BasicSource } from '@vunk/form/shared/types/basic-source';
 export declare type VkfSwitchProps<T = undefined> = Merge<VueComponentPropsType<typeof VkfSwitch>, T>;
-export declare type VkfSwitchSource<P = string> = VkfSwitchProps<{
+export interface VkfSwitchSource<P extends string = string> extends VkfSwitchProps, BasicSource {
     prop: P;
     templateType: 'VkfSwitch';
-}>;
+}