@vunk/form 1.1.47 → 1.1.48

package/components/form/index.js

@@ -8,6 +8,7 @@ import { getValue } from '@vunk/core/shared/helper';
 import { VkfTemplatesDefault } from '@vunk/form/components/templates-default';
 import { VkfTemplatesLayout } from '@vunk/form/components/templates-layout';
 import { pickObject } from '@vunk/core/shared/utils-object';
+import { genTemplateIfFunc } from '@vunk/form/shared/form';
 
 var __defProp$1 = Object.defineProperty;
 var __defProps$1 = Object.defineProperties;
@@ -163,6 +164,13 @@ const _sfc_main = defineComponent({
             a.push(c);
             return a;
           }
+          if (Reflect.has(c, "templateIf")) {
+            const templateIfFunc = genTemplateIfFunc(c.templateIf);
+            const flag = templateIfFunc(props2.data);
+            if (!flag) {
+              return a;
+            }
+          }
           const colItem = genColItem(c, props2.colSource);
           if (!lastRow || getRowEmptySpan(lastRow) < itemSpan) {
             a.push(genRowItem(colItem, props2.rowSource));

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

@@ -1,4 +1,5 @@
 import { defineComponent, shallowReactive, provide, h, nextTick } from 'vue';
+import { genTemplateIfFunc } from '@vunk/form/shared/form';
 
 const props = {
   source: {
@@ -56,25 +57,13 @@ const VkfFormItemRenderer = defineComponent({
           Reflect.deleteProperty(slotData, "templateType");
           Reflect.deleteProperty(slotData, "templateSlots");
           Reflect.deleteProperty(slotData, "templateIf");
-          const createTemplateIf = () => {
-            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 = templateInstances[c.templateType].slots.default?.({
             data: slotData,
             raw: c,
             Renderer,
             k: currentK,
             key: currentK.join(",") + "-" + c.templateType + "-" + c?.prop || "no-prop",
-            templateIf: createTemplateIf()
+            templateIf: genTemplateIfFunc(c.templateIf)
           });
           nodes && a.push(nodes);
         } else if (c.templateSlots?.default) {

package/package.json

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

package/shared/form/index.d.ts

@@ -1,3 +1,4 @@
+import { Func, NormalObject } from '@vunk/core';
 /**
  * 表单验证失败, 处理方式
  * 消息提示
@@ -7,3 +8,11 @@ export declare const validateCatch: (err: any, init?: {
     prefix?: string;
     suffix?: string;
 }) => void;
+/**
+ * 根据 templateIf 生成 显隐函数
+ * @param templateIfRaw
+ * @returns
+ */
+export declare const genTemplateIfFunc: Func<[
+    any
+], (e?: NormalObject) => boolean>;

package/shared/form/index.js

@@ -14,5 +14,17 @@ const validateCatch = (err, init = {}) => {
     message: msg
   });
 };
+const genTemplateIfFunc = (templateIfRaw) => {
+  if (typeof templateIfRaw === "boolean") {
+    const flag = templateIfRaw;
+    return () => flag;
+  } else if (typeof templateIfRaw === "string") {
+    const templateIf = new Function("data", templateIfRaw);
+    return templateIf;
+  } else if (typeof templateIfRaw === "function") {
+    return templateIfRaw;
+  }
+  return () => true;
+};
 
-export { validateCatch };
+export { genTemplateIfFunc, validateCatch };