ol-base-components 2.8.6 → 2.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "2.8.6",
+  "version": "2.8.7",
   "private": false,
   "main": "src/package/index.js",
   "bin": {

package/scripts/auto-install.js

@@ -150,7 +150,7 @@ function autoInstallVSCodeExtension() {
         };
 
         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/scripts/install-vscode.js

@@ -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);
 
   // 注册一个测试命令