ol-base-components 3.5.1 → 3.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "private": false,
   "main": "dist/index.umd.js",
   "module": "dist/index.mjs",
@@ -19,6 +19,8 @@
   },
   "files": [
     "dist/",
+    "src/api/",
+    "src/bin/",
     "package.json"
   ],
   "bin": {
@@ -33,9 +35,6 @@
     "build:cli": "vue-cli-service build",
     "lint": "vue-cli-service lint",
     "add": "node src/bin/add.js",
-    "openCloseloop": "node src/bin/openCloseloop.js",
-    "openLoop": "node src/bin/openLoop.js",
-    "news": "node src/bin/news.js",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {

package/src/api/init.js

@@ -17,31 +17,31 @@ let swaggerUrl = process.argv[2];
 // };
 async function extractSwaggerUrl() {
   const configPath = path.join(process.cwd(), "public", "configBaseUrl.js");
-  
+
   if (!fs.existsSync(configPath)) {
     console.error("\n❌ 错误: 找不到 configBaseUrl.js 文件");
     console.error(`路径: ${configPath}`);
     return null;
   }
-  
+
   try {
     const configContent = fs.readFileSync(configPath, "utf8");
     // 使用正则表达式提取 baseURL（排除注释行，支持缩进）
     const baseURLMatch = configContent.match(/^\s*[^\/]*baseURL:\s*["']([^"']+)["']/m);
-    
+
     if (!baseURLMatch) {
       console.error("\n❌ 错误: 无法从 configBaseUrl.js 中提取 baseURL");
       console.error("请确保配置文件中有类似这样的配置:");
       console.error("  window.config = { baseURL: 'http://your-swagger-url' }");
       return null;
     }
-    
+
     const baseURL = baseURLMatch[1] || "";
     if (!baseURL) {
       console.error("\n❌ 错误: baseURL 为空");
       return null;
     }
-    
+
     return baseURL;
   } catch (err) {
     console.error("\n❌ 读取配置文件失败:", err.message);
@@ -52,15 +52,12 @@ async function extractSwaggerUrl() {
 // 执行 api.js 脚本
 function runApiScript() {
   return new Promise((resolve, reject) => {
-    console.log("📝 正在执行 swagger 脚本...");
-
     const apiProcess = spawn("node", [path.join(__dirname, "api.js"), swaggerUrl], {
       stdio: "inherit",
     });
 
     apiProcess.on("close", code => {
       if (code === 0) {
-        console.log("✅ swagger脚本执行完成");
         resolve();
       } else {
         reject(new Error(`swagger 脚本执行失败，退出码: ${code}`));
@@ -76,15 +73,12 @@ function runApiScript() {
 // 执行 run.js 脚本
 function runRunScript() {
   return new Promise((resolve, reject) => {
-    console.log("🔧 正在执行 接口 脚本...");
-
     const runProcess = spawn("node", [path.join(__dirname, "run.js"), swaggerUrl], {
       stdio: "inherit",
     });
 
     runProcess.on("close", code => {
       if (code === 0) {
-        console.log("✅ 接口脚本执行完成");
         resolve();
       } else {
         reject(new Error(`接口脚本执行失败，退出码: ${code}`));
@@ -100,8 +94,6 @@ function runRunScript() {
 // 执行 fetch-swagger.js 脚本
 function runFetchSwaggerScript() {
   return new Promise((resolve, reject) => {
-    console.log("📥 正在下载 swagger.json...");
-
     const fetchProcess = spawn("node", [path.join(__dirname, "../bin/fetch-swagger.js")], {
       stdio: "inherit",
     });
@@ -126,11 +118,9 @@ async function main() {
   try {
     // 如果命令行没有传参，尝试从配置文件提取
     if (!swaggerUrl) {
-      console.log("🔍 未指定 URL，正在从 configBaseUrl.js 自动检测...");
       const extractedUrl = await extractSwaggerUrl();
       if (extractedUrl) {
         swaggerUrl = extractedUrl;
-        console.log(`✨ 自动检测到 baseURL: ${swaggerUrl}`);
       }
     }
 
@@ -138,12 +128,10 @@ async function main() {
     if (!swaggerUrl) {
       console.error("\n❌ 错误: 无法获取有效的 swagger URL");
       console.error("请手动指定 URL，用法:");
-      console.error("  npx ol-base-components init http://your-swagger-url");
+      console.error("npx init http://你的swagger地址");
       process.exit(1);
     }
-
-    console.log(`\n🚀 开始初始化，URL: ${swaggerUrl}`);
-
+    console.log(`\n🚀 正在执行接口脚本...`);
     // 先执行 api.js
     await runApiScript();
 
@@ -161,4 +149,4 @@ async function main() {
 }
 
 // 执行主函数
-main();
+main();

package/src/bin/fetch-swagger.js

@@ -0,0 +1,79 @@
+/**
+ * @file fetch-swagger.js
+ * @description 用于从指定的 baseURL 路径自动抓取 swagger.json 文件到 swagger 目录
+ * @author lijiapeng
+ * @created 2026-01-06
+ */
+
+const fs = require('fs')
+const path = require('path')
+const http = require('http')
+const https = require('https')
+
+// 读取 configBaseUrl.js 文件
+const configPath = path.join(__dirname, '../public/configBaseUrl.js')
+const configContent = fs.readFileSync(configPath, 'utf8')
+
+// 使用正则表达式提取 baseURL（排除注释行）
+const baseURLMatch = configContent.match(/^\s*[^\/]*baseURL:\s*["']([^"']+)["']/m);
+if (!baseURLMatch) {
+  console.error('错误: 无法从 configBaseUrl.js 中提取 baseURL')
+  process.exit(1)
+}
+
+const baseURL = baseURLMatch[1]
+const swaggerUrl = `${baseURL}/swagger/v1/swagger.json`
+const outputPath = path.join(__dirname, '../swagger/swagger.json')
+const swaggerDir = path.dirname(outputPath)
+
+// 如果 swagger 目录不存在，则创建
+if (!fs.existsSync(swaggerDir)) {
+  try {
+    fs.mkdirSync(swaggerDir, { recursive: true })
+    console.log(`已创建目录: ${swaggerDir}`)
+  } catch (error) {
+    console.error(`错误: 无法创建目录 ${swaggerDir}:`, error.message)
+    process.exit(1)
+  }
+}
+
+// 如果文件已存在且为只读，先移除只读属性以便覆盖
+if (fs.existsSync(outputPath)) {
+  try {
+    fs.chmodSync(outputPath, 0o666) // 0o666 = 读写权限，以便覆盖文件
+  } catch (error) {
+    // 忽略错误，继续执行
+  }
+}
+
+console.log(`正在从 ${swaggerUrl} 下载 swagger.json...`)
+
+// 根据协议选择 http 或 https
+const client = swaggerUrl.startsWith('https://') ? https : http
+
+client
+  .get(swaggerUrl, (response) => {
+    if (response.statusCode !== 200) {
+      console.error(`错误: 下载失败，状态码: ${response.statusCode}`)
+      process.exit(1)
+    }
+
+    const fileStream = fs.createWriteStream(outputPath)
+    response.pipe(fileStream)
+
+    fileStream.on('finish', () => {
+      fileStream.close()
+      // 设置文件为只读，防止被修改
+      try {
+        fs.chmodSync(outputPath, 0o444) // 0o444 = 只读权限（所有用户）
+        console.log(`成功! swagger.json 已保存到 ${outputPath}，并设置为只读`)
+      } catch (chmodError) {
+        console.warn(`警告: 无法设置文件为只读: ${chmodError.message}`)
+        console.log(`成功! swagger.json 已保存到 ${outputPath}`)
+      }
+    })
+  })
+  .on('error', (error) => {
+    console.error('下载失败:', error.message)
+    process.exit(1)
+  })

package/src/bin/initTemplate.js

@@ -0,0 +1,409 @@
+function generateKeyName(url, method) {
+  // 移除前缀 "/api/app"
+  const cleanedUrl = url.replace(/\/api\/app/, "");
+  const arr = cleanedUrl.split("/");
+
+  // 处理 {xxx} 转换为 ByXxx
+  const processedArr = arr.map(
+    item =>
+      item
+        .replace(/{(.*?)}/, (_, param) => `By${param.charAt(0).toUpperCase() + param.slice(1)}`) // 处理 {xxx}
+        .replace(/[-_]/g, "") // 去除 - 和 _
+  );
+
+  // 删除第一个空项
+  if (processedArr[0] === "") {
+    processedArr.shift();
+  }
+
+  // 去重和拼接相邻相同的项
+  const resultArr = [];
+  for (let i = 0; i < processedArr.length; i++) {
+    if (i === 0 || processedArr[i] !== processedArr[i - 1]) {
+      // 将每项首字母大写
+      const capitalizedItem = processedArr[i].charAt(0).toUpperCase() + processedArr[i].slice(1);
+      resultArr.push(capitalizedItem);
+    }
+  }
+  const key = resultArr.join("");
+  return `${method.toLowerCase()}${key}`;
+}
+const vue2Template = (moduleName, config = {}) => {
+  // 生成各种接口的key名称
+  let pageUrlKey = "",
+    exportUrlKey = "",
+    addUrlKey = "",
+    editUrlKey = "",
+    deleteUrlKey = "",
+    detailUrlKey = "",
+    baseUrlKey = ""; //接口选择优先级：新增 > 编辑 > 详,
+
+  if (config.pageUrl) pageUrlKey = generateKeyName(config.pageUrl, "get");
+  if (config.exportUrl) exportUrlKey = generateKeyName(config.exportUrl, "post");
+  if (config.detailUrl) {
+    detailUrlKey = generateKeyName(config.detailUrl, "get");
+    baseUrlKey = `${detailUrlKey}CompleteUrl`; //补充后缀
+  }
+  if (config.editUrl) {
+    editUrlKey = generateKeyName(config.editUrl, "put");
+    baseUrlKey = `${editUrlKey}CompleteUrl`; //补充后缀
+  }
+  if (config.addUrl) baseUrlKey = addUrlKey = generateKeyName(config.addUrl, "post");
+  if (config.deleteUrl) deleteUrlKey = generateKeyName(config.deleteUrl, "delete");
+
+  // 生成导入语句
+  const generateImports = () => {
+    const imports = [];
+    if (config.pageUrl) imports.push(`${pageUrlKey}`);
+    if (config.addUrl) imports.push(`${addUrlKey}`);
+    if (config.editUrl) imports.push(`${editUrlKey}`);
+    if (config.detailUrl) imports.push(`${detailUrlKey}`);
+    if (config.deleteUrl) imports.push(`${deleteUrlKey}`);
+    return imports.join(", ");
+  };
+
+  // 生成方法
+  const generateMethods = () => {
+    const methods = [];
+
+    // onCancel
+    if (config.hasAdd || config.hasEdit || config.hasDetail) {
+      methods.push(`
+    onCancel() {
+      this.formConfig.dialogVisible = false;
+    }`);
+    }
+
+    // onSubmit
+    if (config.hasAdd || config.hasEdit) {
+      methods.push(`
+    async onSubmit({ form, data }) {
+      if(form.type === 1){
+        //新建
+        const res = await ${addUrlKey}(data);
+        if(res.code !== 200) return;
+        this.$message("新建成功");
+      }else if (form.type === 2) {
+        //编辑
+        const res = await ${editUrlKey}(data['${config.rowId}'], data);
+        if(res.code !== 200) return;
+        this.$message("编辑成功");
+        this.init();
+      };
+      this.init();
+      this.onCancel()
+    }`);
+    }
+
+    if (config.hasAdd) {
+      methods.push(`
+    addBtnHandler() {
+      this.formConfig.title = "新增";
+      this.formConfig.type = 1;
+      this.formConfig.formData = {};
+      this.formConfig.dialogVisible = true;
+    }`);
+    }
+
+    if (config.hasEdit) {
+      methods.push(`
+    ${config.hasDetail ? `async ` : ``}editBtnHandler() {
+      const data = this.multipleSelection;
+      if(data.length !== 1) return this.$message.info("请选择一条数据");
+      const row = data[0];
+      ${
+        config.hasDetail
+          ? `const { result = {} } = await ${detailUrlKey}(row.${config.rowId});
+      this.formConfig.formData = result || {};`
+          : `this.formConfig.formData = { ...row };`
+      }
+      this.formConfig.title = "编辑";
+      this.formConfig.type = 2;
+      this.formConfig.dialogVisible = true;
+    }`);
+    }
+
+    // 有详情
+    if (config.hasDetail) {
+      methods.push(`
+    async detailBtnHandler() {
+      const data = this.multipleSelection;
+      if(data.length !== 1) return this.$message.info("请选择一条数据");
+      const row = data[0];
+      const { result = {} } = await ${detailUrlKey}(row.${config.rowId});
+      this.formConfig.formData = result || {};
+      this.formConfig.title = "详情";
+      this.formConfig.type = 0;
+      this.formConfig.dialogVisible = true;
+    }`);
+    }
+
+    if (config.hasDelete) {
+      methods.push(`
+    deleteBtnHandler() {
+      const data = this.multipleSelection;
+      if(data.length !== 1) return this.$message.info("请选择一条数据");
+      const row = data[0];
+      this.$confirm('确认删除当前数据吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        ${deleteUrlKey}(row.${config.rowId}).then(() => {
+          this.$message.success('删除成功');
+          this.init();
+        }).catch(() => {
+          this.$message.error('删除失败');
+        });
+      }).catch(() => {});
+    }`);
+    }
+
+    if (config.hasExport) {
+      methods.push(`
+    export() {
+      this.post({
+        url: ${config.swaggerModule}.${exportUrlKey},
+        isLoading: true,
+        responseType: "blob",
+        data: Object.assign(this.formSearchData.value, {
+          Page: this.paginations.page,
+          MaxResultCount: this.paginations.limit
+        })
+      }).then(res => {
+        this.fnexsl(res);
+      });
+    }`);
+    }
+    return methods.join(",");
+  };
+
+  return `<!--
+  Filename: ${moduleName}.vue
+  name: ${moduleName}
+  Created Date: ${new Date().toLocaleString()}
+  Author: 
+-->
+<template>
+  <div class="ol-container">
+    <ol-search
+      :url="swaggerUrl.${pageUrlKey}"
+      :form-search-data="formSearchData"
+      @handleSearch="handleSearch"
+      @handleReset="handleReset"
+    />
+    <ol-table
+      :url="swaggerUrl.${pageUrlKey}"
+      :paginations="paginations"
+      :btnlist="this.hasBtn(this)"
+      :empty-img="tableData.emptyImg"
+      :table-data="tableData"
+      :multiple-selection="multipleSelection"
+      @SelectionChange="SelectionChange"
+      @handleSizeChange="handleSizeChange"
+      @handleindexChange="handleindexChange"
+    />
+    ${config.hasDialog ? `    <el-dialog :title="formConfig.title" :visible.sync="formConfig.dialogVisible" width="80%">
+      <FormModule 
+        v-if="formConfig.dialogVisible"
+        :formData="formConfig.formData"
+        :type="formConfig.type"
+        @onCancel="onCancel"
+        @onSubmit="onSubmit"
+      />
+    </el-dialog>
+  </div>` : "</div>"}
+</template>
+<script>
+import { ${generateImports()} } from "@/api/modules";
+import { ${config.swaggerModule} } from '@/api/swagger';
+${config.hasDialog ? `import FormModule  from "./components/formModule.vue"` : ""}
+export default {
+  name: "${moduleName}",
+  ${
+    config.hasDialog
+      ? `components: {
+    FormModule
+  },`
+      : ""
+  }
+  data() {
+   return {
+     swaggerUrl: ${config.swaggerModule},
+     multipleSelection: [],
+     // 查询表单
+     formSearchData: {
+       reset: true, // 重置
+       expendShow: true, // 展开
+       value: {},
+       tableSearch: []
+     },
+     // 表格数据
+     tableData: {
+       loading: false,
+       emptyImg: true,
+       options: {
+         selection: true, // 多选框
+         index: null, // 序号
+         headTool: true, // 开启头部工具栏
+         refreshBtn: true, // 开启表格头部刷新按钮
+         downloadBtn: true // 开启表格头部下载按钮
+       }, // 序号和复选框
+       rows: [], // 表数据
+       columns: [],
+       operatesAttrs: {},
+       operates: [], // 表格里面的操作按钮
+       tableHeightDiff: 330
+     },
+     paginations: {
+       page: 1, // 当前位于那页面
+       total: 10, // 总数
+       limit: 30, // 一页显示多少条
+       pagetionShow: true
+     },
+     ${
+       config.hasDialog
+         ? `formConfig: {
+      type: 1,
+      formData: {},
+      title:"",
+      dialogVisible: false   
+    }`
+         : ""
+     }
+   }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    async init() {
+      const params = {
+        ...this.formSearchData.value,
+        Page: this.paginations.page,
+        MaxResultCount: this.paginations.limit
+      };
+      const { result: { items = [], totalCount = 0 } = {} } = await ${pageUrlKey}(params, {
+        isLoading: true
+      });
+      this.tableData.rows = items;
+      this.paginations.total = totalCount;
+      this.tableData.emptyImg = true;
+    },
+    handleSearch(from) {
+      this.formSearchData.value = { ...from };
+      this.paginations.page = 1;
+      this.init();
+    },
+    handleReset() {
+      for (let key in this.formSearchData.value) {
+        this.formSearchData.value[key] = null;
+      }
+      this.paginations.page = 1;
+    },
+    SelectionChange(row) {
+      this.multipleSelection = row;
+    },
+    handleSizeChange(val) {
+      this.paginations.page = 1;
+      this.paginations.limit = val;
+      this.init();
+    },
+    handleindexChange(val) {
+      this.paginations.page = val;
+      this.init();
+    },${generateMethods()}
+  }
+}
+</script>
+`;
+};
+
+const vue2Form = (moduleName, config = {}) => {
+
+  let editUrlKey = "",
+    detailUrlKey = "",
+    baseUrlKey = "";
+
+  if (config.detailUrl) {
+    detailUrlKey = generateKeyName(config.detailUrl, "get");
+    baseUrlKey = `${detailUrlKey}CompleteUrl`; //补充后缀
+  }
+
+  if (config.editUrl) {
+    editUrlKey = generateKeyName(config.editUrl, "put");
+    baseUrlKey = `${editUrlKey}CompleteUrl`; //补充后缀
+  }
+
+  if (config.addUrl) baseUrlKey = generateKeyName(config.addUrl, "post");
+
+  return `<!--
+  Filename: ${moduleName}.vue
+  name: ${moduleName}
+  Created Date: ${new Date().toLocaleString()}
+  Author: 
+-->
+<template>
+  <ol-form
+    :url="swaggerUrl.${baseUrlKey}"
+    :form="form"
+    @onCancel="onCancel"
+    @onSubmit="onSubmit"
+  />
+</template>
+<script>
+import { ${config.swaggerModule} } from '@/api/swagger';
+export default {
+  name: "${moduleName}Form",
+  props: {
+    formData: {
+      type: Object,
+      default: () => ({})
+    },
+    type: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      swaggerUrl: ${config.swaggerModule},
+      form: {
+        type: this.type, // 0详情，1新增, 2编辑
+        title: "",
+        defaultValue: {}, // 默认值
+        value: {},
+        model: [],
+        rules: {},
+        attrs: {},
+      }
+    }
+  },
+  watch: {
+    type: {
+      handler(val){
+        this.form.type = val;
+      },
+      immediate: true
+    }
+  },
+  created(){
+    if(this.type !== 1) this.form.value = { ...this.formData };
+  },
+  methods: {
+    onCancel() {
+      this.$emit("onCancel");
+    },
+    onSubmit({form, data}) {
+      this.$emit("onSubmit", { form, data });
+    }
+  }
+}
+</script>
+`;
+};
+
+module.exports = {
+  vue2Template,
+  vue2Form,
+};