@bagelink/vue 1.1.31 → 1.1.35-beta.2

package/src/utils/BagelFormUtils.ts

@@ -1,7 +1,7 @@
-import type { BglFormSchemaT, Field, InputBagelField, Option, PropertyPath, SelectBagelField } from '@bagelink/vue'
+import type { BglFormSchemaT, Field, InputBagelField, Option, PropertyPath, SelectBagelField, VIfType } from '@bagelink/vue'
 import type { UploadInputProps } from '../components/form/inputs/Upload/upload.types'
 
-interface InputOptions {
+interface InputOptions<T, K> {
 	required?: boolean
 	placeholder?: string
 	class?: string
@@ -9,30 +9,30 @@ interface InputOptions {
 	disabled?: boolean
 	helptext?: string
 	autocomplete?: string
-	vIf?: boolean | ((item: any, row: any) => boolean)
+	vIf?: VIfType<T, K>
 }
 
-interface DateOptions extends InputOptions {
+interface DateOptions<T, K> extends InputOptions<T, K> {
 	enableTime?: boolean
 	mode?: 'day' | 'month' | 'year'
 	locale?: string
 	timezone?: string
 }
 
-interface TextInputOptions extends InputOptions {
+interface TextInputOptions<T, K> extends InputOptions<T, K> {
 	type?: 'text' | 'tel' | 'email'
 	pattern?: string
 	multiline?: boolean
 }
 
-interface SlctInputOptions extends InputOptions {
+interface SlctInputOptions<T, K> extends InputOptions<T, K> {
 	searchable?: boolean
 	multiselect?: boolean
 	clearable?: boolean
 	onSearch?: (search: string) => any
 }
 
-interface NumFieldOptions extends InputOptions {
+interface NumFieldOptions<T, K> extends InputOptions<T, K> {
 	max?: number
 	min?: number
 	step?: number
@@ -42,7 +42,7 @@ interface NumFieldOptions extends InputOptions {
 	useGrouping?: boolean
 }
 
-type RichTextOptions = InputOptions
+type RichTextOptions<T, K> = InputOptions<T, K>
 
 export function getBaseField<T extends { [key: string]: any }>(
 	id?: PropertyPath<T>,
@@ -56,7 +56,7 @@ export function getBaseField<T extends { [key: string]: any }>(
 export function richText<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: RichTextOptions,
+	options?: RichTextOptions<T, PropertyPath<T>>,
 ): Field<T> {
 	return {
 		$el: 'richtext',
@@ -75,7 +75,7 @@ export function richText<T extends { [key: string]: any }>(
 export function txtField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: TextInputOptions,
+	options?: TextInputOptions<T, PropertyPath<T>> & Partial<Field<T>>,
 ): InputBagelField<T> {
 	return {
 		$el: 'text',
@@ -87,6 +87,7 @@ export function txtField<T extends { [key: string]: any }>(
 		disabled: options?.disabled,
 		placeholder: options?.placeholder,
 		defaultValue: options?.defaultValue,
+		validate: options?.validate,
 		attrs: {
 			type: options?.type,
 			pattern: options?.pattern,
@@ -100,7 +101,7 @@ export function selectField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
 	options?: Option[] | (() => Option[]),
-	config?: SlctInputOptions,
+	config?: SlctInputOptions<T, PropertyPath<T>>,
 ): SelectBagelField<T> {
 	return {
 		$el: 'select',
@@ -128,7 +129,7 @@ export const slctField = selectField
 export function checkField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: InputOptions,
+	options?: InputOptions<T, PropertyPath<T>>,
 ): Field<T> {
 	return {
 		$el: 'check',
@@ -142,7 +143,7 @@ export function checkField<T extends { [key: string]: any }>(
 export function dateField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: DateOptions,
+	options?: DateOptions<T, PropertyPath<T>>,
 ): Field<T> {
 	return {
 		$el: 'date',
@@ -167,7 +168,7 @@ export function dateField<T extends { [key: string]: any }>(
 export function numField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: NumFieldOptions,
+	options?: NumFieldOptions<T, PropertyPath<T>>,
 ): Field<T> {
 	return {
 		$el: 'number',
@@ -193,7 +194,7 @@ export function numField<T extends { [key: string]: any }>(
 	}
 }
 
-export function frmRow<T>(...children: Field[]): Field<T> {
+export function frmRow<T>(...children: Field<T>[]): Field<T> {
 	return {
 		$el: 'div',
 		class: 'flex gap-1 m_block align-items-end',
@@ -201,9 +202,9 @@ export function frmRow<T>(...children: Field[]): Field<T> {
 	}
 }
 
-export type UploadOptions = InputOptions & UploadInputProps
+export type UploadOptions<T, K> = InputOptions<T, K> & UploadInputProps
 
-export function uploadField(id: string, label?: string, options?: UploadOptions) {
+export function uploadField(id: string, label?: string, options?: UploadOptions<any, any>): Field<any> {
 	return {
 		$el: 'upload',
 		id,
@@ -215,7 +216,7 @@ export function uploadField(id: string, label?: string, options?: UploadOptions)
 	}
 }
 
-interface RangeOptions extends InputOptions {
+interface RangeOptions<T, K> extends InputOptions<T, K> {
 	min?: number
 	max?: number
 	step?: number
@@ -227,7 +228,7 @@ interface RangeOptions extends InputOptions {
 export function rangeField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label?: string,
-	options?: RangeOptions,
+	options?: RangeOptions <T, PropertyPath<T>>
 ): Field<T> {
 	return {
 		$el: 'range',
@@ -306,7 +307,7 @@ export function findBglFieldById(id: string, _schema: BglFormSchemaT): Field | u
 	return undefined
 }
 
-interface ArrayFieldOptions extends InputOptions {
+interface ArrayFieldOptions<T, K> extends InputOptions<T, K> {
 	delete?: boolean
 	add?: boolean
 }
@@ -317,9 +318,9 @@ export function arrField<T extends { [key: string]: any }>(
 	id: PropertyPath<T>,
 	label: string,
 	schemaOrType: BglFormSchemaT | ArrayType,
-	options?: ArrayFieldOptions
+	options?: ArrayFieldOptions<T, PropertyPath<T>>
 ): Field<T> {
-	const attrs: Record<string, any> = { delete: true, add: true, ...options }
+	const attrs: { [key: string]: any } = { delete: true, add: true, ...options }
 	if (typeof schemaOrType === 'string') attrs.type = schemaOrType
 	else attrs.schema = schemaOrType
 	return {

package/src/utils/index.ts

@@ -55,7 +55,7 @@ export function classify(fieldVal?: any, row?: any, ...classes: any[]) {
 }
 
 export function bindAttrs<T = { [key: string]: any }>(
-	attrs?: Attributes,
+	attrs?: Attributes<T>,
 	fieldVal?: any,
 	row?: T
 ) {