@piying/view-svelte 1.7.2 → 1.7.3

package/component/field-template.svelte

@@ -35,39 +35,37 @@
 
 	const wrappers = signalToState(() => props.field.wrappers());
 	const ComponentType = $derived.by(() => {
-		return props.field.define?.type;
+		return props.field.define?.()?.type;
 	});
 	const isLazy = $derived.by(() => {
-		return isLazyMark(props.field.define?.type);
+		return isLazyMark(ComponentType);
 	});
 	const loading = $derived.by(() => {
-		return getLazyImport<() => Promise<any>>(props.field.define?.type)!();
+		return getLazyImport<() => Promise<any>>(ComponentType)!();
 	});
 	const field = $derived(props.field);
 	setContext(PI_VIEW_FIELD_TOKEN, () => field);
 </script>
 
-{#if !renderConfig()?.hidden}
-	{#if field.define?.type}
-		{#snippet children()}
-			{#if isLazy}
-				{#await loading then LazyComponent}
-					{#if fieldChildren()}
-						<LazyComponent {...fieldInputs()}></LazyComponent>
-					{:else if field.form.control}
-						<LazyComponent {...fieldInputs()} bind:this={controlRef}></LazyComponent>
-					{:else}
-						<LazyComponent {...fieldInputs()}></LazyComponent>
-					{/if}
-				{/await}
-			{:else if fieldChildren()}
-				<ComponentType {...fieldInputs()}></ComponentType>
-			{:else if field.form.control}
-				<ComponentType {...fieldInputs()} bind:this={controlRef}></ComponentType>
-			{:else}
-				<ComponentType {...fieldInputs()}></ComponentType>
-			{/if}
-		{/snippet}
-		<PiWrapper wrappers={wrappers()!} {children}></PiWrapper>
-	{/if}
+{#if !renderConfig()?.hidden && ComponentType}
+	{#snippet children()}
+		{#if isLazy}
+			{#await loading then LazyComponent}
+				{#if fieldChildren()}
+					<LazyComponent {...fieldInputs()}></LazyComponent>
+				{:else if field.form.control}
+					<LazyComponent {...fieldInputs()} bind:this={controlRef}></LazyComponent>
+				{:else}
+					<LazyComponent {...fieldInputs()}></LazyComponent>
+				{/if}
+			{/await}
+		{:else if fieldChildren()}
+			<ComponentType {...fieldInputs()}></ComponentType>
+		{:else if field.form.control}
+			<ComponentType {...fieldInputs()} bind:this={controlRef}></ComponentType>
+		{:else}
+			<ComponentType {...fieldInputs()}></ComponentType>
+		{/if}
+	{/snippet}
+	<PiWrapper wrappers={wrappers()!} {children}></PiWrapper>
 {/if}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@piying/view-svelte",
-    "version": "1.7.2",
+    "version": "1.7.3",
     "description": "Piying view For Svelte;Valibot to Component",
     "type": "module",
     "homepage": "https://piying-org.github.io/website/docs/client/intro",
@@ -34,7 +34,7 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@piying/view-core": "^1.7.2",
+        "@piying/view-core": "^1.7.3",
         "static-injector": "^6.1.2"
     },
     "sideEffects": false,

package/type/group.d.ts

@@ -20,10 +20,7 @@ export interface ComponentFieldConfig {
 }
 export type ResolvedComponentFieldConfig = Omit<ComponentFieldConfig, 'inputs' | 'outputs' | 'directives' | 'wrappers'>;
 export type PiDefaultRawViewFieldConfig = Pick<SvelteSchemaHandle, 'inputs' | 'outputs' | 'wrappers' | 'formConfig' | 'renderConfig' | 'props'>;
-export type PiResolvedViewFieldConfig = PiResolvedCommonViewFieldConfig<() => PiResolvedViewFieldConfig, CoreResolvedComponentDefine> & ResolvedComponentFieldConfig & {
-    /** 除了无component的控件,其他情况下都应该有define,group/array会赋值默认 */
-    define?: RawComponentDefine;
-};
+export type PiResolvedViewFieldConfig = PiResolvedCommonViewFieldConfig<() => PiResolvedViewFieldConfig, CoreResolvedComponentDefine> & ResolvedComponentFieldConfig;
 export type PiComponentDefaultConfig = {
     type: any | (() => Promise<any>);
 } & Omit<SetOptional<PiDefaultRawViewFieldConfig, 'formConfig'>, 'type'>;