whistle.mockbubu 2.2.0-beta.1 → 2.2.0-beta.3

package/lib/core/server-entry/capture-handler.js

@@ -78,6 +78,12 @@ async function captureResponse(params) {
           return
         }
 
+        const resContentType = svrRes.headers['content-type'] || ''
+        if (!resContentType.includes('application/json')) {
+          console.log(`[mockbubu] ⏭️  非 JSON 响应，跳过捕获: ${filename} (Content-Type: ${resContentType})`)
+          return
+        }
+
         console.log(`[mockbubu 2025/12/8 ${new Date().toLocaleTimeString()}] 📦 响应接收完成，开始解压: ${filename}`)
         // 解压响应体
         const content = await handleBuffer2String({ body, encoding })

package/lib/core/server-entry/response-handler.js

@@ -124,7 +124,6 @@ async function matchByConditions(params) {
 
     const allMatch = rule.conditions.every((cond) => {
       const sourceParams = cond.source === 'query' ? queryParams : payloadParams
-      // 精确匹配：参数名和参数值必须完全相等（都转为字符串比较）
       return String(sourceParams[cond.key]) === String(cond.value)
     })
 
@@ -182,11 +181,9 @@ function extractQueryParams(originalReq) {
 }
 
 /**
- * 从原始请求中提取 payload 参数（仅支持 JSON，只提取第一层 key-value）
+ * 从原始请求中提取 payload 参数（支持 JSON 和 x-www-form-urlencoded，只提取第一层 key-value）
  * 来源：req.originalReq.body
  *
- * 非 JSON payload 时返回空对象，条件匹配只会比较 query 部分。
- *
  * @param {Object} originalReq - Whistle 原始请求对象
  * @returns {Object} payload 参数 key-value 对（值统一转为字符串）
  */
@@ -194,14 +191,15 @@ function extractPayloadParams(originalReq) {
   if (!originalReq) return {}
 
   try {
-    let body = originalReq.body || ''
+    // 优先使用 mock 路径预缓冲的请求体，fallback 到 Whistle 预解析的 body
+    let body = originalReq._reqBody || originalReq.body || ''
 
     // Buffer 转字符串
     if (Buffer.isBuffer(body)) {
       body = body.toString('utf8')
     }
 
-    // 修复3：body 可能已被 Whistle 预解析为对象，直接提取而非走 JSON.parse
+    // body 可能已被 Whistle 预解析为对象，直接提取
     if (typeof body === 'object' && body !== null) {
       return extractFlatParams(body)
     }
@@ -210,12 +208,26 @@ function extractPayloadParams(originalReq) {
       return {}
     }
 
-    const parsed = JSON.parse(body)
-    if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed)) {
-      return {}
+    // 尝试 JSON 格式
+    try {
+      const parsed = JSON.parse(body)
+      if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+        return extractFlatParams(parsed)
+      }
+    } catch {
+      // 不是 JSON，继续尝试
     }
 
-    return extractFlatParams(parsed)
+    // 尝试 application/x-www-form-urlencoded 格式
+    if (body.includes('=')) {
+      const result = {}
+      new URLSearchParams(body).forEach((value, key) => {
+        result[key] = value
+      })
+      if (Object.keys(result).length > 0) return result
+    }
+
+    return {}
   } catch {
     return {}
   }

package/lib/core/server-entry/server.js

@@ -23,6 +23,19 @@ const {
 } = require('./capture-handler')
 const pluginModeManager = require('../plugin-mode-manager')
 
+/**
+ * 从 req 流缓冲请求体，供条件匹配使用
+ * 仅在 mock 路径调用，此时 req 流未被 pipe，可安全读取
+ */
+function bufferReqBody(req) {
+  return new Promise((resolve) => {
+    const chunks = []
+    req.on('data', chunk => chunks.push(chunk))
+    req.on('end', () => resolve(Buffer.concat(chunks)))
+    req.on('error', () => resolve(Buffer.alloc(0)))
+  })
+}
+
 module.exports = (server, options) => {
   console.log('[mockbubu] 🚀 server.js 模块已加载!')
   const { storage } = options
@@ -101,6 +114,7 @@ module.exports = (server, options) => {
 
         // 有 mock 且有数据 → 返回 mock（不捕获）
         console.log(`[mockbubu] ✅ Mock-Only 模式: 返回 Mock 数据（不捕获） | URL: ${url}`)
+        originalReq._reqBody = await bufferReqBody(req)
         const mockOnlyResult = await sendMockResponse(res, sourceData, {
           mockVersion,
           groupManager,
@@ -117,6 +131,7 @@ module.exports = (server, options) => {
 
       // 场景 1: Mock 启用 + 有源数据 → 返回 Mock 数据
       if (mock && sourceData) {
+        originalReq._reqBody = await bufferReqBody(req)
         const mockResult = await sendMockResponse(res, sourceData, {
           mockVersion,
           groupManager,

package/lib/utils/utils.js

@@ -370,6 +370,7 @@ const getRule = (originalReq) => {
 const isJsonReq = (headers) => {
   const result = (
     (headers.accept && headers.accept.includes('application/json')) ||
+    headers.accept === '*/*' ||
     headers['sec-fetch-dest'] === 'empty' ||
     headers['Sec-Fetch-Dest'] === 'empty'
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whistle.mockbubu",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.3",
   "description": "mock response data",
   "scripts": {
     "lint": "eslint . --ext .js",

package/public/js/app.js

@@ -243,6 +243,36 @@ const __default__ = {
 
     // 是否已加载已保存文件
     let savedFilesLoaded = false;
+
+    /**
+     * 从 session 中提取 URL 查询参数
+     *
+     * x-whistle-full-url 是 Whistle 内部 header，只在 originalReq 阶段可靠。
+     * getSession() 返回的 session.req.headers 可能已被剥离该字段，
+     * 因此先尝试 x-whistle-full-url，不存在时 fallback 到 session.url（Whistle session 顶层字段，含完整 query string）。
+     */
+    const extractQueryFromSession = session => {
+      const fullUrlEncoded = session?.req?.headers?.['x-whistle-full-url'];
+      if (fullUrlEncoded) {
+        try {
+          const urlObj = new URL(decodeURIComponent(fullUrlEncoded));
+          return Object.fromEntries(urlObj.searchParams);
+        } catch (e) {
+          // 解析失败，继续 fallback
+        }
+      }
+      // Whistle session 顶层 url 字段包含完整 URL（含 query string）
+      const reqUrl = session?.url;
+      if (reqUrl) {
+        try {
+          const urlObj = new URL(reqUrl);
+          return Object.fromEntries(urlObj.searchParams);
+        } catch (e) {
+          // 解析失败，返回空对象
+        }
+      }
+      return {};
+    };
     const getRules = rules => {
       const {
         defaultRules,
@@ -384,17 +414,7 @@ const __default__ = {
             // 映射未保存数据的展示字段
             const newCachedItems = filteredData.map(item => {
               // 从 session 中提取 URL 查询参数
-              let query = {};
-              const fullUrlEncoded = item.session?.req?.headers?.['x-whistle-full-url'];
-              if (fullUrlEncoded) {
-                try {
-                  const fullUrl = decodeURIComponent(fullUrlEncoded);
-                  const urlObj = new URL(fullUrl);
-                  query = Object.fromEntries(urlObj.searchParams);
-                } catch (e) {
-                  // 静默处理URL解析错误
-                }
-              }
+              const query = extractQueryFromSession(item.session);
 
               // 从 session 中提取 payload (请求体)
               const payload = item.session?.req?.body || null;
@@ -515,17 +535,7 @@ const __default__ = {
             }
 
             // 从 session 提取 query 参数
-            let query = {};
-            const fullUrlEncoded = data.session?.req?.headers?.['x-whistle-full-url'];
-            if (fullUrlEncoded) {
-              try {
-                const fullUrl = decodeURIComponent(fullUrlEncoded);
-                const urlObj = new URL(fullUrl);
-                query = Object.fromEntries(urlObj.searchParams);
-              } catch (e) {
-                // 静默处理URL解析错误
-              }
-            }
+            const query = extractQueryFromSession(data.session);
 
             // 使用 Object.assign 更新 currentRow,保留引用
             Object.assign(currentRow.value, {
@@ -1271,12 +1281,13 @@ const __default__ = {
       }
     };
     (0,vue__WEBPACK_IMPORTED_MODULE_21__.watch)(currentRow, val => {
-      // 只对已保存的文件调用 getCurrentRowData
-      // 未保存的缓存数据已经包含完整 session,不需要再次获取
-      // 判断依据: 有 id 字段说明是已保存的文件,需要按需加载完整数据
       if (val && val.id) {
-        // 有 id 字段说明是已保存的文件,需要按需加载完整数据
+        // 已保存文件：按需加载完整数据（含 query/payload/headers）
         getCurrentRowData(val);
+      } else if (val && val.session) {
+        // 缓存数据：session 已在轮询时附带，但 query 可能在旧版本代码下提取失败
+        // 切换行时重新提取，确保展示正确
+        val.query = extractQueryFromSession(val.session);
       }
     });
     (0,vue__WEBPACK_IMPORTED_MODULE_21__.onMounted)(async () => {
@@ -1335,6 +1346,7 @@ const __default__ = {
       pollingStartTime,
       intervalId,
       savedFilesLoaded,
+      extractQueryFromSession,
       getRules,
       getInit,
       pageShow,
@@ -2173,10 +2185,19 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.iterator.some.js */ "./node_modules/core-js/modules/es.iterator.some.js");
 /* harmony import */ var core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
-/* harmony import */ var _common_JsonEditor_vue__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../common/JsonEditor.vue */ "./src/components/common/JsonEditor.vue");
-/* harmony import */ var _MatchConditionEditor_vue__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./MatchConditionEditor.vue */ "./src/components/content/MatchConditionEditor.vue");
-/* harmony import */ var _service__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../../service */ "./src/service/index.js");
+/* harmony import */ var core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/web.url-search-params.delete.js */ "./node_modules/core-js/modules/web.url-search-params.delete.js");
+/* harmony import */ var core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_delete_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/web.url-search-params.has.js */ "./node_modules/core-js/modules/web.url-search-params.has.js");
+/* harmony import */ var core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_has_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! core-js/modules/web.url-search-params.size.js */ "./node_modules/core-js/modules/web.url-search-params.size.js");
+/* harmony import */ var core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_url_search_params_size_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! vue */ "./node_modules/vue/dist/vue.runtime.esm.js");
+/* harmony import */ var _common_JsonEditor_vue__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../common/JsonEditor.vue */ "./src/components/common/JsonEditor.vue");
+/* harmony import */ var _MatchConditionEditor_vue__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./MatchConditionEditor.vue */ "./src/components/content/MatchConditionEditor.vue");
+/* harmony import */ var _service__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../../service */ "./src/service/index.js");
+
+
+
 
 
 
@@ -2214,17 +2235,17 @@ const __default__ = {
   }) {
     const props = __props;
     const MATCH_MODE_VALUE = '__match_mode__';
-    const editRef = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(null);
-    const fullScreenEditorRef = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(null);
-    const versionNameInput = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(null);
-    const matchRuleNameInput = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(null);
-    const responseList = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)([]);
-    const currentFile = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)({
+    const editRef = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(null);
+    const fullScreenEditorRef = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(null);
+    const versionNameInput = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(null);
+    const matchRuleNameInput = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(null);
+    const responseList = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)([]);
+    const currentFile = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)({
       content: {}
     });
-    const hasJsonError = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(false); // JSON 格式错误标志
-    const hasFullScreenJsonError = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(false); // 全屏编辑器 JSON 格式错误标志
-    const versionModal = (0,vue__WEBPACK_IMPORTED_MODULE_9__.reactive)({
+    const hasJsonError = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(false); // JSON 格式错误标志
+    const hasFullScreenJsonError = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(false); // 全屏编辑器 JSON 格式错误标志
+    const versionModal = (0,vue__WEBPACK_IMPORTED_MODULE_12__.reactive)({
       visible: false,
       status: 'create',
       // 'create' | 'edit'
@@ -2232,24 +2253,24 @@ const __default__ = {
       description: '',
       editingVersion: null // 正在编辑的版本对象
     });
-    const fullScreenModal = (0,vue__WEBPACK_IMPORTED_MODULE_9__.reactive)({
+    const fullScreenModal = (0,vue__WEBPACK_IMPORTED_MODULE_12__.reactive)({
       visible: false,
       content: {}
     });
 
     // ========== 条件匹配模式状态 ==========
     // 当前显示模式：'version' = 版本直选，'match' = 条件匹配
-    const mockMode = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)('version');
+    const mockMode = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)('version');
     // 模式下拉是否展开
-    const modeDropdownVisible = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(false);
+    const modeDropdownVisible = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(false);
     // 匹配规则列表
-    const matchRuleList = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)([]);
+    const matchRuleList = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)([]);
     // 当前选中的匹配规则（深拷贝，供编辑用）
-    const currentMatchRule = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(null);
+    const currentMatchRule = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(null);
     // 条件或内容是否有变更（控制保存按钮显示）
-    const matchRuleChanged = (0,vue__WEBPACK_IMPORTED_MODULE_9__.ref)(false);
+    const matchRuleChanged = (0,vue__WEBPACK_IMPORTED_MODULE_12__.ref)(false);
     // 匹配规则创建/编辑弹窗
-    const matchRuleModal = (0,vue__WEBPACK_IMPORTED_MODULE_9__.reactive)({
+    const matchRuleModal = (0,vue__WEBPACK_IMPORTED_MODULE_12__.reactive)({
       visible: false,
       status: 'create',
       // 'create' | 'edit'
@@ -2258,19 +2279,63 @@ const __default__ = {
       editingRule: null
     });
     // 捕获到的参数（来自 file.json session，用于"从捕获参数选择"）
-    const capturedQuery = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => props.api.query || {});
-    const capturedPayload = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => {
+    const capturedQuery = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => props.api.query || {});
+    const capturedPayload = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => {
       const payload = props.api.payload;
       if (!payload) return {};
-      // payload 结构: { raw, parsed, type }，取 parsed.data
-      return payload?.parsed?.data || {};
+      // 结构化对象格式: { raw, parsed: { type, data } }
+      if (typeof payload === 'object' && payload.parsed?.data) {
+        return payload.parsed.data;
+      }
+      // 普通对象（Whistle 预解析），提取第一层 string/number/boolean
+      if (typeof payload === 'object' && !Array.isArray(payload)) {
+        const result = {};
+        Object.keys(payload).forEach(key => {
+          const val = payload[key];
+          if (typeof val === 'string' || typeof val === 'number' || typeof val === 'boolean') {
+            result[key] = String(val);
+          }
+        });
+        return result;
+      }
+      if (typeof payload === 'string') {
+        // JSON 格式
+        try {
+          const parsed = JSON.parse(payload);
+          if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+            const result = {};
+            Object.keys(parsed).forEach(key => {
+              const val = parsed[key];
+              if (typeof val === 'string' || typeof val === 'number' || typeof val === 'boolean') {
+                result[key] = String(val);
+              }
+            });
+            return result;
+          }
+        } catch {
+          // 不是 JSON，继续尝试
+        }
+        // application/x-www-form-urlencoded 格式
+        if (payload.includes('=')) {
+          try {
+            const result = {};
+            new URLSearchParams(payload).forEach((value, key) => {
+              result[key] = value;
+            });
+            if (Object.keys(result).length > 0) return result;
+          } catch {
+            // 解析失败
+          }
+        }
+      }
+      return {};
     });
-    const name = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => props.api.name);
-    const mock = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => props.api.mock);
-    const mockVersion = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => props.api.mockVersion);
-    const date = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => props.api.date);
-    const isSourceReadonly = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => mockMode.value === 'version' && currentFile.value.type === 'source');
-    const activeEditorContent = (0,vue__WEBPACK_IMPORTED_MODULE_9__.computed)(() => mockMode.value === 'match' ? currentMatchRule.value?.content : currentFile.value.content);
+    const name = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => props.api.name);
+    const mock = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => props.api.mock);
+    const mockVersion = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => props.api.mockVersion);
+    const date = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => props.api.date);
+    const isSourceReadonly = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => mockMode.value === 'version' && currentFile.value.type === 'source');
+    const activeEditorContent = (0,vue__WEBPACK_IMPORTED_MODULE_12__.computed)(() => mockMode.value === 'match' ? currentMatchRule.value?.content : currentFile.value.content);
 
     /**
      * 获取 source 版本数据（仅用于未保存文件）
@@ -2335,7 +2400,7 @@ const __default__ = {
      */
     const getHistoryVersions = () => {
       const fileId = props.api.id;
-      return (0,_service__WEBPACK_IMPORTED_MODULE_12__.getVersions)({
+      return (0,_service__WEBPACK_IMPORTED_MODULE_15__.getVersions)({
         fileId
       }).then(res => {
         console.log('[ResponsePanel] 后端返回的版本数据:', res);
@@ -2414,7 +2479,7 @@ const __default__ = {
       }
     };
     const deleteVersionHandler = (item, index) => {
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.deleteVersion)({
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.deleteVersion)({
         url: props.api.name,
         fileId: props.api.id,
         versionId: item.id
@@ -2489,7 +2554,7 @@ const __default__ = {
         // 未保存文件：先保存文件，再创建版本
         console.log('[ResponsePanel] 文件未保存，先保存文件');
         try {
-          const saveResult = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.saveFile)({
+          const saveResult = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.saveFile)({
             url: props.api.url,
             method: props.api.method,
             status: props.api.status,
@@ -2520,7 +2585,7 @@ const __default__ = {
           return;
         }
       }
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.addVersion)({
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.addVersion)({
         versionName: versionModal.name,
         fileId,
         description: versionModal.description,
@@ -2550,7 +2615,7 @@ const __default__ = {
         // 添加版本成功后，重新获取版本列表（确保数据同步）
         // ⚠️ 关键修复：使用保存的 fileId，而不是 props.api.id（可能仍是 undefined）
         console.log('[ResponsePanel] 使用 fileId 刷新版本列表:', fileId);
-        (0,_service__WEBPACK_IMPORTED_MODULE_12__.getVersions)({
+        (0,_service__WEBPACK_IMPORTED_MODULE_15__.getVersions)({
           fileId
         }).then(versionRes => {
           console.log('[ResponsePanel] 后端返回的版本数据:', versionRes);
@@ -2621,7 +2686,7 @@ const __default__ = {
       }
 
       // 调用后端API更新版本元信息
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.updateVersionMeta)({
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.updateVersionMeta)({
         url: props.api.name,
         fileId: props.api.id,
         versionId: currentFile.value.id,
@@ -2691,7 +2756,7 @@ const __default__ = {
         effect: tempEffect
       };
       const versionName = item.type === 'history' ? item.filename : '';
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.setMockVersion)({
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.setMockVersion)({
         url: props.api.name,
         versionName
       }) // Changed from name to url
@@ -2713,7 +2778,7 @@ const __default__ = {
       currentFile.value.effect = true;
     };
     const updateHistory = () => {
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.updateVersionContent)({
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.updateVersionContent)({
         versionId: currentFile.value.id,
         content: currentFile.value.content,
         fileId: props.api.id
@@ -2757,7 +2822,7 @@ const __default__ = {
       responseList.value = source ? [source, ...versions] : versions;
     };
     const updateApiDataHandler = () => {
-      (0,_service__WEBPACK_IMPORTED_MODULE_12__.updateApiData)(props.api.name, currentFile.value.content).then(res => {
+      (0,_service__WEBPACK_IMPORTED_MODULE_15__.updateApiData)(props.api.name, currentFile.value.content).then(res => {
         const {
           code
         } = res;
@@ -2818,7 +2883,7 @@ const __default__ = {
     /** 保存当前匹配规则（条件 + 内容） */
     const updateMatchRuleHandler = async () => {
       if (!currentMatchRule.value) return;
-      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.updateMatchVersion)({
+      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.updateMatchVersion)({
         url: props.api.name,
         matchVersionId: currentMatchRule.value.id,
         conditions: currentMatchRule.value.conditions,
@@ -3023,13 +3088,36 @@ const __default__ = {
     const switchMode = async targetMode => {
       modeDropdownVisible.value = false;
       if (targetMode === mockMode.value) return;
-      if (!props.api.id) {
-        element_ui_lib_message__WEBPACK_IMPORTED_MODULE_2___default().warning('未保存的文件需要先保存后才能使用条件匹配');
-        return;
-      }
       if (targetMode === 'match') {
+        // 未保存文件：先自动保存，再切换
+        if (!props.api.id) {
+          try {
+            const saveResult = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.saveFile)({
+              url: props.api.url,
+              method: props.api.method,
+              status: props.api.status,
+              session: props.api.session,
+              config: {
+                mock: props.api.mock || false,
+                locked: props.api.locked || false
+              }
+            });
+            if (saveResult.code !== 200) {
+              element_ui_lib_message__WEBPACK_IMPORTED_MODULE_2___default().error(`保存文件失败: ${saveResult.msg || '未知错误'}`);
+              return;
+            }
+            emit('fileSaved', {
+              url: props.api.url,
+              savedFile: saveResult.data.file
+            });
+          } catch (err) {
+            element_ui_lib_message__WEBPACK_IMPORTED_MODULE_2___default().error(`保存文件失败: ${err.message || '未知错误'}`);
+            return;
+          }
+        }
+
         // 切换为条件匹配
-        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.setMatchMode)({
+        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.setMatchMode)({
           url: props.api.name,
           enable: true
         });
@@ -3046,7 +3134,7 @@ const __default__ = {
         emit('changeMockVersion', MATCH_MODE_VALUE);
       } else {
         // 切换回版本直选
-        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.setMatchMode)({
+        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.setMatchMode)({
           url: props.api.name,
           enable: false
         });
@@ -3070,7 +3158,7 @@ const __default__ = {
     /** 加载匹配规则列表 */
     const loadMatchVersions = async () => {
       if (!props.api.id || !props.api.name) return;
-      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.getMatchVersions)({
+      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.getMatchVersions)({
         url: props.api.name
       });
       if (res.code !== 200) {
@@ -3150,7 +3238,7 @@ const __default__ = {
         return;
       }
       if (matchRuleModal.status === 'create') {
-        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.addMatchVersion)({
+        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.addMatchVersion)({
           url: props.api.name,
           name: matchRuleModal.name.trim(),
           description: matchRuleModal.description
@@ -3169,7 +3257,7 @@ const __default__ = {
         element_ui_lib_message__WEBPACK_IMPORTED_MODULE_2___default().success('创建成功');
       } else {
         // 编辑元信息
-        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.updateMatchVersionMeta)({
+        const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.updateMatchVersionMeta)({
           url: props.api.name,
           matchVersionId: matchRuleModal.editingRule.id,
           name: matchRuleModal.name.trim(),
@@ -3203,7 +3291,7 @@ const __default__ = {
       } catch {
         return; // 取消
       }
-      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_12__.deleteMatchVersion)({
+      const res = await (0,_service__WEBPACK_IMPORTED_MODULE_15__.deleteMatchVersion)({
         url: props.api.name,
         matchVersionId: rule.id
       });
@@ -3238,7 +3326,7 @@ const __default__ = {
      * - 已保存文件: file-${id}
      * - 未保存文件: cache-${url}-${captureTime}
      */
-    (0,vue__WEBPACK_IMPORTED_MODULE_9__.watch)(() => props.rowKey, (newRowKey, oldRowKey) => {
+    (0,vue__WEBPACK_IMPORTED_MODULE_12__.watch)(() => props.rowKey, (newRowKey, oldRowKey) => {
       // 判断是否为已保存文件（已保存文件有 id，未保存文件没有）
       const isSavedFile = !!props.api.id;
 
@@ -3384,8 +3472,8 @@ const __default__ = {
       handleMatchRuleConfirm,
       deleteMatchRuleHandler,
       refreshVersions,
-      JsonEditor: _common_JsonEditor_vue__WEBPACK_IMPORTED_MODULE_10__["default"],
-      MatchConditionEditor: _MatchConditionEditor_vue__WEBPACK_IMPORTED_MODULE_11__["default"]
+      JsonEditor: _common_JsonEditor_vue__WEBPACK_IMPORTED_MODULE_13__["default"],
+      MatchConditionEditor: _MatchConditionEditor_vue__WEBPACK_IMPORTED_MODULE_14__["default"]
     };
   }
 }));
@@ -5274,7 +5362,7 @@ var render = function render() {
     staticClass: "response-panel"
   }, [_c("div", {
     staticClass: "response-panel__header"
-  }, [_setup.props.api.id ? _c("div", {
+  }, [_setup.props.api ? _c("div", {
     staticClass: "response-panel__mode-selector"
   }, [_c("div", {
     staticClass: "response-panel__mode-btn",