whistle.mockbubu 2.1.2 → 2.1.5

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

@@ -27,10 +27,7 @@ const pluginModeManager = require('../plugin-mode-manager')
 module.exports = (server, options) => {
   console.log('[mockbubu] 🚀 server.js 模块已加载!')
   const { storage } = options
-
-  // 使用 StorageAdapter 包装 Whistle storage
-  const actualBaseDir = options.config.baseDir
-  const storageAdapter = new StorageAdapter({ baseDir: actualBaseDir })
+  const storageAdapter = new StorageAdapter(options)
 
   // 初始化组管理器（使用适配器）
   const groupManager = new GroupManager(storageAdapter)

package/lib/storage/storage-adapter.js

@@ -15,7 +15,7 @@
  *
  * 使用示例:
  * ```javascript
- * const adapter = new StorageAdapter({ baseDir: '~/.whistle' })
+ * const adapter = new StorageAdapter(options)
  * await adapter.init()
  * await adapter.writeFile('default/https://api.test.com', '{"data": {...}}')
  * const content = await adapter.readFile('default/https://api.test.com')
@@ -37,29 +37,25 @@ class StorageAdapter {
    * 构造函数
    *
    * @param {Object} options - 配置选项
-   * @param {string} options.baseDir - 基础目录路径（可选）
+   * @param {string} options.pluginBaseDir - 插件存储目录路径
    *
    * @example
-   * const adapter = new StorageAdapter({
-   *   baseDir: '~/.whistle'
-   * })
+   * const adapter = new StorageAdapter(options)
    */
   constructor(options) {
     // 初始化 logger
     this.logger = createLogger('storage-adapter')
 
-    // 计算基础目录路径
+    // 兜底存储目录路径
     let baseDir = path.join(
       process.env.HOME,
       '.WhistleAppData/.whistle/.plugins/whistle.mockbubu',
     )
-    if (options.baseDir) {
-      baseDir = `${options.baseDir}/.plugins/whistle.mockbubu`
+    // 实际存储目录路径
+    if (options?.config?.pluginBaseDir) {
+      baseDir = options.config.pluginBaseDir
     }
 
-    // 记录基础目录（生产环境可保留，便于问题排查）
-    this.logger.log('基础目录:', baseDir)
-
     // 初始化 V3 存储实例
     this.v3Storage = new FileSystemStorage(baseDir)
     this.currentGroupId = 'default'

package/lib/uiServer/index.js

@@ -13,16 +13,8 @@ const MAX_AGE = 1000 * 60 * 5
 
 module.exports = (server, options) => {
   const app = new Koa()
-  const { storage } = options
-
   console.log('[mockbubu] 插件开始初始化...')
-
-  // 使用 StorageAdapter 包装 Whistle storage
-  // Whistle storage 对象直接有 baseDir 属性
-  const actualBaseDir = options.config.baseDir
-  console.log('[mockbubu] 🔍 UI Server storage.baseDir:', storage.baseDir)
-  console.log('[mockbubu] 🔍 UI Server 使用 baseDir:', actualBaseDir)
-  const storageAdapter = new StorageAdapter({ baseDir: actualBaseDir })
+  const storageAdapter = new StorageAdapter(options)
 
   // 同步初始化：确保初始化完成后再处理请求
   let isInitialized = false

package/package.json

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

package/public/js/app.js

@@ -1964,6 +1964,7 @@ const __default__ = {
       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)({
       visible: false,
       status: 'create',
@@ -2569,6 +2570,8 @@ const __default__ = {
     const handleFullScreen = () => {
       // 深拷贝当前内容到全屏编辑器
       fullScreenModal.content = JSON.parse(JSON.stringify(currentFile.value.content));
+      // 重置错误状态
+      hasFullScreenJsonError.value = false;
       fullScreenModal.visible = true;
     };
 
@@ -2581,6 +2584,8 @@ const __default__ = {
     const handleFullScreenClosed = () => {
       // 弹窗关闭后清空内容
       fullScreenModal.content = {};
+      // 重置错误状态
+      hasFullScreenJsonError.value = false;
     };
 
     // 全屏编辑器内容变化时同步到主编辑器
@@ -2650,6 +2655,12 @@ const __default__ = {
         return;
       }
 
+      // 如果 JSON 格式错误，禁止保存
+      if (hasFullScreenJsonError.value) {
+        element_ui_lib_message__WEBPACK_IMPORTED_MODULE_2___default().error('JSON 格式错误，请修正后再保存');
+        return;
+      }
+
       // 确保内容已同步
       currentFile.value.content = JSON.parse(JSON.stringify(fullScreenModal.content));
 
@@ -2741,6 +2752,7 @@ const __default__ = {
       responseList,
       currentFile,
       hasJsonError,
+      hasFullScreenJsonError,
       versionModal,
       fullScreenModal,
       name,
@@ -4743,6 +4755,7 @@ var render = function render() {
   }, [_c("i", {
     staticClass: "el-icon-info"
   }), _setup.isSourceReadonly ? _c("span", [_vm._v("快捷键: Ctrl/Cmd + F 查找 | ESC 关闭")]) : _c("span", [_vm._v("快捷键: Ctrl/Cmd + S 保存 | Ctrl/Cmd + F 查找 | ESC 关闭")])])], 1), _c(_setup.JsonEditor, {
+    key: `fullscreen-editor-${_setup.currentFile.filename}-${_setup.isSourceReadonly}`,
     ref: "fullScreenEditorRef",
     attrs: {
       "show-btns": false,
@@ -4753,7 +4766,13 @@ var render = function render() {
       lang: "zh"
     },
     on: {
-      input: _setup.handleFullScreenChange
+      input: _setup.handleFullScreenChange,
+      "has-error": function ($event) {
+        _setup.hasFullScreenJsonError = true;
+      },
+      "json-change": function ($event) {
+        _setup.hasFullScreenJsonError = false;
+      }
     },
     nativeOn: {
       keydown: [function ($event) {
@@ -4794,6 +4813,7 @@ var render = function render() {
   }, [_vm._v(" 关闭 ")]), !_setup.isSourceReadonly ? _c("el-button", {
     attrs: {
       type: "primary",
+      disabled: _setup.hasFullScreenJsonError,
       size: "medium"
     },
     on: {