ol-base-components 3.3.9 → 3.3.11

package/package.json

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

package/src/App.vue

@@ -30,6 +30,9 @@
       <template slot="ceshi" slot-scope="scope">
         <span>333433{{ scope.row.ceshi }}</span>
       </template>
+      <template slot="toolbox-before" slot-scope="scope">
+        <el-button type="primary" size="mini" @click="handlePrint1(scope)">打印</el-button>
+      </template>
     </ol-table>
     <!-- <el-button @click="handlePrint">接口</el-button>
     <el-button @click="onAdd">新建</el-button>
@@ -142,25 +145,25 @@ export default {
           // range: [10, 200],
         },
         tableSearch1: [
-          // {
-          //   label: "数字区间",
-          //   value: "range",
-          //   inputType: "numberRange",
-          //   originalFields: {
-          //     begin: "begin123",
-          //     end: "end123",
-          //   },
-          //   listeners: {
-          //     change: e => {
-          //       const {
-          //         val: [start, end],
-          //       } = e;
-          //       this.formSearchData.value.rang1 = start;
-          //       this.formSearchData.value.rang2 = end;
-          //       console.log(this.formSearchData, e);
-          //     },
-          //   },
-          // },
+          {
+            label: "数字区间",
+            value: "range",
+            inputType: "numberRange",
+            originalFields: {
+              begin: "begin123",
+              end: "end123",
+            },
+            listeners: {
+              change: e => {
+                const {
+                  val: [start, end],
+                } = e;
+                this.formSearchData.value.rang1 = start;
+                this.formSearchData.value.rang2 = end;
+                console.log(this.formSearchData, e);
+              },
+            },
+          },
           // {
           //   label: "标签号",
           //   value: "carBodyTagNumber",
@@ -449,7 +452,6 @@ export default {
   mounted() {
     // const el = document.getElementById("ellipsis-container");
     // this.truncateMiddleByWidth(el)
-    console.log(6666, this, this.$olBaseConfig);
   },
   methods: {
     SelectionChange(row) {
@@ -679,7 +681,7 @@ export default {
           ],
         },
         onSubmit: data => {
-          console.log(6666, data);
+          // console.log(6666, data);
         },
       });
 
@@ -817,6 +819,9 @@ export default {
     saveHandler(configList) {
       console.log("保存配置", configList);
     },
+    handlePrint1(row) {
+      console.log(11122333, row);
+    },
   },
 };
 </script>

package/src/assets/print.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1775034815280" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="119811" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M910.104609 248.342329h-56.346075v-145.061172q-2.397705-45.556401-35.96558-75.527718t-77.925423-27.573611H272.314993q-20.380495 0-39.562137 7.193116t-33.567875 21.579348q-14.386232 14.386232-22.178774 33.567874t-6.59369 40.760991v145.061172h-67.135749q-21.579348-1.198853-40.76099 6.593689t-33.567875 22.178774q-14.386232 14.386232-21.579348 33.567875t-7.193116 40.76099v389.627115q-2.397705 44.357548 27.573612 77.325997t75.527717 35.366153h67.135749v62.340339q0 44.357548 31.769596 76.127143t76.127144 31.769596h467.552537q44.357548 0 76.127144-31.769596t31.769596-76.127143v-62.340339h56.346075q45.556401-2.397705 78.524849-34.766727t35.366154-77.925423v-389.627115q-2.397705-45.556401-35.96558-75.527717t-77.925423-27.573611z m-677.351753-145.061172q-1.198853-17.98279 10.789673-29.971317t28.772464-10.789674h467.552538q19.181643 0 35.366153 10.789674t16.184511 29.971317v145.061172H232.752856z m558.665339 607.818299v205.003805q0 19.181643-13.187379 32.369021t-32.369022 13.18738H278.309257q-19.181643 0-32.369022-13.18738t-13.187379-32.369021v-205.003805q0-17.98279 13.187379-31.769596t32.369022-13.786806h467.552537q19.181643 0 32.369022 13.18738t13.187379 32.369022z m170.237078-359.655799v389.627115q-1.198853 20.380495-15.585084 34.766727t-35.96558 15.585085h-56.346075v-79.124276q0-44.357548-31.769596-75.527717t-76.127144-31.17017H278.309257q-44.357548 0-76.127144 31.17017t-31.769596 75.527717v79.124276h-67.135749q-19.181643-2.397705-31.170169-17.383364t-9.590821-34.167301v-388.428262q-1.198853-17.98279 10.789674-29.971316t29.971316-10.789674h806.827841q19.181643 0 35.366153 10.789674t16.184511 29.971316z m-766.06685 52.749518h-46.755254q-4.795411-1.198853-8.391968-5.994264t-3.596558-10.190247q0-5.394837 3.596558-10.190248t8.391968-4.795411h46.755254q10.789674-2.397705 16.783937 6.59369t0 17.383364q-5.994263 8.391969-16.783937 7.193116z m111.493298 0h-50.351812q-10.789674 1.198853-16.783937-7.193116t0-17.383364q5.994263-8.991395 16.783937-6.59369h50.351812q5.994263 0 9.590821 4.795411t3.596558 10.190248q0 5.394837-3.596558 10.190247t-9.590821 5.994264z m511.910086 139.066908H195.588423q-4.795411-1.198853-8.991395-5.394837t-4.195984-10.190247q0-5.994263 4.195984-10.190248t8.991395-5.394837h623.403384q5.994263 1.198853 9.590821 5.394837t3.596558 10.190248q0 5.994263-3.596558 10.190247t-9.590821 5.394837z" p-id="119812"></path></svg>

package/src/main.js

@@ -6,7 +6,7 @@ import OlCom, { swaggerInstall, Hiprint } from "@/package/index.js";
 Vue.use(ElementUI);
 Vue.use(Hiprint);
 
-Vue.use(OlCom, { method: "post" });
+Vue.use(OlCom, { method: "post", isSmartPrint: true });
 swaggerInstall("http://220.179.249.140:20025/swagger/v1/swagger.json").then(() => {});
 new Vue({
   render: h => h(App),

package/src/package/customSearch/src/index.vue

@@ -2,10 +2,10 @@
   <ol-search
     :key="key"
     :form-search-data="formSearchData"
-    isCustoms
+    isCustomSearch
     v-bind="$attrs"
     @onSave="onSave"
-    method="post"
+    :method="finalMethod"
     v-on="$listeners"
     ref="customSearchRef"
   />
@@ -37,6 +37,10 @@ export default {
         };
       },
     },
+    // 请求方式 post get
+    method: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -50,6 +54,12 @@ export default {
       this.init();
     });
   },
+  computed: {
+    // 优先级：props > 全局配置 > 默认值
+    finalMethod() {
+      return this.method || (this.$olBaseConfig && this.$olBaseConfig.method) || "get";
+    },
+  },
   methods: {
     init() {
       const handleMenu = (arr, _this) => {

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

@@ -164,7 +164,7 @@
             {{ expend ? "收起" : "展开" }}</el-button
           >
           <el-button
-            v-if="formSearchData.customs && formSearchData.customs.length"
+            v-if="isCustomSearch"
             plain
             size="small"
             icon="el-icon-setting"
@@ -281,7 +281,7 @@ export default {
       type: Function,
       default: null,
     },
-    isCustoms: {
+    isCustomSearch: {
       type: Boolean,
       default: false,
     },
@@ -337,7 +337,7 @@ export default {
   },
   methods: {
     async init() {
-      if (!this.isCustoms && this.url) {
+      if (!this.isCustomSearch && this.url) {
         const swaggerData = await getData();
         let swaggersearchColumns = swaggerData.paths[this.url][this.finalMethod].parameters || [];
         if (typeof this.onSwagger === "function") {
@@ -518,7 +518,7 @@ export default {
     },
     // 搜索查询按钮
     handleSearch(formName, item) {
-      if (!this.isCustoms) {
+      if (!this.isCustomSearch) {
         if (this.formSearch.createdTime) {
           this.formSearch.BeginTime = this.formSearch.createdTime[0];
           this.formSearch.EndTime = this.formSearch.createdTime[1];

package/src/package/print/src/index.vue

@@ -144,7 +144,7 @@ export default {
       this.hiprintTemplate.design("#hiprint-printTemplate", {
         grid: this.grid,
       });
-      console.log(6666, this.hiprintTemplate);
+      // console.log(6666, this.hiprintTemplate);
     },
     async print() {
       // 使用外部传入的打印数据

package/src/package/table/src/components/PrintTemplateSelector.vue

@@ -1,6 +1,10 @@
 <template>
   <el-dropdown @command="handleCommand" trigger="click">
-    <i class="el-icon-printer" />
+    <img
+      src="../../../../assets/print.svg"
+      alt="print"
+      style="width: 14px; height: 14px; cursor: pointer"
+    />
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item
         v-for="(item, index) in templateList"

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

@@ -26,6 +26,14 @@
         </div>
         <!-- 右侧工具按钮 -->
         <div class="toolbox">
+          <!-- 工具按钮前插槽 -->
+          <slot
+            name="toolbox-before"
+            :tableData="tableData"
+            :multipleSelection="multipleSelection"
+            :paginations="paginations"
+            :loading="tableData.loading"
+          ></slot>
           <el-dropdown
             v-if="tableData.options.headTool"
             class="avatar-container right-menu-item hover-effect"
@@ -60,7 +68,18 @@
             </div>
           </div>
           <div
-            v-if="tableData.options.downloadBtn"
+            v-if="tableData.options.downloadBtn && !isSmartPrintComputed"
+            class="avatar-container right-menu-item hover-effect el-dropdown"
+            @click="printTable"
+          >
+            <div class="avatar-wrapper">
+              <div class="layui-table-tool-self">
+                <i class="el-icon-printer" />
+              </div>
+            </div>
+          </div>
+          <div
+            v-if="isSmartPrintComputed"
             class="avatar-container right-menu-item hover-effect el-dropdown"
           >
             <div class="avatar-wrapper">
@@ -69,6 +88,14 @@
               </div>
             </div>
           </div>
+          <!-- 工具按钮后插槽 -->
+          <slot
+            name="toolbox-after"
+            :tableData="tableData"
+            :multipleSelection="multipleSelection"
+            :paginations="paginations"
+            :loading="tableData.loading"
+          ></slot>
         </div>
       </div>
     </template>
@@ -444,6 +471,11 @@ export default {
     method: {
       type: String,
     },
+    // 是否启用智能打印
+    isSmartPrint: {
+      type: Boolean,
+      default: null,
+    },
   },
 
   data() {
@@ -490,6 +522,12 @@ export default {
     finalMethod() {
       return this.method || (this.$olBaseConfig && this.$olBaseConfig.method) || "get";
     },
+    isSmartPrintComputed() {
+      if (this.isSmartPrint !== null) {
+        return this.isSmartPrint;
+      }
+      return (this.$olBaseConfig && this.$olBaseConfig.isSmartPrint) || false;
+    },
   },
   created() {
     // 通过swagger完善columns
@@ -533,8 +571,7 @@ export default {
 
           Object.keys(swaggerColumns).forEach(key => {
             const item = swaggerColumns[key];
-            const existingColumn = this.findColumnByProp(this.tableData.columns, key);
-            if (!existingColumn && item.description) {
+            if (item.description) {
               const obj = {
                 prop: key,
                 label: item.description,
@@ -551,7 +588,8 @@ export default {
               if (item.type === "boolean") {
                 obj.prop = `${key}Text`;
               }
-              this.tableData.columns.push(obj);
+              if (!this.findColumnByProp(this.tableData.columns, obj.prop))
+                this.tableData.columns.push(obj);
             }
           });
           // 根据beforeProp排序
@@ -639,20 +677,20 @@ export default {
       });
       this.$emit("refreshTable");
     },
-    // printTable() {
-    //   console.log("printTable");
-    //   if (this.tableData.rows.length <= 0) return;
-    //   this.printListObj.title = this.$router.history.current.name;
-    //   this.printListObj.tableHeader = this.tableData.columns;
-    //   this.printListObj.tableData = this.tableData.rows;
-    //   console.log(this.printListObj);
-    //   setTimeout(() => {
-    //     $(".printTemplate").show();
-    //     $(".printTemplate").jqprint();
-    //     $(".printTemplate").hide();
-    //   }, 50);
-    //   this.$emit("printTable");
-    // },
+    printTable() {
+      console.log("printTable");
+      if (this.tableData.rows.length <= 0) return;
+      this.printListObj.title = this.$router.history.current.name;
+      this.printListObj.tableHeader = this.tableData.columns;
+      this.printListObj.tableData = this.tableData.rows;
+      console.log(this.printListObj);
+      setTimeout(() => {
+        $(".printTemplate").show();
+        $(".printTemplate").jqprint();
+        $(".printTemplate").hide();
+      }, 50);
+      this.$emit("printTable");
+    },
     selectAll(val) {
       this.$emit("selectAll", val);
     },