ol-base-components 2.7.5 → 2.7.7

package/.prettierrc

@@ -7,7 +7,7 @@
   "bracketSpacing": true,
   "arrowParens": "avoid",
   "endOfLine": "crlf",
-  "vueIndentScriptAndStyle": true,
+  "vueIndentScriptAndStyle": false,
   "htmlWhitespaceSensitivity": "css",
   "singleAttributePerLine": false
 }

package/package.json

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

package/src/api/api.js

@@ -8,7 +8,7 @@ const SwaggerClient = require("swagger-client");
 const swaggerUrl = process.argv[2] ? `${process.argv[2]}/swagger/v1/swagger.json` : "";
 const modulesDir = process.argv[3] ? process.argv[3] : "src/api/modules";
 
-let defaultRemark = `/**
+const defaultRemark = `/**
  * ⚠️  警告：此文件由脚本自动生成，请勿手动编辑！
  * ��  如需修改，请重新运行生成脚本
  * 📅  生成时间: ${new Date().toLocaleString()}
@@ -17,13 +17,38 @@ const spinnerChars = ["|", "/", "-", "\\"];
 let spinnerIndex = 0;
 let dotCount = 0;
 const maxDots = 3;
+
+const lyrics = [
+  "下个礼拜你有空吗",
+  "下个礼拜你有空吗",
+  "下个礼拜我们还在这里等着你",
+  "别说你太忙",
+  "别说你没空",
+  "有我们陪你一起放轻松",
+];
+
+let currentLyricIndex = 0;
+let lyricChangeTime = Date.now();
+
 const spinner = setInterval(() => {
   const dots = ".".repeat(dotCount);
-  process.stdout.write(`\r${spinnerChars[spinnerIndex]} 正在玩命加载中${dots}`);
+  const spinnerChar = spinnerChars[spinnerIndex];
+
+  if (Date.now() - lyricChangeTime > 2000) {
+    currentLyricIndex = (currentLyricIndex + 1) % lyrics.length;
+    lyricChangeTime = Date.now();
+  }
+
+  const currentLyric = lyrics[currentLyricIndex];
+  const rhythm = ["♪", "♫", "♬"][Math.floor(Date.now() / 500) % 3];
+
+  // 一行显示，用空格清除之前的内容
+  const displayText = `${rhythm} ${currentLyric} ${spinnerChar} 正在玩命加载中${dots}`;
+  process.stdout.write(`\r${displayText}${" ".repeat(50)}`);
+
   spinnerIndex = (spinnerIndex + 1) % spinnerChars.length;
   dotCount = (dotCount + 1) % (maxDots + 1);
 }, 300);
-
 // 设置文件为只读权限
 function setFileReadOnly(filePath) {
   try {

package/src/api/run.js

@@ -8,7 +8,7 @@ const path = require("path");
 const swaggerUrl = process.argv[2] ? `${process.argv[2]}/swagger/v1/swagger.json` : "";
 const outputPath = process.argv[3] || "src/api/swagger.js";
 
-let defaultRemark = `/**
+const defaultRemark = `/**
  * ⚠️  警告：此文件由脚本自动生成，请勿手动编辑！
  * ��  如需修改，请重新运行生成脚本
  * 📅  生成时间: ${new Date().toLocaleString()}
@@ -17,13 +17,38 @@ const spinnerChars = ["|", "/", "-", "\\"];
 let spinnerIndex = 0;
 let dotCount = 0;
 const maxDots = 3;
+
+const lyrics = [
+  "下个礼拜你有空吗",
+  "下个礼拜你有空吗",
+  "下个礼拜我们还在这里等着你",
+  "别说你太忙",
+  "别说你没空",
+  "有我们陪你一起放轻松",
+];
+
+let currentLyricIndex = 0;
+let lyricChangeTime = Date.now();
+
 const spinner = setInterval(() => {
   const dots = ".".repeat(dotCount);
-  process.stdout.write(`\r${spinnerChars[spinnerIndex]} 正在玩命加载中${dots}`);
+  const spinnerChar = spinnerChars[spinnerIndex];
+
+  if (Date.now() - lyricChangeTime > 2000) {
+    currentLyricIndex = (currentLyricIndex + 1) % lyrics.length;
+    lyricChangeTime = Date.now();
+  }
+
+  const currentLyric = lyrics[currentLyricIndex];
+  const rhythm = ["♪", "♫", "♬"][Math.floor(Date.now() / 500) % 3];
+
+  // 一行显示，用空格清除之前的内容
+  const displayText = `${rhythm} ${currentLyric} ${spinnerChar} 正在玩命加载中${dots}`;
+  process.stdout.write(`\r${displayText}${" ".repeat(50)}`);
+
   spinnerIndex = (spinnerIndex + 1) % spinnerChars.length;
   dotCount = (dotCount + 1) % (maxDots + 1);
 }, 300);
-
 // 设置文件为只读权限
 function setFileReadOnly(filePath) {
   try {

package/src/bin/add.js

@@ -112,6 +112,7 @@ try {
         let editUrl = "";
         let deleteUrl = "";
         let detailUrl = "";
+        let rowId = "";
 
         // 如果有新增/编辑/删除/详情功能，直接使用分页接口地址
         if (operationsAnswer.operations.length > 0) {
@@ -137,11 +138,11 @@ try {
             {
               type: "input",
               name: "idField",
-              message: "请输入ID字段名:",
+              message: "请输入url后缀ID字段名:",
               default: "admissionInfoId",
               validate: input => {
                 if (!input.trim()) {
-                  return "ID字段名不能为空";
+                  return "url后缀ID字段名不能为空";
                 }
                 return true;
               },
@@ -164,6 +165,29 @@ try {
           }
         }
 
+        //如果有编辑/详情/删除，询问row中的id字段名
+        if (
+          operationsAnswer.operations.includes("edit") ||
+          operationsAnswer.operations.includes("delete") ||
+          operationsAnswer.operations.includes("detail")
+        ) {
+          const rowIdAnswer = await inquirer.prompt([
+            {
+              type: "input",
+              name: "rowId",
+              message: "请输入行数据中ID字段的键名（用于编辑/详情/删除操作）",
+              default: "id",
+              validate: input => {
+                if (!input.trim()) {
+                  return "ID字段的键名不能为空";
+                }
+                return true;
+              },
+            },
+          ]);
+          rowId = rowIdAnswer.rowId;
+        }
+
         // 4. 询问所有接口的模块名
         const moduleAnswer = await inquirer.prompt([
           {
@@ -213,6 +237,7 @@ try {
           detailUrl: detailUrl,
           swaggerModule: moduleAnswer.swaggerModule,
           idField: idField,
+          rowId,
         };
 
         // 生成模板内容

package/src/bin/initTemplate.js

@@ -29,8 +29,6 @@ function generateKeyName(url, method) {
   return `${method.toLowerCase()}${key}`;
 }
 const vue2Template = (moduleName, config = {}) => {
-  console.log(888, config);
-
   // 生成各种接口的key名称
   let pageUrlKey = "",
     exportUrlKey = "",
@@ -51,7 +49,6 @@ const vue2Template = (moduleName, config = {}) => {
   const generateImports = () => {
     const imports = [];
     if (config.pageUrl) imports.push(`${pageUrlKey}`);
-    if (config.baseUrl) imports.push(`${baseUrlKey}`);
     if (config.addUrl) imports.push(`${addUrlKey}`);
     if (config.editUrl) imports.push(`${editUrlKey}`);
     if (config.detailUrl) imports.push(`${detailUrlKey}`);
@@ -70,14 +67,6 @@ const vue2Template = (moduleName, config = {}) => {
     }`);
     }
 
-    // if (config.hasEdit) {
-    //   methods.push(`
-    // editBtnHandler() {
-    //   this.form.type = 2;
-    //   this.dialogVisible = true;
-    // }`);
-    // }
-
     if (config.hasEdit) {
       methods.push(`
     ${config.hasDetail ? `async ` : ``}editBtnHandler() {
@@ -87,7 +76,7 @@ const vue2Template = (moduleName, config = {}) => {
       this.form.type = 2;
       ${
         config.hasDetail
-          ? `const { result = {} } = await ${detailUrlKey}(row.${config.idField});
+          ? `const { result = {} } = await ${detailUrlKey}(row.${config.rowId});
       this.form.value = result || {};`
           : `this.form.value = { ...row };`
       }
@@ -114,7 +103,7 @@ const vue2Template = (moduleName, config = {}) => {
         this.$message("新建成功");
       }else if(form.type === 2){
         //编辑
-        const res = await ${editUrlKey}(data['${config.idField}'], data);
+        const res = await ${editUrlKey}(data['${config.rowId}'], data);
         if(res.code !== 200) return;
         this.$message("编辑成功");
         this.init();
@@ -135,7 +124,7 @@ const vue2Template = (moduleName, config = {}) => {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        ${deleteUrlKey}(row.${config.idField}).then(() => {
+        ${deleteUrlKey}(row.${config.rowId}).then(() => {
           this.$message.success('删除成功');
           this.init();
         }).catch(() => {

package/src/package/form/src/index.vue

@@ -168,7 +168,7 @@
     </div>
   </div>
 </template>
-  <!--
+<!--
   # BaseForm 基础表单组件
   
   ## Props 属性
@@ -210,8 +210,7 @@
   | onCancel    | 取消按钮点击事件 | - |
   | selectChange| 选择器值变化事件 | {obj: 当前项配置, val: 变化后的值} |
   -->
-  <script>
-import { getData } from "../../index.js";
+<script>
 import { initForm } from "../../../utils/initData.js";
 
 // interface FormItem {
@@ -340,7 +339,7 @@ export default {
       }
     },
     selectChange(obj, val) {
-      let temp = {
+      const temp = {
         obj: obj,
         val: val,
       };
@@ -386,11 +385,10 @@ export default {
   },
 };
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 .dialog-footer {
   display: flex;
   justify-content: flex-end;
 }
 </style>
-  

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

@@ -1,9 +1,7 @@
 <template>
   <div class="formSearch formSearchArrowUp">
     <div
-      v-if="
-        formSearchData.tableSearch && formSearchData.tableSearch.length >= 0
-      "
+      v-if="formSearchData.tableSearch && formSearchData.tableSearch.length >= 0"
       class="table-header"
     >
       <el-form
@@ -20,11 +18,7 @@
         <!-- 'label-width': '100px', -->
         <div
           class="transitionGroup"
-          :class="[
-            formSearchData.expendShow
-              ? 'formSearchBtnArrowDowns'
-              : 'formSearchBtnArrowUps',
-          ]"
+          :class="[formSearchData.expendShow ? 'formSearchBtnArrowDowns' : 'formSearchBtnArrowUps']"
         >
           <el-form-item
             v-for="item in findTableSearch"
@@ -113,11 +107,7 @@
               style="width: 100%"
               :placeholder="item.props.placeholder || '选择日期'"
               v-bind="item.props || { type: 'date' }"
-              :default-time="
-                item.props.type == 'datetimerange'
-                  ? ['00:00:00', '23:59:59']
-                  : ''
-              "
+              :default-time="item.props.type == 'datetimerange' ? ['00:00:00', '23:59:59'] : ''"
             />
             <el-input
               v-else
@@ -138,11 +128,7 @@
         <el-form-item
           style="word-break: keep-all; white-space: nowrap; margin-left: 10px"
           class="fromBtn"
-          :class="[
-            formSearchData.expendShow
-              ? 'formSearchBtnArrowDown'
-              : 'formSearchBtnArrowUp',
-          ]"
+          :class="[formSearchData.expendShow ? 'formSearchBtnArrowDown' : 'formSearchBtnArrowUp']"
         >
           <el-button
             v-if="formSearchData.reset"
@@ -197,9 +183,7 @@ export default {
     "el-select-loadmore": {
       bind(el, binding) {
         // 获取element-ui定义好的scroll盒子
-        const SELECTWRAP_DOM = el.querySelector(
-          ".el-select-dropdown .el-select-dropdown__wrap"
-        );
+        const SELECTWRAP_DOM = el.querySelector(".el-select-dropdown .el-select-dropdown__wrap");
         SELECTWRAP_DOM.addEventListener("scroll", function () {
           /**
            * scrollHeight 获取元素内容高度(只读)
@@ -208,8 +192,7 @@ export default {
            * 如果元素滚动到底, 下面等式返回true, 没有则返回false:
            * ele.scrollHeight - ele.scrollTop === ele.clientHeight;
            */
-          const condition =
-            this.scrollHeight - this.scrollTop <= this.clientHeight;
+          const condition = this.scrollHeight - this.scrollTop <= this.clientHeight;
           if (condition > 0 && condition < 2) {
             binding.value();
           }
@@ -220,9 +203,7 @@ export default {
       bind(el, binding, vnode) {
         // console.log(binding.value)
         const _that = vnode.context; // 当前vue对象
-        const SELECTWRAP_DOM = el.querySelector(
-          ".el-select-dropdown .el-select-dropdown__wrap"
-        );
+        const SELECTWRAP_DOM = el.querySelector(".el-select-dropdown .el-select-dropdown__wrap");
         SELECTWRAP_DOM.addEventListener("scroll", function () {
           // console.log(SELECTWRAP_DOM.scrollHeight) // 文档内容的实际高度
           // console.log(SELECTWRAP_DOM.scrollTop) // 滚动条滚动高度
@@ -240,9 +221,7 @@ export default {
       unbind(el, binding, vnode) {
         // 解除事件监听
         const _that = vnode.context; // 当前vue对象
-        const SELECTWRAP_DOM = el.querySelector(
-          ".el-select-dropdown .el-select-dropdown__wrap"
-        );
+        const SELECTWRAP_DOM = el.querySelector(".el-select-dropdown .el-select-dropdown__wrap");
         if (SELECTWRAP_DOM) {
           SELECTWRAP_DOM.removeEventListener("scroll", function () {
             binding.value.SELECTWRAP_DOM_index = 0;
@@ -320,11 +299,10 @@ export default {
   methods: {
     async init() {
       const swaggerData = await getData();
-      const swaggersearchColumns =
-        swaggerData.paths[this.url].get.parameters || [];
-      swaggersearchColumns.forEach((item) => {
+      const swaggersearchColumns = swaggerData.paths[this.url].get.parameters || [];
+      swaggersearchColumns.forEach(item => {
         let tempItem = this.formSearchData.tableSearch.find(
-          (e) => e.value.toLowerCase() === item.name.toLowerCase()
+          e => e.value.toLowerCase() === item.name.toLowerCase()
         );
         if (tempItem) {
           // 匹配到
@@ -340,7 +318,7 @@ export default {
           if (item.schema.enum && Array.isArray(item.schema.enum)) {
             //枚举值
             pushItem.inputType = "select";
-            pushItem.children = item.schema.enum.map((e) => ({
+            pushItem.children = item.schema.enum.map(e => ({
               key: e,
               value: e,
             }));
@@ -357,13 +335,13 @@ export default {
       });
 
       const tableHasCreatedTime = this.formSearchData.tableSearch.some(
-        (e) => e.value === "createdTime"
+        e => e.value === "createdTime"
       );
       if (!tableHasCreatedTime) {
         //  单独处理创建时间 就是BeginTime，EndTime
         const requiredNames = ["BeginTime", "EndTime"];
-        const hseCreatedTime = requiredNames.every((name) =>
-          swaggersearchColumns.some((item) => item.name === name)
+        const hseCreatedTime = requiredNames.every(name =>
+          swaggersearchColumns.some(item => item.name === name)
         );
         if (hseCreatedTime) {
           this.formSearchData.tableSearch.push({
@@ -385,10 +363,7 @@ export default {
         this.formSearchData.tableSearch.length > this.tableSearchSlice
           ? this.formSearchData.tableSearch.slice(0, this.tableSearchSlice)
           : this.formSearchData.tableSearch;
-      console.log(
-        `\x1b[36m\x1b[4mol插件-搜索框渲染`,
-        this.formSearchData.tableSearch
-      );
+      console.log(`\x1b[36m\x1b[4mol插件-搜索框渲染`, this.formSearchData.tableSearch);
     },
     // 树形下拉
     getValue(val) {
@@ -405,7 +380,7 @@ export default {
       }
       const tempFormSearch = Object.assign({}, this.formSearch);
       if (this.formSearchData.rules) {
-        return this.$refs[formName].validate((valid) => {
+        return this.$refs[formName].validate(valid => {
           if (!valid) return false;
           this.$emit("handleSearch", tempFormSearch, item);
         });
@@ -421,25 +396,13 @@ export default {
       this.$refs[formName].resetFields();
       if (this.formSearchData.reset) {
         for (const key in this.formSearch) {
-          if (
-            Object.prototype.toString.call(this.formSearch[key]) ===
-            "[object String]"
-          ) {
+          if (Object.prototype.toString.call(this.formSearch[key]) === "[object String]") {
             this.formSearch[key] = null;
-          } else if (
-            Object.prototype.toString.call(this.formSearch[key]) ===
-            "[object Array]"
-          ) {
+          } else if (Object.prototype.toString.call(this.formSearch[key]) === "[object Array]") {
             this.formSearch[key] = [];
-          } else if (
-            Object.prototype.toString.call(this.formSearch[key]) ===
-            "[object Object]"
-          ) {
+          } else if (Object.prototype.toString.call(this.formSearch[key]) === "[object Object]") {
             this.formSearch[key] = {};
-          } else if (
-            Object.prototype.toString.call(this.formSearch[key]) ===
-            "[object Boolean]"
-          ) {
+          } else if (Object.prototype.toString.call(this.formSearch[key]) === "[object Boolean]") {
             this.formSearch[key] = false;
           } else {
             this.formSearch[key] = null;
@@ -458,10 +421,7 @@ export default {
     handleExpend() {
       this.expend = !this.expend; // 展开和收起
       this.findTableSearch = this.expend
-        ? this.formSearchData.tableSearch.slice(
-            0,
-            this.formSearchData.tableSearch.length
-          )
+        ? this.formSearchData.tableSearch.slice(0, this.formSearchData.tableSearch.length)
         : this.formSearchData.tableSearch.slice(0, this.tableSearchSlice);
 
       this.$emit("btnHandleExpend", this.expend);
@@ -475,13 +435,7 @@ export default {
     keyInput(item, e) {
       if (item.inputType === "number") {
         let key = e.key;
-        if (
-          key === "e" ||
-          key === "E" ||
-          key === "-" ||
-          key === "+" ||
-          key === "."
-        ) {
+        if (key === "e" || key === "E" || key === "-" || key === "+" || key === ".") {
           e.returnValue = false;
           return false;
         }

package/src/utils/initData.js

@@ -26,18 +26,38 @@ const javaTypeToformType = javaType => {
   }
 };
 
+// 弹框接口数据来源判断 优先级：新增接口>编辑接口>详情接口
+const getDialogSwaggerData = (url, swaggerData) => {
+  try {
+    // 新增 post
+    const entity = swaggerData.paths[url].post;
+    const schema = entity.requestBody.content["application/json"].schema;
+    const properties = schema.properties;
+
+    return [schema, properties];
+  } catch (err) {
+    try {
+      //编辑 put
+      const entity = swaggerData.paths[url].put;
+      const schema = entity.requestBody.content["application/json"].schema;
+      const properties = schema.properties;
+      return [schema, properties];
+    } catch (err) {
+      // 详情 get
+      const entity = swaggerData.paths[url].get;
+      const schema = entity.responses[200].content["application/json"].schema;
+      const properties = schema.properties;
+      return [schema, properties];
+    }
+  }
+};
+
 export const initForm = options => {
   const { url, form } = options;
   getData().then(swaggerData => {
     // swagger数据可以来源于，新增接口/编辑接口/详情接口（优先级：新增接口>编辑接口>详情接口）
-    let entity = {},
-      schema = {},
-      properties = {};
-    entity = swaggerData.paths[url].post;
-    // 添加title
-    // if (!form.title) form.title = entity.summary;
-    schema = entity.requestBody.content["application/json"].schema;
-    properties = schema.properties;
+    const [schema, properties] = getDialogSwaggerData(url, swaggerData);
+    if (!schema || !properties) return console.log(`\x1b[36m\x1b[4mol插件-弹框数据异常`);
     // 生成model
     // 1.循环model，将properties中prop相同的匹配，属性合并，model权限大，properties权限小，且保持响应式
     form.model.forEach(item => {