sa2kit 1.6.83 → 1.6.85

package/dist/showmasterpiece/index.js

@@ -711,19 +711,13 @@ var init_useMasterpiecesConfig = __esm({
           setLoading(true);
           setError(null);
           console.log("\u{1F4E1} [Hook] \u5E76\u884C\u8BF7\u6C42\u6240\u6709\u6570\u636E...");
-          const timestamp = Date.now();
           const [configData, collectionsResponse, categoriesData, tagsData] = await Promise.all([
             getConfig(),
-            fetch(`/api/showmasterpiece/collections?_t=${timestamp}&nocache=true&includeImages=true`, {
-              headers: {
-                "Cache-Control": "no-cache",
-                "Pragma": "no-cache"
-              }
-            }).then((r) => r.json()),
+            getAllCollections(),
             getCategories(),
             getTags()
           ]);
-          const collectionsData = collectionsResponse.data || [];
+          const collectionsData = Array.isArray(collectionsResponse) ? collectionsResponse : [];
           console.log("\u2705 [Hook] \u6570\u636E\u52A0\u8F7D\u5B8C\u6210:", {
             \u914D\u7F6E: configData ? "\u5DF2\u52A0\u8F7D" : "\u672A\u52A0\u8F7D",
             \u753B\u96C6\u6570\u91CF: collectionsData.length,
@@ -6554,13 +6548,16 @@ var UniversalImageUpload = ({
         throw new Error(errorData.error || `HTTP ${response.status}`);
       }
       const result = await response.json();
-      if (!result.success) {
-        throw new Error(result.error || "\u4E0A\u4F20\u5931\u8D25");
+      const resultData = result?.data || result?.file || result;
+      const nextFileId = resultData?.fileId || resultData?.id;
+      const nextImageUrl = resultData?.accessUrl || resultData?.url || resultData?.fileUrl;
+      const isSuccess = typeof result?.success === "boolean" ? result.success : Boolean(nextFileId);
+      if (!isSuccess || !nextFileId) {
+        throw new Error(result?.error || result?.message || "\u4E0A\u4F20\u5931\u8D25");
       }
       onChange({
-        image: result.data.accessUrl,
-        // 使用访问URL
-        fileId: result.data.fileId
+        image: nextImageUrl || `/api/universal-file/${nextFileId}`,
+        fileId: nextFileId
       });
     } catch (error) {
       alert(`\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25: ${error instanceof Error ? error.message : "\u672A\u77E5\u9519\u8BEF"}`);
@@ -6579,13 +6576,10 @@ var UniversalImageUpload = ({
         handleFileSelect(file);
       }
     };
-    const handleDivClick = (e) => {
-    };
     return /* @__PURE__ */ React56__namespace.default.createElement(
       "div",
       {
         className: "border-2 border-dashed border-slate-300 rounded-xl p-8 text-center hover:border-blue-400 hover:bg-slate-50 transition-all duration-200 cursor-pointer",
-        onClick: handleDivClick,
         style: { position: "relative", zIndex: 1 }
       },
       /* @__PURE__ */ React56__namespace.default.createElement(
@@ -8789,6 +8783,14 @@ var BookingAdminPanel = ({
     }
   ) : /* @__PURE__ */ React56__namespace.default.createElement("div", { className: "w-16 h-16 sm:w-20 sm:h-20 bg-slate-100 rounded-lg flex-shrink-0 flex items-center justify-center text-slate-400 text-xs" }, "\u6682\u65E0\u56FE\u7247"), /* @__PURE__ */ React56__namespace.default.createElement("div", { className: "min-w-0 flex-1" }, /* @__PURE__ */ React56__namespace.default.createElement("h4", { className: "font-medium text-slate-800 truncate" }, selectedBooking.collection.title), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-600" }, "\u7F16\u53F7\uFF1A", selectedBooking.collection.number), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-600" }, "\u4EF7\u683C\uFF1A\xA5", selectedBooking.collection.price || "\u5F85\u5B9A")))), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("h3", { className: "text-base sm:text-lg font-semibold text-slate-800 mb-3" }, "\u9884\u8BA2\u4FE1\u606F"), /* @__PURE__ */ React56__namespace.default.createElement("div", { className: "grid grid-cols-1 sm:grid-cols-2 gap-3 sm:gap-4" }, /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u9884\u8BA2ID"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "font-medium text-slate-800" }, "#", selectedBooking.id)), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "QQ\u53F7"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "font-medium text-slate-800" }, selectedBooking.qqNumber)), selectedBooking.phoneNumber && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u624B\u673A\u53F7"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "font-medium text-slate-800" }, selectedBooking.phoneNumber)), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u9884\u8BA2\u6570\u91CF"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "font-medium text-slate-800" }, selectedBooking.quantity)), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u603B\u4EF7\u683C"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "font-medium text-slate-800" }, "\xA5", selectedBooking.totalPrice)), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u72B6\u6001"), /* @__PURE__ */ React56__namespace.default.createElement("span", { className: `inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium ${getStatusInfo(selectedBooking.status).color}` }, getStatusInfo(selectedBooking.status).label)))), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("h3", { className: "text-base sm:text-lg font-semibold text-slate-800 mb-3" }, "\u65F6\u95F4\u4FE1\u606F"), /* @__PURE__ */ React56__namespace.default.createElement("div", { className: "space-y-2" }, /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u9884\u8BA2\u65F6\u95F4"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm font-medium text-slate-800" }, formatTime2(selectedBooking.createdAt))), /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u66F4\u65B0\u65F6\u95F4"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm font-medium text-slate-800" }, formatTime2(selectedBooking.updatedAt))), selectedBooking.confirmedAt && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u786E\u8BA4\u65F6\u95F4"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm font-medium text-slate-800" }, formatTime2(selectedBooking.confirmedAt))), selectedBooking.completedAt && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u5B8C\u6210\u65F6\u95F4"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm font-medium text-slate-800" }, formatTime2(selectedBooking.completedAt))), selectedBooking.cancelledAt && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-500" }, "\u53D6\u6D88\u65F6\u95F4"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm font-medium text-slate-800" }, formatTime2(selectedBooking.cancelledAt))))), selectedBooking.notes && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("h3", { className: "text-base sm:text-lg font-semibold text-slate-800 mb-3" }, "\u7528\u6237\u5907\u6CE8"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-800 bg-slate-50 p-4 rounded-lg break-words" }, selectedBooking.notes)), selectedBooking.adminNotes && /* @__PURE__ */ React56__namespace.default.createElement("div", null, /* @__PURE__ */ React56__namespace.default.createElement("h3", { className: "text-base sm:text-lg font-semibold text-slate-800 mb-3" }, "\u7BA1\u7406\u5458\u5907\u6CE8"), /* @__PURE__ */ React56__namespace.default.createElement("p", { className: "text-sm text-slate-800 bg-slate-50 p-4 rounded-lg break-words" }, selectedBooking.adminNotes)))))));
 };
+var isSuccessResponse = (result, fallback) => typeof result?.success === "boolean" ? result.success : fallback;
+var extractPopupConfigs = (result) => {
+  if (Array.isArray(result?.data)) return result.data;
+  if (Array.isArray(result?.configs)) return result.configs;
+  if (Array.isArray(result?.data?.configs)) return result.data.configs;
+  if (Array.isArray(result)) return result;
+  return [];
+};
 var PopupConfigManagement = () => {
   const [configs, setConfigs] = React56.useState([]);
   const [loading, setLoading] = React56.useState(true);
@@ -8835,12 +8837,13 @@ var PopupConfigManagement = () => {
       console.log("\u{1F4E1} [PopupConfigManagement] API\u54CD\u5E94\u72B6\u6001:", response.status, response.statusText);
       const result = await response.json();
       console.log("\u{1F4CA} [PopupConfigManagement] API\u54CD\u5E94\u6570\u636E:", result);
-      if (result.success) {
-        console.log("\u2705 [PopupConfigManagement] \u914D\u7F6E\u52A0\u8F7D\u6210\u529F\uFF0C\u6570\u91CF:", result.data.length);
-        setConfigs(result.data);
+      if (isSuccessResponse(result, response.ok)) {
+        const nextConfigs = extractPopupConfigs(result);
+        console.log("\u2705 [PopupConfigManagement] \u914D\u7F6E\u52A0\u8F7D\u6210\u529F\uFF0C\u6570\u91CF:", nextConfigs.length);
+        setConfigs(nextConfigs);
       } else {
         console.error("\u274C [PopupConfigManagement] API\u8FD4\u56DE\u5931\u8D25:", result.error);
-        setError(result.error || "\u52A0\u8F7D\u914D\u7F6E\u5931\u8D25");
+        setError(result?.error || result?.message || "\u52A0\u8F7D\u914D\u7F6E\u5931\u8D25");
       }
     } catch (err) {
       console.error("\u274C [PopupConfigManagement] \u52A0\u8F7D\u5F39\u7A97\u914D\u7F6E\u5931\u8D25:", err);
@@ -8941,13 +8944,13 @@ var PopupConfigManagement = () => {
         body: JSON.stringify(requestData)
       });
       const result = await response.json();
-      if (result.success) {
+      if (isSuccessResponse(result, response.ok)) {
         await loadConfigs();
         setShowCreateModal(false);
         resetForm();
         setEditingConfig(null);
       } else {
-        alert(result.error || "\u4FDD\u5B58\u5931\u8D25");
+        alert(result?.error || result?.message || "\u4FDD\u5B58\u5931\u8D25");
       }
     } catch (err) {
       console.error("\u4FDD\u5B58\u914D\u7F6E\u5931\u8D25:", err);
@@ -8963,10 +8966,10 @@ var PopupConfigManagement = () => {
         method: "DELETE"
       });
       const result = await response.json();
-      if (result.success) {
+      if (isSuccessResponse(result, response.ok)) {
         await loadConfigs();
       } else {
-        alert(result.error || "\u5220\u9664\u5931\u8D25");
+        alert(result?.error || result?.message || "\u5220\u9664\u5931\u8D25");
       }
     } catch (err) {
       console.error("\u5220\u9664\u914D\u7F6E\u5931\u8D25:", err);
@@ -8993,10 +8996,10 @@ var PopupConfigManagement = () => {
         body: JSON.stringify(requestBody)
       });
       const result = await response.json();
-      if (result.success) {
+      if (isSuccessResponse(result, response.ok)) {
         await loadConfigs();
       } else {
-        alert(result.error || "\u64CD\u4F5C\u5931\u8D25");
+        alert(result?.error || result?.message || "\u64CD\u4F5C\u5931\u8D25");
       }
     } catch (err) {
       console.error("\u5207\u6362\u72B6\u6001\u5931\u8D25:", err);
@@ -10049,6 +10052,14 @@ function clearConfigCache() {
 }
 
 // src/showmasterpiece/ui/web/components/SystemConfigManager.tsx
+var isSuccessResponse2 = (result, fallback) => typeof result?.success === "boolean" ? result.success : fallback;
+var extractConfigItems = (result) => {
+  if (Array.isArray(result?.items)) return result.items;
+  if (Array.isArray(result?.data?.items)) return result.data.items;
+  if (Array.isArray(result?.data)) return result.data;
+  if (Array.isArray(result)) return result;
+  return [];
+};
 var SystemConfigManager = () => {
   const [configItems, setConfigItems] = React56.useState([]);
   const [loading, setLoading] = React56.useState(true);
@@ -10073,8 +10084,16 @@ var SystemConfigManager = () => {
     try {
       const response = await fetch(`/api/showmasterpiece/config/items?environment=${env}`);
       const data = await response.json();
-      if (data.items && Array.isArray(data.items)) {
-        setConfigItems(data.items);
+      if (!response.ok) {
+        setMessage({
+          type: "error",
+          text: data?.error || data?.message || "\u52A0\u8F7D\u914D\u7F6E\u9879\u5931\u8D25"
+        });
+        return;
+      }
+      const items = extractConfigItems(data);
+      if (Array.isArray(items)) {
+        setConfigItems(items);
       } else {
         console.error("API\u54CD\u5E94\u683C\u5F0F\u9519\u8BEF:", data);
         setMessage({
@@ -10133,7 +10152,7 @@ var SystemConfigManager = () => {
         })
       });
       const result = await response.json();
-      if (result.success) {
+      if (isSuccessResponse2(result, response.ok)) {
         setMessage({
           type: "success",
           text: "\u914D\u7F6E\u9879\u66F4\u65B0\u6210\u529F"
@@ -10175,7 +10194,7 @@ var SystemConfigManager = () => {
         method: "DELETE"
       });
       const result = await response.json();
-      if (result.success) {
+      if (isSuccessResponse2(result, response.ok)) {
         setMessage({
           type: "success",
           text: "\u914D\u7F6E\u9879\u5220\u9664\u6210\u529F"
@@ -10361,7 +10380,7 @@ var SystemConfigManager = () => {
             body: JSON.stringify(data)
           });
           const result = await response.json();
-          if (result.success) {
+          if (isSuccessResponse2(result, response.ok)) {
             setMessage({
               type: "success",
               text: "\u914D\u7F6E\u9879\u521B\u5EFA\u6210\u529F"