@vunk/form 2.8.0 → 2.9.0

package/components/form/index.cjs

@@ -14,6 +14,7 @@ var templatesLayout = require('@vunk/form/components/templates-layout');
 var utilsObject = require('@vunk/core/shared/utils-object');
 var form = require('@vunk/form/shared/form');
 var rendererData = require('@vunk/form/components/renderer-data');
+var object = require('@vunk/shared/object');
 var _pluginVue_exportHelper = require('../_plugin-vue_export-helper.cjs');
 
 const props = {
@@ -141,14 +142,19 @@ var _sfc_main = vue.defineComponent({
             a.push(c);
             return a;
           }
-          if (Reflect.has(c, "templateIf")) {
+          if (!c.templateLayout?.allowEmpty && Reflect.has(c, "templateIf")) {
             const templateIfFunc = form.genTemplateIfFunc(c.templateIf);
             const flag = templateIfFunc(props2.data);
             if (!flag) {
               return a;
             }
           }
-          const colItem = genColItem(c, props2.colSource);
+          const colItem = genColItem(c, object.pickObject({
+            ...props2.colSource,
+            ...c.templateLayout
+          }, {
+            excludes: ["allowEmpty", "span"]
+          }));
           if (!lastRow || getRowEmptySpan(lastRow) < itemSpan) {
             a.push(genRowItem(colItem, props2.rowSource));
           } else {

package/components/form/index.mjs

@@ -10,6 +10,7 @@ import { VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
 import { pickObject } from '@vunk/core/shared/utils-object';
 import { genTemplateIfFunc } from '@vunk/form/shared/form';
 import { VkfRendererData } from '@vunk/form/components/renderer-data';
+import { pickObject as pickObject$1 } from '@vunk/shared/object';
 import { _ as _export_sfc } from '../_plugin-vue_export-helper.mjs';
 
 const props = {
@@ -137,14 +138,19 @@ var _sfc_main = defineComponent({
             a.push(c);
             return a;
           }
-          if (Reflect.has(c, "templateIf")) {
+          if (!c.templateLayout?.allowEmpty && Reflect.has(c, "templateIf")) {
             const templateIfFunc = genTemplateIfFunc(c.templateIf);
             const flag = templateIfFunc(props2.data);
             if (!flag) {
               return a;
             }
           }
-          const colItem = genColItem(c, props2.colSource);
+          const colItem = genColItem(c, pickObject$1({
+            ...props2.colSource,
+            ...c.templateLayout
+          }, {
+            excludes: ["allowEmpty", "span"]
+          }));
           if (!lastRow || getRowEmptySpan(lastRow) < itemSpan) {
             a.push(genRowItem(colItem, props2.rowSource));
           } else {

package/components/form/src/types.d.ts

@@ -1,12 +1,25 @@
 import { __VkfTemplatesDefault } from '@vunk/form/components/templates-default';
 import { __VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
-export type FormItem<P extends string = string> = (__VkfTemplatesDefault.Source<P> | __VkfTemplatesLayout.ElRowSource<FormItem<P>> | __VkfTemplatesLayout.ElColSource<FormItem<P>> | __VkfTemplatesLayout.VkfFlexSource<FormItem<P>>) & {
+import { VueComponentPropsType } from '@vunk/shared';
+import { ElCol } from 'element-plus';
+export type LayoutProps = {
     /**
-     * 如果开启 props.itemLayout，那么
+     * 如果开启 props.layout，那么
      * span 将生效
      * 1-24 之间的数字
      */
     span?: number;
+    /**
+     * layout 配置
+     */
+    templateLayout?: TemplateLayout;
 };
+export type FormItem<P extends string = string> = (__VkfTemplatesDefault.Source<P> | __VkfTemplatesLayout.ElRowSource<FormItem<P>> | __VkfTemplatesLayout.ElColSource<FormItem<P>> | __VkfTemplatesLayout.VkfFlexSource<FormItem<P>>) & LayoutProps;
 export type ColItem = __VkfTemplatesLayout.ElColSource<FormItem>;
 export type RowItem = __VkfTemplatesLayout.ElRowSource<ColItem>;
+export interface TemplateLayout extends VueComponentPropsType<typeof ElCol> {
+    /**
+      * 允许空渲染
+      */
+    allowEmpty?: boolean;
+}

package/package.json

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