ol-base-components 2.9.2 → 2.9.4

package/package.json

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

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

@@ -113,7 +113,11 @@
               v-else-if="item.inputType === 'numberRange'"
               v-model="formSearch[item.value]"
               v-bind="item.props || {}"
-              v-on="{ ...item.listeners, change: val => item.listeners && item.listeners.change && item.listeners.change({ item, val }) }"
+              v-on="{
+                ...item.listeners,
+                change: val =>
+                  item.listeners && item.listeners.change && item.listeners.change({ item, val }),
+              }"
             ></ol-number-range>
             <el-input
               v-else
@@ -184,7 +188,6 @@
 import { getData } from "../../index.js";
 import { getEnum } from "../../../utils/getEnum.js";
 import OlNumberRange from "../../numberRange/index.js";
-import { camelCaseToChinese } from "./index.js";
 
 export default {
   name: "search",
@@ -274,6 +277,11 @@ export default {
     rulesLength: {
       type: Boolean,
     },
+    //获取swagger后的钩子，返回swagger结构数据。用于处理swagger数据
+    onSwagger: {
+      type: Function,
+      default: null,
+    },
   },
   data() {
     return {
@@ -311,7 +319,13 @@ export default {
   methods: {
     async init() {
       const swaggerData = await getData();
-      const swaggersearchColumns = swaggerData.paths[this.url].get.parameters || [];
+      let swaggersearchColumns = swaggerData.paths[this.url].get.parameters || [];
+      if (typeof this.onSwagger === "function") {
+        try {
+          const res = await this.onSwagger({ columns: swaggersearchColumns });
+          if (res) swaggersearchColumns = res;
+        } catch (err) {}
+      }
       swaggersearchColumns.forEach(item => {
         let tempItem = this.formSearchData.tableSearch.find(
           e => e.value.toLowerCase() === item.name.toLowerCase()

package/src/package/table/src/index.vue

@@ -423,12 +423,12 @@ export default {
       default: true,
     },
     //获取swagger后的钩子，返回swagger结构数据。用于处理swagger数据
-    swaggerColumnsProcessor: {
+    onSwagger: {
       type: Function,
       default: null,
     },
     // swagger与本地columns合并完成后的钩子，允许父组件二次处理columns，一般用于不影响顺序的属性修改。区别于直接column中添加
-    mergedColumnsProcessor: {
+    onMerged: {
       type: Function,
       default: null,
     },
@@ -484,42 +484,6 @@ export default {
     this.stopColumnsWatching();
   },
   methods: {
-    // init() {
-    //   // 从 IndexedDB 中获取 Swagger 数据
-    //   getData().then((swaggerData) => {
-    //     const swaggerColumns = swaggerData.paths[this.url].get.responses["200"].content['application/json'].schema.properties.items.items.properties;
-
-    //     Object.keys(swaggerColumns).forEach(key => {
-    //       const item = swaggerColumns[key];
-    //       let tempItem = this.tableData.columns.find((e) => e.prop == key);
-    //       if (tempItem) {
-    //         tempItem = { ...item, ...tempItem };
-    //       } else if (item.description) {
-    //         this.tableData.columns.push({
-    //           prop: key,
-    //           label: item.description,
-    //           show: true,
-    //           sortable: false,
-    //           attrs: {}
-    //         });
-    //       }
-    //     });
-    //     console.log(`\x1b[36m\x1b[4mol插件-表格`, this.tableData.columns)
-    //   }).catch((error) => {
-    //     console.error("获取 Swagger 数据失败:", error);
-    //   });
-    // },
-    // 支持多级表头 useSlotHeader: true，且支持排序，通过columns中的顺序实现
-    //  columns: [
-    //       {
-    //         label: '一级表头',
-    //         children: [{ prop: 'bindStateEnum', label: '112' }, { prop: 'tagNumber' }]
-    //       },
-    //       {
-    //         prop: "remark",
-    //         label: "备注123",
-    //       },
-    //     ],
     init() {
       // 从 IndexedDB 中获取 Swagger 数据
       getData()
@@ -527,10 +491,10 @@ export default {
           let swaggerColumns =
             swaggerData.paths[this.url].get.responses["200"].content["application/json"].schema
               .properties.items.items.properties;
-          if (typeof this.swaggerColumnsProcessor === "function") {
+          if (typeof this.onSwagger === "function") {
             try {
-              const res = await this.swaggerColumnsProcessor({ swaggerColumns });
-              swaggerColumns = res;
+              const res = await this.onSwagger({ columns: swaggerColumns });
+              if (res) swaggerColumns = res;
             } catch (err) {}
           }
           // 递归映射函数
@@ -566,6 +530,10 @@ export default {
                 obj.prop = `${key}Desc`;
                 obj.label = item.description.replace(/(枚举|枚举值)/g, "");
               }
+              // 如果是boolean类型，加上Text后缀
+              if (item.type === "boolean") {
+                obj.prop = `${key}Text`;
+              }
               this.tableData.columns.push(obj);
             }
           });
@@ -592,11 +560,14 @@ export default {
           console.log(`\x1b[36m\x1b[4mol插件-表格`, this.tableData.columns);
 
           // 合并完成后，暴露处理钩子
-          if (typeof this.mergedColumnsProcessor === "function") {
+          if (typeof this.onMerged === "function") {
             try {
-              await this.mergedColumnsProcessor({
+              const res = await this.onMerged({
                 columns: this.tableData.columns,
               });
+              if (Array.isArray(res)) {
+                this.tableData.columns = res;
+              }
             } catch (e) {}
           }