ol-base-components 2.8.5 → 2.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "2.8.5",
+  "version": "2.8.7",
   "private": false,
   "main": "src/package/index.js",
   "bin": {
@@ -16,7 +16,8 @@
     "lint": "vue-cli-service lint",
     "add": "node src/bin/add.js",
     "vscode:build": "node scripts/build-vscode.js",
-    "vscode:install": "node scripts/install-vscode.js"
+    "vscode:install": "node scripts/install-vscode.js",
+    "postinstall": "node scripts/auto-install.js"
   },
   "dependencies": {
     "commander": "^14.0.0",
@@ -47,7 +48,7 @@
       "name": "vue-page-generator",
       "displayName": "Vue 页面生成器",
       "description": "配合ol-base-components组件使用, 无需联调的CRUD页面",
-      "version": "0.0.2",
+      "version": "0.0.4",
       "engines": {
         "vscode": "^1.60.0"
       },
@@ -68,7 +69,7 @@
             {
               "command": "vue-generator.createPage",
               "group": "navigation",
-              "when": "resourceExtname == .vue || resourceExtname == .js"
+              "when": "resourceFolder"
             }
           ]
         }

package/scripts/auto-install.js

@@ -0,0 +1,193 @@
+#!/usr/bin/env node
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+
+// 检测 VSCode/Cursor 扩展目录
+function getVSCodeExtensionsPath() {
+  const platform = os.platform();
+  const homeDir = os.homedir();
+
+  switch (platform) {
+    case "win32":
+      return [
+        path.join(homeDir, ".vscode", "extensions"),
+        path.join(homeDir, ".cursor", "extensions"), // Cursor 扩展目录
+        path.join(homeDir, "AppData", "Roaming", "Cursor", "User", "extensions"), // Cursor 另一个可能的位置
+        path.join(homeDir, "AppData", "Local", "Cursor", "User", "extensions"), // Cursor 本地扩展目录
+        path.join(homeDir, "AppData", "Roaming", "Code", "User", "extensions"), // VSCode 扩展目录
+        path.join(
+          homeDir,
+          "AppData",
+          "Local",
+          "Programs",
+          "Microsoft VS Code",
+          "resources",
+          "app",
+          "extensions"
+        ), // VSCode 系统扩展目录
+      ];
+    case "darwin":
+      return [
+        path.join(homeDir, ".vscode", "extensions"),
+        path.join(homeDir, ".cursor", "extensions"),
+        path.join(homeDir, "Library", "Application Support", "Cursor", "User", "extensions"),
+        path.join(homeDir, "Library", "Application Support", "Code", "User", "extensions"),
+      ];
+    case "linux":
+      return [
+        path.join(homeDir, ".vscode", "extensions"),
+        path.join(homeDir, ".cursor", "extensions"),
+        path.join(homeDir, ".config", "Cursor", "User", "extensions"),
+        path.join(homeDir, ".config", "Code", "User", "extensions"),
+      ];
+    default:
+      throw new Error("Unsupported platform");
+  }
+}
+
+// 自动安装 VSCode/Cursor 扩展
+function autoInstallVSCodeExtension() {
+  try {
+    const extensionsPaths = getVSCodeExtensionsPath();
+    const extensionName = "vue-page-generator";
+
+    console.log("�� 正在查找扩展目录...");
+    extensionsPaths.forEach((path, index) => {
+      console.log(`  ${index + 1}. ${path} ${fs.existsSync(path) ? "✅ 存在" : "❌ 不存在"}`);
+    });
+
+    let installed = false;
+
+    for (const extensionsPath of extensionsPaths) {
+      if (fs.existsSync(extensionsPath)) {
+        console.log(`\n📁 使用扩展目录: ${extensionsPath}`);
+
+        const extensionDir = path.join(extensionsPath, extensionName);
+
+        // 删除旧的扩展目录（如果存在）
+        if (fs.existsSync(extensionDir)) {
+          console.log("🗑️  删除旧的扩展目录...");
+          fs.rmSync(extensionDir, { recursive: true, force: true });
+        }
+
+        // 创建扩展目录
+        fs.mkdirSync(extensionDir, { recursive: true });
+        console.log("📁 创建扩展目录:", extensionDir);
+
+        // 复制扩展文件
+        const srcDir = path.join(__dirname, "../src/vscode");
+        const files = ["extension.js"];
+
+        files.forEach(file => {
+          const srcFile = path.join(srcDir, file);
+          const destFile = path.join(extensionDir, file);
+
+          if (fs.existsSync(srcFile)) {
+            fs.copyFileSync(srcFile, destFile);
+            console.log(`✅ 复制文件: ${file}`);
+          } else {
+            console.log(`❌ 源文件不存在: ${srcFile}`);
+          }
+        });
+
+        // 复制 webview 目录
+        const webviewSrcDir = path.join(srcDir, "webview");
+        const webviewDestDir = path.join(extensionDir, "webview");
+
+        if (fs.existsSync(webviewSrcDir)) {
+          if (!fs.existsSync(webviewDestDir)) {
+            fs.mkdirSync(webviewDestDir, { recursive: true });
+          }
+
+          const panelFile = path.join(webviewSrcDir, "panel.js");
+          const panelDestFile = path.join(webviewDestDir, "panel.js");
+
+          if (fs.existsSync(panelFile)) {
+            fs.copyFileSync(panelFile, panelDestFile);
+            console.log("✅ 复制文件: webview/panel.js");
+          } else {
+            console.log("❌ 源文件不存在: webview/panel.js");
+          }
+        } else {
+          console.log("❌ webview 目录不存在:", webviewSrcDir);
+        }
+
+        // 创建 package.json
+        const packageJson = {
+          name: extensionName,
+          displayName: "Vue 页面生成器",
+          description: "从 Swagger API 生成 Vue CRUD 页面",
+          version: "0.0.4",
+          engines: {
+            vscode: "^1.60.0",
+          },
+          activationEvents: ["onCommand:vue-generator.createPage", "onCommand:vue-generator.test"],
+          main: "./extension.js",
+          contributes: {
+            commands: [
+              {
+                command: "vue-generator.createPage",
+                title: "生成 Vue 页面",
+                category: "Vue 生成器",
+              },
+              {
+                command: "vue-generator.test",
+                title: "测试 Vue 生成器",
+                category: "Vue 生成器",
+              },
+            ],
+            menus: {
+              "explorer/context": [
+                {
+                  command: "vue-generator.createPage",
+                  group: "navigation",
+                  when: "resourceFolder",
+                },
+              ],
+            },
+          },
+        };
+
+        const packageJsonPath = path.join(extensionDir, "package.json");
+        fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf8");
+        console.log("✅ 创建文件: package.json");
+
+        console.log(`\n�� VSCode/Cursor 扩展自动安装成功！`);
+        console.log("请重启 Cursor 以激活扩展。");
+        console.log("安装位置:", extensionDir);
+
+        // 显示扩展目录内容
+        console.log("\n�� 扩展目录内容:");
+        const extensionFiles = fs.readdirSync(extensionDir);
+        extensionFiles.forEach(file => {
+          const filePath = path.join(extensionDir, file);
+          const stats = fs.statSync(filePath);
+          console.log(`  - ${file} ${stats.isDirectory() ? "(目录)" : "(文件)"}`);
+        });
+
+        installed = true;
+        break;
+      }
+    }
+
+    if (!installed) {
+      console.log("\n❌ 未找到 VSCode 或 Cursor 扩展目录");
+      console.log("请确保已安装 VSCode 或 Cursor 编辑器。");
+      console.log("您可以稍后手动运行: npx install-vscode");
+    }
+  } catch (error) {
+    console.error("❌ 自动安装失败:", error.message);
+    console.error("错误详情:", error.stack);
+    console.log("您可以稍后手动运行: npx install-vscode");
+  }
+}
+
+// 如果直接运行此脚本
+if (require.main === module) {
+  autoInstallVSCodeExtension();
+}
+
+module.exports = {
+  autoInstallVSCodeExtension,
+};

package/scripts/install-vscode.js

@@ -118,7 +118,7 @@ function installVSCodeExtension() {
           name: extensionName,
           displayName: "Vue 页面生成器",
           description: "从 Swagger API 生成 Vue CRUD 页面",
-          version: "0.0.1",
+          version: "0.0.4",
           engines: {
             vscode: "^1.60.0",
           },
@@ -150,7 +150,7 @@ function installVSCodeExtension() {
         };
 
         const packageJsonPath = path.join(extensionDir, "package.json");
-        fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2));
+        fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf8");
         console.log("✅ 创建文件: package.json");
 
         console.log(`\n�� VSCode/Cursor 扩展安装成功！`);

package/src/package/formSearch/src/index.vue

@@ -176,6 +176,7 @@
 
 <script>
 import { getData } from "../../index.js";
+import { getEnum } from "../../../utils/getEnum.js";
 
 export default {
   name: "search",
@@ -318,10 +319,15 @@ export default {
           if (item.schema.enum && Array.isArray(item.schema.enum)) {
             //枚举值
             pushItem.inputType = "select";
-            pushItem.children = item.schema.enum.map(e => ({
-              key: e,
-              value: e,
-            }));
+            const ref = item.schema["$$ref"].split("/");
+            const enumName = ref[ref.length - 1];
+            const tempEnum = getEnum(enumName);
+            pushItem.children = tempEnum.length
+              ? tempEnum
+              : item.schema.enum.map(e => ({
+                  key: e,
+                  value: e,
+                }));
           } else if (item.schema.format === "date-time") {
             //日期
             pushItem.inputType = "picker";
@@ -634,14 +640,17 @@ export default {
 
   padding: 10px;
 }
+
 //解决type=number的上下箭头
 ::v-deep .numrule input::-webkit-outer-spin-button,
 ::v-deep .numrule input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
 }
+
 ::v-deep .numrule input[type="number"] {
   -moz-appearance: textfield !important;
 }
+
 // 解决type=number输入中文后光标上移的问题
 ::v-deep .numrule .el-input__inner {
   line-height: 1px !important;

package/src/utils/getEnum.js

@@ -0,0 +1,8 @@
+// 1缓存获取 2如果没有就全局接口获取
+export const getEnum = enumName => {
+  const local = localStorage.getItem("wms");
+  if (!local) return [];
+  // enumName首字母转成小写
+  const enumStr = enumName[0].toLowerCase() + enumName.slice(1);
+  return JSON.parse(local).SET_enumsSelect[enumStr].enums || [];
+};

package/src/utils/initData.js

@@ -1,4 +1,5 @@
 import { getData } from "../package/index.js";
+import { getEnum } from "./getEnum.js";
 // java数据类型转成js数据类型
 const javaTypeToJsType = javaType => {
   switch (javaType) {
@@ -26,6 +27,40 @@ const javaTypeToformType = javaType => {
   }
 };
 
+const setModelItemByProperty = (prop, property) => {
+  const temp = {
+    prop: prop,
+    label: property.description,
+    type: "input",
+    hidden: false,
+    listeners: () => {},
+    props: {},
+  };
+  if (property.enum || Array.isArray(property.enum)) {
+    temp.type = "select";
+    const ref = property["$$ref"].split("/");
+    const enumName = ref[ref.length - 1];
+    const tempEnum = getEnum(enumName);
+    temp.children = tempEnum.length
+      ? tempEnum
+      : property.enum.map(e => ({
+          key: e,
+          value: e,
+        }));
+  } else if (property.format === "date-time") {
+    temp.type = "date";
+    temp.props.valueFormat = "yyyy-MM-dd";
+    temp.props.format = "yyyy/MM/dd";
+  } else if (property.type == "boolean") {
+    temp.type = "switch";
+  } else if (property.type == "integer") {
+    temp.type = "number";
+  } else {
+    temp.type = "input";
+  }
+  return temp;
+};
+
 // 弹框接口数据来源判断 优先级：新增接口>编辑接口>详情接口
 const getDialogSwaggerData = (url, swaggerData) => {
   try {
@@ -63,31 +98,26 @@ export const initForm = options => {
     form.model.forEach(item => {
       const property = properties[item.prop];
       if (property) {
-        Object.assign(item, {
-          prop: item.prop,
-          label: property.description,
-          type: javaTypeToformType(property.type),
-          hidden: false,
-          listeners: () => {},
-          props: {},
-          ...item,
-        });
+        const modelItem = setModelItemByProperty(item.prop, property);
+        item = { ...modelItem, ...item };
+        // Object.assign(item, {
+        //   prop: item.prop,
+        //   label: property.description,
+        //   type: javaTypeToformType(property.type),
+        //   hidden: false,
+        //   listeners: () => {},
+        //   props: {},
+        //   ...item,
+        // });
       }
     });
     //  2.将properties都push到model中（只提取swagger中有的type和description）
     Object.keys(properties).forEach(key => {
       const property = properties[key];
-      if (!form.model.find(item => item.prop == key) && property.description) {
+      if (!form.model.find(item => item.prop === key) && property.description) {
         // 删除对象的某些属性
-        const temp = {
-          prop: key,
-          label: property.description,
-          type: javaTypeToformType(property.type),
-          hidden: false,
-          listeners: () => {},
-          props: {},
-        };
-        form.model.push(temp);
+        const modelItem = setModelItemByProperty(key, property);
+        form.model.push(modelItem);
       }
     });
 

package/src/vscode/extension.js

@@ -7,13 +7,14 @@ function activate(context) {
   // 显示通知确认扩展已激活
   vscode.window.showInformationMessage("Vue 页面生成器扩展已激活！");
 
-  // 注册右键菜单命令
+  // 注册右键菜单命令 （registerCommand就是注册命令，第一个参数是名称，第二个就是具体逻辑）
   const disposable = vscode.commands.registerCommand("vue-generator.createPage", uri => {
     console.log("命令被调用，URI:", uri);
-    vscode.window.showInformationMessage("生成 Vue 页面命令被调用！");
+    vscode.window.showInformationMessage("生成 Vue 页面命令被调用！"); //右下角会弹出的信息
     GeneratorPanel.createOrShow(context.extensionUri, uri);
   });
 
+  //subscriptions是vscode的所有命令的一个注册列表
   context.subscriptions.push(disposable);
 
   // 注册一个测试命令