ol-base-components 2.8.11 → 2.8.12

package/package.json

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

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

@@ -422,11 +422,16 @@ export default {
       type: Boolean,
       default: true,
     },
-    //获取swagger后的钩子，返回swagger结构数据
+    //获取swagger后的钩子，返回swagger结构数据。用于处理swagger数据
     swaggerColumnsProcessor: {
       type: Function,
       default: null,
     },
+    // swagger与本地columns合并完成后的钩子，允许父组件二次处理columns，一般用于不影响顺序的属性修改。区别于直接column中添加
+    mergedColumnsProcessor: {
+      type: Function,
+      default: null,
+    },
   },
 
   data() {
@@ -522,12 +527,12 @@ export default {
           let swaggerColumns =
             swaggerData.paths[this.url].get.responses["200"].content["application/json"].schema
               .properties.items.items.properties;
-
-          try {
-            const res = await this.swaggerColumnsProcessor(swaggerColumns);
-            swaggerColumns = res;
-          } catch (err) {}
-
+          if (typeof this.swaggerColumnsProcessor === "function") {
+            try {
+              const res = await this.swaggerColumnsProcessor({ swaggerColumns });
+              swaggerColumns = res;
+            } catch (err) {}
+          }
           // 递归映射函数
           const mapSwaggerToColumns = columns => {
             columns.forEach(column => {
@@ -586,6 +591,15 @@ export default {
           addShow(this.tableData.columns);
           console.log(`\x1b[36m\x1b[4mol插件-表格`, this.tableData.columns);
 
+          // 合并完成后，暴露处理钩子
+          if (typeof this.mergedColumnsProcessor === "function") {
+            try {
+              await this.mergedColumnsProcessor({
+                columns: this.tableData.columns,
+              });
+            } catch (e) {}
+          }
+
           // init 执行完成后，添加深度监听
           this.startColumnsWatching();
         })