ol-base-components 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol-base-components",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "private": false,
   "main": "src/package/index.js",
   "scripts": {

package/src/main.js

@@ -2,16 +2,14 @@ import Vue from "vue";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
 import App from "./App.vue";
+import OlCom from "@/package/index.js";
 
-// import olCom, { SwaggerHandler } from "@/package/index.js";
-
-// Vue.use(olCom);
-// SwaggerHandler(Vue)
-// Vue.config.productionTip = false;
 Vue.use(ElementUI);
 
-setTimeout(() => {
-  new Vue({
-    render: (h) => h(App),
-  }).$mount("#app");
-}, 20000);
+Vue.use(OlCom, {
+  swaggerUrl: "http://220.179.249.140:20019/swagger/v1/swagger.json",
+});
+
+new Vue({
+  render: (h) => h(App),
+}).$mount("#app");

package/src/package/index.js

@@ -32,26 +32,25 @@ export const SwaggerHandler = async (Vue, swaggerUrl) => {
 
 const components = [OlTable, OlSearch, Dialog];
 
-const install = function (
+const install = async function (
   Vue,
   options = {
     swaggerUrl: "",
   }
 ) {
-  if (options && options.swaggerUrl) {
-    // "http://220.179.249.140:20019/swagger/v1/swagger.json"
-    const client = new SwaggerClient(options.swaggerUrl);
-    Vue.prototype.$swagger = { specification: client.spec };
-  }
   // 遍历所有组件
   components.map((item) => {
     Vue.component(`ol-${item.name}`, item);
   });
 
+  if (options && options.swaggerUrl) {
+    // "http://220.179.249.140:20019/swagger/v1/swagger.json"
+    const client = await SwaggerClient(options.swaggerUrl);
+    Vue.prototype.$swagger = { specification: client.spec };
+  }
   consoleTooltip();
 };
 
 // 判断是否引入文件
 export default install; //全局导入
 export { OlTable, OlSearch, Dialog }; //按需导入
-// export { Swagger };

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

@@ -340,6 +340,10 @@ export default {
       default: true,
     },
   },
+  created() {
+    // 通过swagger完善columns
+    this.init()
+  },
   data() {
     return {
       nodata,
@@ -354,49 +358,78 @@ export default {
   },
   computed: {
     bindTableColumns() {
-      // 读取接口和类型获取表头数据
-      if (!this.$swagger) return this.tableData.columns.filter((column) =>
+      return this.tableData.columns.filter((column) =>
         Object.keys(column).includes("show") ? column.show : true
       );
-      const tableColumns = this.$swagger.specification.paths[this.url].get.responses["200"].content['application/json'].schema.properties.items.items.properties
-      let swaggerColumns = Object.keys(tableColumns).reduce((acc, key) => {
-        const column = tableColumns[key];
-        if (column.description) {
-          acc.push({
-            prop: key,
-            label: column.description,
-            minWidth: column.minWidth || "150px",
-            sortable: true,
-            show: true,
-            attrs: {},
-          })
-        }
-        return acc;
-      }, []);
 
-      this.tableData.columns.filter((column) =>
-        Object.keys(column).includes("show") ? column.show : true
-      );
+      // const swaggerColumns = this.$swagger.specification.paths[this.url].get.responses["200"].content['application/json'].schema.properties.items.items.properties
+      // swaggerColumns.forEach(item => {
+      //   const tempItem = this.tableData.columns.find((e) => e.prop == item.prop)
+      //   tempItem ? tempItem = { ...item, ...tempItem } : this.tableData.columns.push(item)
+      // })
 
-      this.tableData.columns.forEach(dataColumn => {
-        const tempIndex = swaggerColumns.findIndex((item) => item.prop == dataColumn.prop)
-        if (tempIndex == -1) {
-          swaggerColumns.push(dataColumn)
-        } else {
-          Object.assign(swaggerColumns[tempIndex], dataColumn)
-        }
-      })
+      // // 一定加上selection,通过show显示隐藏
+      // const itemSelection = this.tableData.columns.find((item) => item.type == "selection");
+      // const hasSelection = this.tableData.options.selection;
+      // if (itemSelection) {
+      //   itemSelection.show = !!hasSelection;
+      // } else {
+      //   this.tableData.columns.unshift({
+      //     label: "",
+      //     minWidth: "",
+      //     type: "selection",
+      //     show: !!hasSelection,
+      //   });
+      // }
 
-      // 如果options.selection有多选框直接加
-      swaggerColumns.unshift({
-        label: "",
-        minWidth: "",
-        type: "selection",
-        show: true,
-      });
-      console.log('表头数据', swaggerColumns)
-      return swaggerColumns
+      // return this.tableData.columns.filter((column) =>
+      //   Object.keys(column).includes("show") ? column.show : true
+      // );
     },
+    // bindTableColumns1() {
+    //   // 读取接口和类型获取表头数据
+    //   if (!this.$swagger) return this.tableData.columns.filter((column) =>
+    //     Object.keys(column).includes("show") ? column.show : true
+    //   );
+    //   const tableColumns = this.$swagger.specification.paths[this.url].get.responses["200"].content['application/json'].schema.properties.items.items.properties
+    //   let swaggerColumns = Object.keys(tableColumns).reduce((acc, key) => {
+    //     const column = tableColumns[key];
+    //     if (column.description) {
+    //       acc.push({
+    //         prop: key,
+    //         label: column.description,
+    //         minWidth: column.minWidth || "150px",
+    //         sortable: true,
+    //         show: true,
+    //         attrs: {},
+    //       })
+    //     }
+    //     return acc;
+    //   }, []);
+
+    //   this.tableData.columns.filter((column) =>
+    //     Object.keys(column).includes("show") ? column.show : true
+    //   );
+
+    //   this.tableData.columns.forEach(dataColumn => {
+    //     const tempIndex = swaggerColumns.findIndex((item) => item.prop == dataColumn.prop)
+    //     if (tempIndex == -1) {
+    //       swaggerColumns.push(dataColumn)
+    //     } else {
+    //       Object.assign(swaggerColumns[tempIndex], dataColumn)
+    //     }
+    //   })
+
+    //   // 如果options.selection有多选框直接加
+    //   swaggerColumns.unshift({
+    //     label: "",
+    //     minWidth: "",
+    //     type: "selection",
+    //     show: true,
+    //   });
+    //   console.log('表头数据', swaggerColumns)
+    //   return swaggerColumns
+    // },
     checkedTableList: {
       get() {
         // 返回选中的列名
@@ -436,6 +469,27 @@ export default {
     },
   },
   methods: {
+    init() {
+      const swaggerColumns = this.$swagger.specification.paths[this.url].get.responses["200"].content['application/json'].schema.properties.items.items.properties
+      swaggerColumns.forEach(item => {
+        const tempItem = this.tableData.columns.find((e) => e.prop == item.prop)
+        tempItem ? tempItem = { ...item, ...tempItem } : this.tableData.columns.push(item)
+      })
+
+      // 一定加上selection,通过show显示隐藏
+      const itemSelection = this.tableData.columns.find((item) => item.type == "selection");
+      const hasSelection = this.tableData.options.selection;
+      if (itemSelection) {
+        itemSelection.show = !!hasSelection;
+      } else {
+        this.tableData.columns.unshift({
+          label: "",
+          minWidth: "",
+          type: "selection",
+          show: !!hasSelection,
+        });
+      }
+    },
     radioChange() {
       this.$emit("radioChange", this.twinPage);
     },