@kine-design/crud 0.0.1-beta.16 → 0.0.1-beta.18

package/.vlaude/last-session-id

@@ -0,0 +1 @@
+594292cc-8321-4629-97d9-91ad432e0646

package/composables/auth/useAuth.ts

@@ -134,11 +134,24 @@ function buildAuthReturn(
     clearStorage();
   }
 
+  let restoring: Promise<void> | null = null;
+
   async function restore(): Promise<void> {
     if (!adapter) return;
+    // 防止并发调用（如 mount + tab 激活同时触发）
+    if (restoring) return restoring;
 
-    const storedToken = adapter.get<string>(STORAGE_KEY_TOKEN);
-    const storedUser = adapter.get<AuthState['user']>(STORAGE_KEY_USER);
+    restoring = doRestore();
+    try {
+      await restoring;
+    } finally {
+      restoring = null;
+    }
+  }
+
+  async function doRestore(): Promise<void> {
+    const storedToken = adapter!.get<string>(STORAGE_KEY_TOKEN);
+    const storedUser = adapter!.get<AuthState['user']>(STORAGE_KEY_USER);
 
     // storage 中没有有效数据，跳过
     if (!storedToken || !storedUser) return;
@@ -213,6 +226,13 @@ export function createAuth(app: App, options: AuthOptions): AuthReturn {
       }
     };
     window.addEventListener('storage', onStorageChange);
+
+    // app.unmount 时清理监听器，防止泄漏
+    const origUnmount = app.unmount.bind(app);
+    app.unmount = () => {
+      window.removeEventListener('storage', onStorageChange);
+      origUnmount();
+    };
   }
 
   // 将 auth 实例注入 Vue 组件树，同时挂载 onUnauthorized 回调供 authGuard 使用

package/composables/request/createRequest.ts

@@ -58,6 +58,7 @@ export function createRequest(options: RequestOptions = {}): RequestClient {
     getToken: options.getToken,
     onUnauthorized: options.onUnauthorized,
     responseInterceptor: options.responseInterceptor,
+    feedback: options.feedback,
     registerAbort: (controller: AbortController) => {
       abortControllers.add(controller);
       // 完成后自动移除

package/composables/request/requestBuilder.ts

@@ -11,10 +11,12 @@ import type {
   CachePolicy,
   ControlPolicy,
   Lifecycle,
+  NetworkError,
   RequestConfig,
   RequestMethod,
   RetryPolicy,
   Transport,
+  TransportResponse,
   WrappedResponse,
 } from './types';
 import { BusinessError, NetworkRequestError } from './types';
@@ -194,6 +196,8 @@ export interface RequestBuilderContext {
   getToken?: () => string | null | undefined;
   onUnauthorized?: () => void;
   responseInterceptor?: <T>(data: T) => T;
+  /** 用户反馈处理器（写操作成功后自动 showSuccess） */
+  feedback?: import('./types').UserFeedbackHandler;
   /** 注册 abort controller，供生命周期管理 */
   registerAbort?: (controller: AbortController) => void;
 }
@@ -358,12 +362,24 @@ export class RequestBuilder {
       // 响应拦截器
       const finalResult = responseInterceptor ? responseInterceptor(result) : result;
 
+      // 写操作成功后自动反馈
+      if (this.context.feedback && ['POST', 'PUT', 'PATCH', 'DELETE'].includes(this.method)) {
+        this.context.feedback.showSuccess('操作成功');
+      }
+
       return finalResult as T;
     } catch (error) {
       // 401 检测
       if (error instanceof NetworkRequestError && error.detail.type === 'httpError' && error.detail.status === 401) {
         onUnauthorized?.();
       }
+      // 写操作失败自动反馈错误信息
+      if (this.context.feedback) {
+        const msg = error instanceof BusinessError ? error.message
+          : error instanceof NetworkRequestError ? `请求失败: ${error.message}`
+          : '操作失败';
+        this.context.feedback.showError(msg);
+      }
       throw error;
     } finally {
       if (totalTimeoutId !== undefined) clearTimeout(totalTimeoutId);
@@ -379,14 +395,23 @@ export class RequestBuilder {
     body: BodyInit | null,
     signal: AbortSignal,
   ): Promise<T> {
-    const response = await transport.send({
-      url,
-      method: this.method,
-      headers,
-      body,
-      signal,
-      timeout: this.config.timeout,
-    });
+    let response: TransportResponse;
+    try {
+      response = await transport.send({
+        url,
+        method: this.method,
+        headers,
+        body,
+        signal,
+        timeout: this.config.timeout,
+      });
+    } catch (error) {
+      // transport 层抛出的是 NetworkError 裸对象，统一包装为 NetworkRequestError
+      if (error && typeof error === 'object' && 'type' in error) {
+        throw new NetworkRequestError(error as NetworkError);
+      }
+      throw new NetworkRequestError({ type: 'unknown', error });
+    }
 
     return unwrapResponse<T>(response);
   }

package/composables/request/transport/xhrTransport.ts

@@ -72,7 +72,10 @@ export class XhrTransport implements Transport {
           headers,
           body: null,
           text: () => Promise.resolve(responseText),
-          json: <T>() => Promise.resolve(JSON.parse(responseText) as T),
+          json: <T>() => {
+            try { return Promise.resolve(JSON.parse(responseText) as T); }
+            catch (e) { return Promise.reject(e); }
+          },
           blob: () => Promise.resolve(new Blob([responseText])),
         };
 

package/dist/composables/request/requestBuilder.d.ts

@@ -8,6 +8,8 @@ export interface RequestBuilderContext {
     getToken?: () => string | null | undefined;
     onUnauthorized?: () => void;
     responseInterceptor?: <T>(data: T) => T;
+    /** 用户反馈处理器（写操作成功后自动 showSuccess） */
+    feedback?: import('./types').UserFeedbackHandler;
     /** 注册 abort controller，供生命周期管理 */
     registerAbort?: (controller: AbortController) => void;
 }

package/dist/crud.js

@@ -214,8 +214,8 @@ function useTable() {
 		});
 		/** 从 data[i] 中安全取值 */
 		const getData = (i, param) => {
-			if (data[i] && data[i][param]) return data[i][param];
-			return "";
+			if (data[i] == null) return "";
+			return data[i][param] ?? "";
 		};
 		/** 向每行的 td 列表中追加一列 */
 		const pushTd = (param, bodySlot, style) => {
@@ -7450,6 +7450,16 @@ var KInput_default = /* @__PURE__ */ defineComponent((_props, ctx) => {
 	]
 });
 //#endregion
+//#region ../ui/constants.ts
+/** 浮层组件的默认 z-index（Select / AutoComplete / DatePicker / TimePicker / Cascader） */
+var Z_INDEX_DROPDOWN = "1000";
+/** 浮层隐藏时使用的占位样式（保持 DOM 挂载以便 floating-ui 计算宽度） */
+var DROPDOWN_HIDDEN_STYLE = {
+	position: "fixed",
+	visibility: "hidden",
+	zIndex: Z_INDEX_DROPDOWN
+};
+//#endregion
 //#region ../ui/components/select/KSelect.tsx
 /**
 * @description kine-ui select 组件
@@ -7469,12 +7479,7 @@ var KSelect_default = /* @__PURE__ */ defineComponent((_props, _ctx) => {
 	const { inputValue, isOpen, fetchLoading, inputReadonly, displayOptions, selectedTags, lastOptionRef, optionsContainerRef, onSelect, onDeleteTag, onInput, onFocus, onBlur, tools, updateFetchObserver } = useSelect(props, _ctx);
 	const triggerRef = ref(null);
 	const dropdownRef = ref(null);
-	const HIDDEN_STYLE = {
-		position: "fixed",
-		visibility: "hidden",
-		zIndex: "1000"
-	};
-	const dropdownStyle = ref(HIDDEN_STYLE);
+	const dropdownStyle = ref(DROPDOWN_HIDDEN_STYLE);
 	const cleanupAutoUpdate = ref(null);
 	const updateDropdownPosition = async () => {
 		if (!triggerRef.value || !dropdownRef.value) return;
@@ -7494,7 +7499,7 @@ var KSelect_default = /* @__PURE__ */ defineComponent((_props, _ctx) => {
 			position: "fixed",
 			left: `${x}px`,
 			top: `${y}px`,
-			zIndex: "1000",
+			zIndex: Z_INDEX_DROPDOWN,
 			visibility: "visible"
 		};
 	};
@@ -7511,7 +7516,7 @@ var KSelect_default = /* @__PURE__ */ defineComponent((_props, _ctx) => {
 		cleanupAutoUpdate.value?.();
 		cleanupAutoUpdate.value = null;
 		isOpen.value = false;
-		dropdownStyle.value = HIDDEN_STYLE;
+		dropdownStyle.value = DROPDOWN_HIDDEN_STYLE;
 	};
 	onBeforeUnmount(() => {
 		cleanupAutoUpdate.value?.();
@@ -7603,6 +7608,7 @@ var KSelect_default = /* @__PURE__ */ defineComponent((_props, _ctx) => {
 				props.loading && createVNode("span", { "class": "k-select-loading-icon" }, null),
 				showClear && !props.loading && createVNode("span", {
 					"class": "k-select-clear",
+					"aria-label": "清空",
 					"onMousedown": (e) => {
 						e.preventDefault();
 						e.stopPropagation();
@@ -7813,8 +7819,18 @@ function buildAuthReturn(state, options, adapter) {
 		state.token = null;
 		clearStorage();
 	}
+	let restoring = null;
 	async function restore() {
 		if (!adapter) return;
+		if (restoring) return restoring;
+		restoring = doRestore();
+		try {
+			await restoring;
+		} finally {
+			restoring = null;
+		}
+	}
+	async function doRestore() {
 		const storedToken = adapter.get(STORAGE_KEY_TOKEN);
 		const storedUser = adapter.get(STORAGE_KEY_USER);
 		if (!storedToken || !storedUser) return;
@@ -7881,6 +7897,11 @@ function createAuth(app, options) {
 			}
 		};
 		window.addEventListener("storage", onStorageChange);
+		const origUnmount = app.unmount.bind(app);
+		app.unmount = () => {
+			window.removeEventListener("storage", onStorageChange);
+			origUnmount();
+		};
 	}
 	app.provide(AUTH_INJECT_KEY, {
 		auth,
@@ -8368,23 +8389,44 @@ var RequestBuilder = class {
 				data: result,
 				timestamp: Date.now()
 			});
-			return responseInterceptor ? responseInterceptor(result) : result;
+			const finalResult = responseInterceptor ? responseInterceptor(result) : result;
+			if (this.context.feedback && [
+				"POST",
+				"PUT",
+				"PATCH",
+				"DELETE"
+			].includes(this.method)) this.context.feedback.showSuccess("操作成功");
+			return finalResult;
 		} catch (error) {
 			if (error instanceof NetworkRequestError && error.detail.type === "httpError" && error.detail.status === 401) onUnauthorized?.();
+			if (this.context.feedback) {
+				const msg = error instanceof BusinessError ? error.message : error instanceof NetworkRequestError ? `请求失败: ${error.message}` : "操作失败";
+				this.context.feedback.showError(msg);
+			}
 			throw error;
 		} finally {
 			if (totalTimeoutId !== void 0) clearTimeout(totalTimeoutId);
 		}
 	}
 	async executeTransport(transport, url, headers, body, signal) {
-		return unwrapResponse(await transport.send({
-			url,
-			method: this.method,
-			headers,
-			body,
-			signal,
-			timeout: this.config.timeout
-		}));
+		let response;
+		try {
+			response = await transport.send({
+				url,
+				method: this.method,
+				headers,
+				body,
+				signal,
+				timeout: this.config.timeout
+			});
+		} catch (error) {
+			if (error && typeof error === "object" && "type" in error) throw new NetworkRequestError(error);
+			throw new NetworkRequestError({
+				type: "unknown",
+				error
+			});
+		}
+		return unwrapResponse(response);
 	}
 };
 //#endregion
@@ -8401,6 +8443,7 @@ function createRequest(options = {}) {
 		getToken: options.getToken,
 		onUnauthorized: options.onUnauthorized,
 		responseInterceptor: options.responseInterceptor,
+		feedback: options.feedback,
 		registerAbort: (controller) => {
 			abortControllers.add(controller);
 			const originalAbort = controller.abort.bind(controller);
@@ -10316,7 +10359,13 @@ var XhrTransport = class {
 					headers,
 					body: null,
 					text: () => Promise.resolve(responseText),
-					json: () => Promise.resolve(JSON.parse(responseText)),
+					json: () => {
+						try {
+							return Promise.resolve(JSON.parse(responseText));
+						} catch (e) {
+							return Promise.reject(e);
+						}
+					},
 					blob: () => Promise.resolve(new Blob([responseText]))
 				});
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kine-design/crud",
-  "version": "0.0.1-beta.16",
+  "version": "0.0.1-beta.18",
   "type": "module",
   "main": "./dist/crud.js",
   "types": "./dist/index.d.ts",