@bagelink/vue 0.0.243 → 0.0.245

package/dist/components/form/BglField.vue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BglField.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BglField.vue"],"names":[],"mappings":"AAUA;AAEA,OAAO,EACN,KAAK,KAAK,EACV,MAAM,eAAe,CAAC;;WAuHf,KAAK;gBACA,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;WADxB,KAAK;gBACA,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;gBAAnB,OAAO,MAAM,EAAE,GAAG,CAAC;;AAPhC,wBAUG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}
+{"version":3,"file":"BglField.vue.d.ts","sourceRoot":"","sources":["../../../src/components/form/BglField.vue"],"names":[],"mappings":"AAUA;AAEA,OAAO,EACN,KAAK,KAAK,EACV,MAAM,eAAe,CAAC;;WAiIf,KAAK;gBACA,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;WADxB,KAAK;gBACA,OAAO,MAAM,EAAE,GAAG,CAAC;;;;;;gBAAnB,OAAO,MAAM,EAAE,GAAG,CAAC;;AAPhC,wBAUG;AACH,KAAK,sBAAsB,CAAC,CAAC,IAAI,CAAC,SAAS,SAAS,GAAG,KAAK,GAAG,CAAC,CAAC;AACjE,KAAK,6BAA6B,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,GAAG;QAAE,IAAI,EAAE,OAAO,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,EAAE,IAAI,CAAA;KAAE;CAAE,CAAC;AAC9M,KAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI;KAE1B,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG;QACxE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;KACb,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AACN,KAAK,cAAc,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAG,GAAG,EAAE,CAAC"}

package/dist/index.cjs

@@ -2365,14 +2365,15 @@ function bindAttrs(attrs, fieldVal, row) {
   return resolvedAttrs;
 }
 const iffer = (field, itemData) => {
+  var _a2;
   if (field["v-if"] === void 0)
     return true;
   if (typeof field["v-if"] === "boolean")
     return field["v-if"];
   if (typeof field["v-if"] === "string")
-    return !!itemData.value[field["v-if"]];
+    return true;
   if (typeof field["v-if"] === "function")
-    return field["v-if"](itemData == null ? void 0 : itemData[field.id], itemData);
+    return (_a2 = field["v-if"]) == null ? void 0 : _a2.call(field, itemData == null ? void 0 : itemData[field.id], itemData);
   return true;
 };
 const denullify = (itemData, fieldID) => fieldID && itemData ? itemData[fieldID] : null;
@@ -15766,29 +15767,34 @@ const _sfc_main$i = /* @__PURE__ */ vue.defineComponent({
     };
     __expose({ validateForm, deleteItem, isDirty: isDirty.value });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.id ? "div" : "form"), {
+      return _ctx.id ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.schema, (field, i3) => {
+        return vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$h), {
+          key: field.id || `${i3}p`,
+          field,
+          modelValue: data2.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data2.value = $event)
+        }, null, 8, ["field", "modelValue"]);
+      }), 128)) : (vue.openBlock(), vue.createElementBlock("form", {
+        key: 1,
         ref_key: "form",
         ref: form,
         onSubmit: vue.withModifiers(runSubmit, ["prevent"])
-      }, {
-        default: vue.withCtx(() => [
-          _ctx.label ? (vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$k), {
-            key: 0,
-            tag: "h4",
-            label: _ctx.label
-          }, null, 8, ["label"])) : vue.createCommentVNode("", true),
-          (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.schema, (field, i3) => {
-            return vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$h), {
-              key: field.id || `${i3}p`,
-              field,
-              modelValue: data2.value,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data2.value = $event)
-            }, null, 8, ["field", "modelValue"]);
-          }), 128)),
-          vue.renderSlot(_ctx.$slots, "submit")
-        ]),
-        _: 3
-      }, 544);
+      }, [
+        _ctx.label ? (vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$k), {
+          key: 0,
+          tag: "h4",
+          label: _ctx.label
+        }, null, 8, ["label"])) : vue.createCommentVNode("", true),
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.schema, (field, i3) => {
+          return vue.openBlock(), vue.createBlock(vue.unref(_sfc_main$h), {
+            key: field.id || `${i3}p`,
+            field,
+            modelValue: data2.value,
+            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => data2.value = $event)
+          }, null, 8, ["field", "modelValue"]);
+        }), 128)),
+        vue.renderSlot(_ctx.$slots, "submit")
+      ], 544));
     };
   }
 });
@@ -15825,12 +15831,25 @@ const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
         data2[props2.field.id] = val;
         emit2("update:modelValue", data2);
       },
-      get: () => props2.field.id ? props2.modelValue[props2.field.id] : ""
+      get: () => props2.field.id ? props2.modelValue[props2.field.id] : props2.field.defaultValue || ""
+    });
+    const vIf = vue.computed(() => {
+      var _a2, _b;
+      if (props2.field["v-if"] === void 0)
+        return true;
+      if (typeof props2.field["v-if"] === "boolean")
+        return props2.field["v-if"];
+      if (typeof props2.field["v-if"] === "string")
+        return true;
+      if (typeof props2.field["v-if"] === "function") {
+        return (_b = (_a2 = props2.field)["v-if"]) == null ? void 0 : _b.call(_a2, fieldData.value, formData.value);
+      }
+      return true;
     });
     return (_ctx, _cache) => {
       var _a2, _b;
       const _component_BglField = vue.resolveComponent("BglField", true);
-      return vue.unref(iffer)(_ctx.field, fieldData.value) ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(is4.value), vue.mergeProps({
+      return vIf.value ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(is4.value), vue.mergeProps({
         key: 0,
         required: _ctx.field.required
       }, vue.unref(bindAttrs)(((_a2 = _ctx.field) == null ? void 0 : _a2.attrs) || {}, fieldData.value, _ctx.modelValue), {

package/dist/index.mjs

@@ -2363,14 +2363,15 @@ function bindAttrs(attrs, fieldVal, row) {
   return resolvedAttrs;
 }
 const iffer = (field, itemData) => {
+  var _a2;
   if (field["v-if"] === void 0)
     return true;
   if (typeof field["v-if"] === "boolean")
     return field["v-if"];
   if (typeof field["v-if"] === "string")
-    return !!itemData.value[field["v-if"]];
+    return true;
   if (typeof field["v-if"] === "function")
-    return field["v-if"](itemData == null ? void 0 : itemData[field.id], itemData);
+    return (_a2 = field["v-if"]) == null ? void 0 : _a2.call(field, itemData == null ? void 0 : itemData[field.id], itemData);
   return true;
 };
 const denullify = (itemData, fieldID) => fieldID && itemData ? itemData[fieldID] : null;
@@ -15764,29 +15765,34 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
     };
     __expose({ validateForm, deleteItem, isDirty: isDirty.value });
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(resolveDynamicComponent(_ctx.id ? "div" : "form"), {
+      return _ctx.id ? (openBlock(true), createElementBlock(Fragment$1, { key: 0 }, renderList(_ctx.schema, (field, i3) => {
+        return openBlock(), createBlock(unref(_sfc_main$h), {
+          key: field.id || `${i3}p`,
+          field,
+          modelValue: data2.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data2.value = $event)
+        }, null, 8, ["field", "modelValue"]);
+      }), 128)) : (openBlock(), createElementBlock("form", {
+        key: 1,
         ref_key: "form",
         ref: form,
         onSubmit: withModifiers(runSubmit, ["prevent"])
-      }, {
-        default: withCtx(() => [
-          _ctx.label ? (openBlock(), createBlock(unref(_sfc_main$k), {
-            key: 0,
-            tag: "h4",
-            label: _ctx.label
-          }, null, 8, ["label"])) : createCommentVNode("", true),
-          (openBlock(true), createElementBlock(Fragment$1, null, renderList(_ctx.schema, (field, i3) => {
-            return openBlock(), createBlock(unref(_sfc_main$h), {
-              key: field.id || `${i3}p`,
-              field,
-              modelValue: data2.value,
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data2.value = $event)
-            }, null, 8, ["field", "modelValue"]);
-          }), 128)),
-          renderSlot(_ctx.$slots, "submit")
-        ]),
-        _: 3
-      }, 544);
+      }, [
+        _ctx.label ? (openBlock(), createBlock(unref(_sfc_main$k), {
+          key: 0,
+          tag: "h4",
+          label: _ctx.label
+        }, null, 8, ["label"])) : createCommentVNode("", true),
+        (openBlock(true), createElementBlock(Fragment$1, null, renderList(_ctx.schema, (field, i3) => {
+          return openBlock(), createBlock(unref(_sfc_main$h), {
+            key: field.id || `${i3}p`,
+            field,
+            modelValue: data2.value,
+            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => data2.value = $event)
+          }, null, 8, ["field", "modelValue"]);
+        }), 128)),
+        renderSlot(_ctx.$slots, "submit")
+      ], 544));
     };
   }
 });
@@ -15823,12 +15829,25 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
         data2[props2.field.id] = val;
         emit2("update:modelValue", data2);
       },
-      get: () => props2.field.id ? props2.modelValue[props2.field.id] : ""
+      get: () => props2.field.id ? props2.modelValue[props2.field.id] : props2.field.defaultValue || ""
+    });
+    const vIf = computed(() => {
+      var _a2, _b;
+      if (props2.field["v-if"] === void 0)
+        return true;
+      if (typeof props2.field["v-if"] === "boolean")
+        return props2.field["v-if"];
+      if (typeof props2.field["v-if"] === "string")
+        return true;
+      if (typeof props2.field["v-if"] === "function") {
+        return (_b = (_a2 = props2.field)["v-if"]) == null ? void 0 : _b.call(_a2, fieldData.value, formData.value);
+      }
+      return true;
     });
     return (_ctx, _cache) => {
       var _a2, _b;
       const _component_BglField = resolveComponent("BglField", true);
-      return unref(iffer)(_ctx.field, fieldData.value) ? (openBlock(), createBlock(resolveDynamicComponent(is4.value), mergeProps({
+      return vIf.value ? (openBlock(), createBlock(resolveDynamicComponent(is4.value), mergeProps({
         key: 0,
         required: _ctx.field.required
       }, unref(bindAttrs)(((_a2 = _ctx.field) == null ? void 0 : _a2.attrs) || {}, fieldData.value, _ctx.modelValue), {

package/dist/types/BagelForm.d.ts

@@ -15,9 +15,9 @@ export type BaseBagelField<T = Record<string, any>> = {
     required?: boolean;
     helptext?: string;
     options?: string | ({
-        label: string;
+        label?: string;
         value: string | number;
-    } | string | number)[];
+    } | string | number | Record<string, any>)[];
     defaultValue?: any;
     transform?: (val?: any, rowData?: Record<string, any>) => any;
     onUpdate?: (val: any, fieldData?: any, rowData?: Record<string, any>) => void;
@@ -31,10 +31,6 @@ export interface InputBagelField<T> extends BaseBagelField<T> {
 export interface SelectBagelField<T> extends BaseBagelField<T> {
     $el: 'select' | typeof SelectInput;
     id: string;
-    options: string | ({
-        label: string;
-        value: string | number;
-    } | string | number)[];
 }
 export type Field<T = Record<string, any>> = BaseBagelField<T> | InputBagelField<T> | SelectBagelField<T>;
 export type BglFormSchemaT<T = Record<string, any>> = Field<T>[];

package/dist/types/BagelForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BagelForm.d.ts","sourceRoot":"","sources":["../../src/types/BagelForm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BagelForm.d.ts","sourceRoot":"","sources":["../../src/types/BagelForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAEhG,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,cAAc,CAAC;AAE1F,MAAM,WAAW,UAAU,CAAC,CAAC,GAAG,GAAG;IACjC,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;CAC/C;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;IACpD,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACtB,KAAK,CAAC,EAAE,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IACxC,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;IAC1G,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,GAAG,CAAC;IAC9D,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;IAC9E,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC;CAC7D,CAAA;AAED,MAAM,WAAW,eAAe,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC3D,GAAG,EAAE,MAAM,GAAG,OAAO,SAAS,CAAC;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,CAAE,SAAQ,cAAc,CAAC,CAAC,CAAC;IAC5D,GAAG,EAAE,QAAQ,GAAG,OAAO,WAAW,CAAC;IACnC,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,MAAM,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;AAE1G,MAAM,MAAM,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/vue",
   "type": "module",
-  "version": "0.0.243",
+  "version": "0.0.245",
   "description": "Bagel core sdk packages",
   "author": {
     "name": "Neveh Allon",

package/src/components/form/BglField.vue

@@ -1,7 +1,7 @@
 <template>
 	<component :required="field.required" v-bind="bindAttrs(field?.attrs || {}, fieldData, modelValue)"
-		:class="classify(fieldData, modelValue, field.class, field.attrs?.class)" v-if="iffer(field, fieldData)" :is="is"
-		:label="field.label" :id="field.id" :placeholder="field.placeholder || field.label" v-model="fieldData"
+		:class="classify(fieldData, modelValue, field.class, field.attrs?.class)" v-if="vIf" :is="is" :label="field.label"
+		:id="field.id" :placeholder="field.placeholder || field.label" v-model="fieldData"
 		:defaultValue="field.defaultValue" :options="field.options" :helptext="field.helptext"
 		@update:modelValue="($event: any) => field?.onUpdate?.($event, denullify(fieldData, field.id), formData)">
 		{{ field.transform?.(fieldData, modelValue) || fieldData || '' }}
@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 import {
-	type Field, bindAttrs, classify, SelectInput, TextInput, ToggleInput, CheckInput, iffer, denullify,
+	type Field, bindAttrs, classify, SelectInput, TextInput, ToggleInput, CheckInput, denullify,
 } from '@bagelink/vue';
 
 const props = withDefaults(defineProps<{
@@ -43,6 +43,16 @@ const fieldData = $computed({
 		data[props.field.id] = val;
 		emit('update:modelValue', data);
 	},
-	get: () => (props.field.id ? props.modelValue[props.field.id] : ''),
+	get: () => (props.field.id ? props.modelValue[props.field.id] : props.field.defaultValue || ''),
+});
+
+const vIf = $computed(() => {
+	if (props.field['v-if'] === undefined) return true;
+	if (typeof props.field['v-if'] === 'boolean') return props.field['v-if'];
+	if (typeof props.field['v-if'] === 'string') return true;
+	if (typeof props.field['v-if'] === 'function') {
+		return props.field['v-if']?.(fieldData, formData);
+	}
+	return true;
 });
 </script>

package/src/components/form/BglForm.vue

@@ -1,9 +1,12 @@
 <template>
-	<component :is="id?'div':'form'" ref="form" @submit.prevent="runSubmit">
+	<template v-if="id">
+		<BglField v-for="(field, i) in schema" :key="field.id || `${i}p`" :field="field" v-model="data" />
+	</template>
+	<form v-else ref="form" @submit.prevent="runSubmit">
 		<Title tag="h4" :label="label" v-if="label" />
 		<BglField v-for="(field, i) in schema" :key="field.id || `${i}p`" :field="field" v-model="data" />
 		<slot name="submit" />
-	</component>
+	</form>
 </template>
 
 <script lang="ts" setup>

package/src/types/BagelForm.ts

@@ -18,7 +18,7 @@ export type BaseBagelField<T = Record<string, any>> = {
   attrs?: Attributes<T>;
   required?: boolean;
   helptext?: string;
-  options?: string | ({ label: string; value: string | number } | string | number)[],
+  options?: string | ({ label?: string; value: string | number } | string | number | Record<string, any>)[],
   defaultValue?: any;
   transform?: (val?: any, rowData?: Record<string, any>) => any;
   onUpdate?: (val: any, fieldData?: any, rowData?: Record<string, any>) => void;
@@ -34,7 +34,6 @@ export interface InputBagelField<T> extends BaseBagelField<T> {
 export interface SelectBagelField<T> extends BaseBagelField<T> {
   $el: 'select' | typeof SelectInput;
   id: string;
-  options: string | ({ label: string; value: string | number } | string | number)[],
 }
 
 export type Field<T = Record<string, any>> = BaseBagelField<T> | InputBagelField<T> | SelectBagelField<T>;

package/src/utils/index.ts

@@ -51,8 +51,8 @@ export function bindAttrs<T = Record<string, any>>(attrs?: Attributes, fieldVal?
 export const iffer = (field: any, itemData: any) => {
 	if (field['v-if'] === undefined) return true;
 	if (typeof field['v-if'] === 'boolean') return field['v-if'];
-	if (typeof field['v-if'] === 'string') return !!itemData.value[field['v-if']];
-	if (typeof field['v-if'] === 'function') return field['v-if']!(itemData?.[field.id], itemData);
+	if (typeof field['v-if'] === 'string') return true;
+	if (typeof field['v-if'] === 'function') return field['v-if']?.(itemData?.[field.id], itemData);
 	return true;
 };