@neeloong/form 0.24.0 → 0.25.0

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.24.0
+* @neeloong/form v0.25.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -653,10 +653,10 @@ declare class Store<T = any, M = any> {
     /**
      * 异步校验
      * @overload
-     * @param {true} [path]
+     * @param {true} [self]
      * @returns {Promise<string[] | null>}
      */
-    validate(path?: true | undefined): Promise<string[] | null>;
+    validate(self?: true | undefined): Promise<string[] | null>;
     /**
      * 异步校验
      * @overload

package/index.full.js

@@ -1,5 +1,5 @@
 /*!
-* @neeloong/form v0.24.0
+* @neeloong/form v0.25.0
 * (c) 2024-2026 Fierflame
 * @license Apache-2.0
 */
@@ -1482,7 +1482,7 @@
   	/**
   	 * 异步校验
   	 * @overload
-  	 * @param {true} [path]
+  	 * @param {true} [self]
   	 * @returns {Promise<string[] | null>}
   	 */
   	/**
@@ -1505,6 +1505,7 @@
   				});
   		}
   		const selfPath = Array.isArray(path) ? path : [];
+  		if (this.#hidden.get()) { return Promise.resolve([]); }
   		const list = [this.validate(true).then(errors => {
   			if (!errors?.length) { return []; }
   			return [{ path: [...selfPath], store: /** @type {Store} */(this), errors }];
@@ -5626,6 +5627,7 @@
   			const body = root.appendChild(document.createElement('tr'));
   			const main = body.appendChild(document.createElement('td'));
   			main.colSpan = columns.length;
+  			main.appendChild(form);
   			body.hidden = true;
   			trigger = () => {
   				if (body.hidden) {
@@ -5718,6 +5720,64 @@
   	return root;
   }
 
+  /** @import { ArrayStore } from '../Store/index.mjs' */
+  /** @import { StoreLayout } from '../StoreLayout.types.mjs' */
+
+  /**
+   *
+   * @template T
+   * @param {ArrayStore} store
+   * @param {StoreLayout.Field<T>} layout
+   * @param {StoreLayout.Action[]} actionOptions
+   * @param {(fields: { field: string; width: any; label: any; }[]) => StoreLayout.Column<T>[]} createDefault
+   * @returns {StoreLayout.Column<T>[]}
+   */
+  function getColumns(store, layout, actionOptions, createDefault) {
+  	const fieldList = Object.entries(store.type || {})
+  		.filter(([k, v]) => typeof v?.type !== 'object')
+  		.map(([field, { width, label }]) => ({ field, width, label }));
+  	const headerColumns = layout.columns;
+  	if (Array.isArray(headerColumns)) {
+  		const map = new Map(fieldList.map(v => [v.field, v]));
+  		/** @type {(StoreLayout.Column<T> | null)[]} */
+  		const allColumns = headerColumns.map(v => {
+  			if (!v) { return null; }
+  			if (typeof v === 'number') { return { placeholder: v }; }
+  			if (typeof v === 'string') { return map.get(v) || null; }
+  			if (typeof v !== 'object') { return null; }
+  			if (Array.isArray(v)) {
+  				/** @type {Set<StoreLayout.Action>} */
+  				const options = new Set(actionOptions);
+  				const actions = v.filter(v => options.delete(v));
+  				if (!actions) { return null; }
+  				return { actions };
+  			}
+  			const { action, actions, field, placeholder, pattern, width, label } = v;
+  			if (field) {
+  				const define = map.get(field);
+  				if (define) {
+  					return { field, placeholder, width, label: label || define.label };
+  				}
+  			}
+  			const options = new Set(actionOptions);
+  			const allActions = [action, actions].flat().filter(v => v && options.delete(v));
+  			if (allActions.length) {
+  				return { actions: /** @type {StoreLayout.Action[]} */(allActions), width, label };
+  			}
+  			if (pattern) {
+  				return { pattern, placeholder, width, label };
+  			}
+  			if (placeholder || width) {
+  				return { placeholder, width, label };
+  			}
+  			return null;
+  		});
+  		const columns = /** @type {StoreLayout.Column<T>[]} */(allColumns.filter(Boolean));
+  		if (columns.length) { return columns; }
+  	}
+  	return createDefault(fieldList);
+  }
+
   /** @import { Store, ArrayStore } from '../Store/index.mjs' */
   /** @import { StoreLayout } from '../StoreLayout.types.mjs' */
 
@@ -5748,6 +5808,7 @@
   		watch(() => !addable.get(), disabled => { button.disabled = disabled; }, true, signal);
   	}
   }
+
   /**
    *
    * @template T
@@ -5759,54 +5820,15 @@
    */
   function Table(store, fieldRenderer, layout, options) {
   	if (options?.signal?.aborted) { return null; }
-  	const headerColumns = layout.columns;
-  	const fieldList = Object.entries(store.type || {})
-  		.filter(([k, v]) => typeof v?.type !== 'object')
-  		.map(([field, { width, label }]) => ({ field, width, label }));
-  	/** @type {StoreLayout.Column<T>[]} */
-  	let columns = [];
-  	if (Array.isArray(headerColumns)) {
-  		const map = new Map(fieldList.map(v => [v.field, v]));
-
-  		/** @type {(StoreLayout.Column<T> | null)[]} */
-  		const allColumns = headerColumns.map(v => {
-  			if (!v) { return null; }
-  			if (typeof v === 'number') { return { placeholder: v }; }
-  			if (typeof v === 'string') { return map.get(v) || null; }
-  			if (typeof v !== 'object') { return null; }
-  			if (Array.isArray(v)) {
-  				/** @type {Set<StoreLayout.Action>} */
-  				const options = new Set(['add', 'move', 'trigger', 'remove', 'serial', 'open', 'collapse']);
-  				const actions = v.filter(v => options.delete(v));
-  				if (!actions) { return null; }
-  				return { actions };
-  			}
-  			const { action, actions, field, placeholder, pattern, width, label } = v;
-  			if (field) {
-  				const define = map.get(field);
-  				if (define) {
-  					return { field, placeholder, width, label: label || define.label };
-  				}
-  			}
-  			const options = new Set(['add', 'move', 'trigger', 'remove', 'serial']);
-  			const allActions = [action, actions].flat().filter(v => v && options.delete(v));
-  			if (allActions.length) {
-  				return { actions: /** @type {StoreLayout.Action[]} */(allActions), width, label };
-  			}
-  			// if (pattern) {
-  			// 	return { pattern, placeholder, width, label };
-  			// }
-  			return null;
-  		});
-  		columns = /** @type {StoreLayout.Column<T>[]} */(allColumns.filter(Boolean));
-
-  	}
-  	if (!columns.length) {
-  		columns = [
+  	const columns = getColumns(
+  		store,
+  		layout,
+  		['add', 'move', 'trigger', 'remove', 'serial'],
+  		fields => [
   			{ actions: ['add', 'trigger', 'move', 'remove', 'serial'] },
-  			...fieldList.slice(0, 3),
-  		];
-  	}
+  			...fields.slice(0, 3),
+  		],
+  	);
 
   	const table = document.createElement('table');
   	table.classList.add('NeeloongForm-table');
@@ -6383,56 +6405,16 @@
    */
   function Tree(store, fieldRenderer, layout, options) {
   	if (options?.signal?.aborted) { return null; }
-  	const headerColumns = layout.columns;
-  	const fieldList = Object.entries(store.type || {})
-  		.filter(([k, v]) => typeof v?.type !== 'object')
-  		.map(([field, { width, label }]) => ({ field, width, label }));
-  	/** @type {StoreLayout.Column<T>[]} */
-  	let columns = [];
-  	if (Array.isArray(headerColumns)) {
-  		const map = new Map(fieldList.map(v => [v.field, v]));
-  		/** @type {(StoreLayout.Column<T> | null)[]} */
-  		const allColumns = headerColumns.map(v => {
-  			if (!v) { return null; }
-  			if (typeof v === 'number') { return { placeholder: v }; }
-  			if (typeof v === 'string') { return map.get(v) || null; }
-  			if (typeof v !== 'object') { return null; }
-  			if (Array.isArray(v)) {
-  				/** @type {Set<StoreLayout.Action>} */
-  				const options = new Set(['add', 'move', 'trigger', 'remove', 'serial', 'open', 'collapse']);
-  				const actions = v.filter(v => options.delete(v));
-  				if (!actions) { return null; }
-  				return { actions };
-  			}
-  			const { action, actions, field, placeholder, pattern, width, label } = v;
-  			if (field) {
-  				const define = map.get(field);
-  				if (define) {
-  					return { field, placeholder, width, label: label || define.label };
-  				}
-  			}
-  			const options = new Set(['add', 'move', 'trigger', 'remove', 'serial', 'open', 'collapse']);
-  			const allActions = [action, actions].flat().filter(v => v && options.delete(v));
-  			if (allActions.length) {
-  				return { actions: /** @type {StoreLayout.Action[]} */(allActions), width, label };
-  			}
-  			if (pattern) {
-  				return { pattern, placeholder, width, label };
-  			}
-  			if (placeholder || width) {
-  				return { placeholder, width, label };
-  			}
-  			return null;
-  		});
-  		columns = /** @type {StoreLayout.Column<T>[]} */(allColumns.filter(Boolean));
-  	}
-  	if (!columns.length) {
-  		columns = [
+  	const columns = getColumns(
+  		store,
+  		layout,
+  		['add', 'move', 'trigger', 'remove', 'serial', 'open', 'collapse'],
+  		fields => [
   			{ actions: ['collapse', 'move'] },
-  			fieldList[0],
+  			fields[0],
   			{ actions: ['add', 'remove'] },
-  		];
-  	}
+  		]
+  	);
 
 
   	const root = document.createElement('div');