ol-base-components 3.3.11 → 3.4.1

package/package.json

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

package/src/App.vue

@@ -26,6 +26,7 @@
       @SelectionChange="SelectionChange"
       @handleSizeChange="handleSizeChange"
       @handleindexChange="handleindexChange"
+      :onPrintData="onPrintData"
     >
       <template slot="ceshi" slot-scope="scope">
         <span>333433{{ scope.row.ceshi }}</span>
@@ -67,6 +68,7 @@ export default {
           headTool: true, // 开启头部工具栏
           refreshBtn: true, // 开启表格头部刷新按钮
           downloadBtn: true, // 开启表格头部下载按钮
+          // smartPrintBtn: false,
         }, // 序号和复选框
         rows: [
           {
@@ -124,6 +126,10 @@ export default {
         ],
         operates: [], // 表格里面的操作按钮
         tableHeightDiff: 300,
+        printData: {
+          name: "默认数据",
+          table: [{ name: "默认数据1" }],
+        },
       },
       paginations: {
         page: 1, // 当前位于那页面
@@ -822,6 +828,27 @@ export default {
     handlePrint1(row) {
       console.log(11122333, row);
     },
+    onPrintData(tempItem, done) {
+      console.log("111app", tempItem, done);
+      if (tempItem.templeteName === "自定义模式") {
+        // 模拟异步接口请求
+        const data = {
+          name: "自定义模式",
+          table: [
+            { name: "2233" },
+            { name: "3344" },
+            { name: "2233" },
+            { name: "2233" },
+            { name: "2233" },
+            { name: "2233" },
+            { name: "2233" },
+            { name: "2233" },
+            { name: "2233" },
+          ],
+        };
+        done(data);
+      }
+    },
   },
 };
 </script>

package/src/assets/icon/printModel.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="1775783951523" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4933" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M947.257271 1024H76.742729A35.794183 35.794183 0 0 1 40.948546 988.205817V35.794183A35.794183 35.794183 0 0 1 76.742729 0h870.514542a35.794183 35.794183 0 0 1 35.794183 35.794183v952.411634a35.794183 35.794183 0 0 1-35.794183 35.794183zM112.536913 952.411633h798.926174V71.588367H112.536913z" fill="#545454" p-id="4934"></path><path d="M298.666667 895.14094A35.794183 35.794183 0 0 1 261.440716 859.060403V437.261745a35.794183 35.794183 0 0 1 71.588367 0V859.060403A35.794183 35.794183 0 0 1 298.666667 895.14094zM726.192394 508.563758H470.478747a35.794183 35.794183 0 0 1 0-71.588367h257.718121a35.794183 35.794183 0 0 1 0 71.588367zM730.774049 293.798658H279.480984a35.794183 35.794183 0 0 1 0-71.588367h451.293065a35.794183 35.794183 0 0 1 0 71.588367zM726.192394 684.098434H470.478747a35.794183 35.794183 0 1 1 0-71.588367h257.718121a35.794183 35.794183 0 0 1 0 71.588367zM726.192394 852.187919H470.478747a35.794183 35.794183 0 0 1 0-71.588366h257.718121a35.794183 35.794183 0 0 1 0 71.588366z" fill="#545454" p-id="4935"></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", isSmartPrint: true });
+Vue.use(OlCom, { method: "post", smartPrintBtn: true });
 swaggerInstall("http://220.179.249.140:20025/swagger/v1/swagger.json").then(() => {});
 new Vue({
   render: h => h(App),

package/src/package/formSearch/src/components/SearchConfigDialog.vue

@@ -456,6 +456,12 @@ export default {
       for (const item of this.configList) {
         if (item.inputType === "select" && item.optionSource) {
           await this.loadItemOptionsForSave(item);
+          // 如果是“包含于”则，下拉框多选
+          if (item.compare === "in") {
+            item.props.multiple = true;
+          } else {
+            delete item.props.multiple;
+          }
         }
       }
       this.$emit("save", this.configList);

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

@@ -124,7 +124,6 @@ export default {
       // eslint-disable-next-line no-undef
       $("#hiprint-printTemplate").empty(); // 先清空, 避免重复构建
 
-
       this.hiprintTemplate = new hiprint.PrintTemplate({
         template: this.defaultTemplate,
         settingContainer: "#PrintElementOptionSetting",
@@ -152,9 +151,8 @@ export default {
       if (this.onPrintData) {
         try {
           const result = await this.onPrintData(this.printData);
-          if (result) {
-            data = result;
-          }
+          if (result) data = result;
+          else console.error("onPrintData 执行失败，返回数据为空");
         } catch (error) {
           console.error("onPrintData 执行失败:", error);
         }
@@ -171,10 +169,10 @@ export default {
         //   return "<style>.hiprint-printElement-text{color:red !important;}</style>";
         // },
       };
-      
+
       // 使用 props 传入的纸张大小
       ext.curPaper = this.paperSize;
-      
+
       // 调用浏览器打印
       this.hiprintTemplate.print(data, options, ext);
     },

package/src/package/printModel/src/index.vue

@@ -33,6 +33,10 @@
               <span class="card-title">{{ template.templeteName }}</span>
             </div>
             <div class="card-body">
+              <div class="card-info">
+                <span class="info-label">数据源URL：</span>
+                <span class="info-value">{{ template.sourceUrl || "无" }}</span>
+              </div>
               <div class="card-info">
                 <span class="info-label">备注：</span>
                 <span class="info-value">{{ template.remark || "无" }}</span>
@@ -66,6 +70,17 @@
           <el-form-item label="模板名称" prop="templeteName">
             <el-input v-model="form.templeteName" placeholder="请输入模板名称"></el-input>
           </el-form-item>
+          <el-form-item label="创建模板" prop="templeteJson">
+            <span style="margin-right: 10px">{{ form.templeteJson ? "已创建" : "未创建" }}</span>
+            <el-button type="primary" @click="handleCreateTemplate">创建模板</el-button>
+          </el-form-item>
+          <el-form-item label="数据源URL" prop="sourceUrl">
+            <el-input
+              v-model="form.sourceUrl"
+              placeholder="请输入数据源URL"
+              @blur="form.sourceUrl = form.sourceUrl && form.sourceUrl.trim()"
+            ></el-input>
+          </el-form-item>
           <el-form-item label="备注">
             <el-input
               v-model="form.remark"
@@ -74,10 +89,6 @@
               placeholder="请输入备注"
             ></el-input>
           </el-form-item>
-          <el-form-item label="创建模板">
-            <span style="margin-right: 10px">{{ form.templeteJson ? "已创建" : "未创建" }}</span>
-            <el-button type="primary" @click="handleCreateTemplate">创建模板</el-button>
-          </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取消</el-button>
@@ -109,9 +120,11 @@ export default {
         templeteName: "",
         remark: "",
         templeteJson: "",
+        sourceUrl: "",
       },
       rules: {
         templeteName: [{ required: true, message: "请输入模板名称", trigger: "blur" }],
+        templeteJson: [{ required: true, message: "请输入模板JSON", trigger: "blur" }],
       },
     };
   },
@@ -179,6 +192,7 @@ export default {
         templeteName: "",
         remark: "",
         templeteJson: "",
+        sourceUrl: "",
       };
       this.dialogVisible = true;
       this.$nextTick(() => {
@@ -192,6 +206,7 @@ export default {
         templeteName: template.templeteName,
         remark: template.remark,
         templeteJson: template.templeteJson,
+        sourceUrl: template.sourceUrl || "",
       };
       this.dialogVisible = true;
     },
@@ -225,6 +240,7 @@ export default {
                   id: this.form.id,
                   templeteName: this.form.templeteName,
                   templeteJson: this.form.templeteJson,
+                  sourceUrl: this.form.sourceUrl,
                 },
               });
               this.$message.success("编辑成功");
@@ -235,6 +251,7 @@ export default {
                   menuId: this.currentMenuId,
                   templeteName: this.form.templeteName,
                   templeteJson: this.form.templeteJson,
+                  sourceUrl: this.form.sourceUrl,
                 },
               });
               this.$message.success("新增成功");

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

@@ -1,7 +1,7 @@
 <template>
   <el-dropdown @command="handleCommand" trigger="click">
     <img
-      src="../../../../assets/print.svg"
+      src="../../../../assets/icon/printModel.svg"
       alt="print"
       style="width: 14px; height: 14px; cursor: pointer"
     />
@@ -30,10 +30,45 @@ export default {
       type: [Object, Array],
       default: () => {},
     },
+    // 自定义获取打印数据函数，没传递就是默认接口获取数据。return的数据就是打印数据
+    onPrintData: {
+      type: Function,
+      default: null,
+    },
+    multipleSelection: {
+      type: Array,
+      default: () => [],
+    },
   },
   data() {
     return {
       templateList: [{ id: 1, templeteName: "暂无数据", disabled: true }],
+      // templateList: [
+      //   {
+      //     id: 1,
+      //     templeteName: "自定义模式",
+      //     remark: "",
+      //     templeteJson:
+      //       '{"panels":[{"index":0,"name":1,"paperType":"A4","height":297,"width":210,"paperHeader":0,"paperFooter":841.8897637795277,"printElements":[{"options":{"left":67.5,"top":165,"height":36,"width":550,"fields":[],"field":"table","qid":"table","columns":[[{"width":137.5,"title":"名称","field":"name","checked":true,"columnId":"name","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"性别","field":"gender","checked":true,"columnId":"gender","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"数量","field":"count","checked":true,"columnId":"count","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"金额","field":"amount","checked":true,"columnId":"amount","fixed":false,"rowspan":1,"colspan":1,"align":"center"}]]},"printElementType":{"title":"表格","type":"table","editable":true,"columnDisplayEditable":true,"columnDisplayIndexEditable":true,"columnTitleEditable":true,"columnResizable":true,"columnAlignEditable":true,"isEnableEditField":true,"isEnableContextMenu":true,"isEnableInsertRow":true,"isEnableDeleteRow":true,"isEnableInsertColumn":true,"isEnableDeleteColumn":true,"isEnableMergeCell":true}},{"options":{"left":127.5,"top":301.5,"height":9.75,"width":120,"field":"name","testData":"内容","title":"文本","qid":"name"},"printElementType":{"title":"文本","type":"text"}}],"paperNumberContinue":true,"watermarkOptions":{},"panelLayoutOptions":{}}]}',
+      //     sourceUrl: "api/app/aaa",
+      //   },
+      //   {
+      //     id: 2,
+      //     templeteName: "sourceUrl模式",
+      //     remark: "",
+      //     templeteJson:
+      //       '{"panels":[{"index":0,"name":1,"paperType":"A4","height":297,"width":210,"paperHeader":0,"paperFooter":841.8897637795277,"printElements":[{"options":{"left":67.5,"top":229.5,"height":36,"width":550,"fields":[],"field":"table","qid":"table","columns":[[{"width":137.5,"title":"名称","field":"name","checked":true,"columnId":"name","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"性别","field":"gender","checked":true,"columnId":"gender","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"数量","field":"count","checked":true,"columnId":"count","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"金额","field":"amount","checked":true,"columnId":"amount","fixed":false,"rowspan":1,"colspan":1,"align":"center"}]]},"printElementType":{"title":"表格","type":"table","editable":true,"columnDisplayEditable":true,"columnDisplayIndexEditable":true,"columnTitleEditable":true,"columnResizable":true,"columnAlignEditable":true,"isEnableEditField":true,"isEnableContextMenu":true,"isEnableInsertRow":true,"isEnableDeleteRow":true,"isEnableInsertColumn":true,"isEnableDeleteColumn":true,"isEnableMergeCell":true}},{"options":{"left":247.5,"top":304.5,"height":9.75,"width":120,"field":"name","testData":"内容","title":"文本","qid":"name"},"printElementType":{"title":"文本","type":"text"}},{"options":{"left":79.5,"top":313.5,"height":32,"width":120,"field":"qrcode","testData":"XS888888888","fontSize":12,"lineHeight":18,"textType":"qrcode","title":"二维码","qid":"qrcode"},"printElementType":{"title":"二维码","type":"text"}}],"paperNumberContinue":true,"watermarkOptions":{},"panelLayoutOptions":{}}]}',
+      //     sourceUrl: "api/app/bbb",
+      //   },
+      //   {
+      //     id: 3,
+      //     templeteName: "默认模式",
+      //     remark: "",
+      //     templeteJson:
+      //       '{"panels":[{"index":0,"name":1,"paperType":"A4","height":297,"width":210,"paperHeader":0,"paperFooter":841.8897637795277,"printElements":[{"options":{"left":67.5,"top":229.5,"height":36,"width":550,"fields":[],"field":"table","qid":"table","columns":[[{"width":137.5,"title":"名称","field":"name","checked":true,"columnId":"name","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"性别","field":"gender","checked":true,"columnId":"gender","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"数量","field":"count","checked":true,"columnId":"count","fixed":false,"rowspan":1,"colspan":1,"align":"center"},{"width":137.5,"title":"金额","field":"amount","checked":true,"columnId":"amount","fixed":false,"rowspan":1,"colspan":1,"align":"center"}]]},"printElementType":{"title":"表格","type":"table","editable":true,"columnDisplayEditable":true,"columnDisplayIndexEditable":true,"columnTitleEditable":true,"columnResizable":true,"columnAlignEditable":true,"isEnableEditField":true,"isEnableContextMenu":true,"isEnableInsertRow":true,"isEnableDeleteRow":true,"isEnableInsertColumn":true,"isEnableDeleteColumn":true,"isEnableMergeCell":true}},{"options":{"left":247.5,"top":304.5,"height":9.75,"width":120,"field":"name","testData":"内容","title":"文本","qid":"name"},"printElementType":{"title":"文本","type":"text"}},{"options":{"left":79.5,"top":313.5,"height":32,"width":120,"field":"qrcode","testData":"XS888888888","fontSize":12,"lineHeight":18,"textType":"qrcode","title":"二维码","qid":"qrcode"},"printElementType":{"title":"二维码","type":"text"}}],"paperNumberContinue":true,"watermarkOptions":{},"panelLayoutOptions":{}}]}',
+      //     sourceUrl: "",
+      //   },
+      // ],
     };
   },
   created() {
@@ -84,20 +119,85 @@ export default {
       const tempItem = this.templateList.find(item => item.id === command);
       if (!tempItem) return this.$message.error("未找到打印模板");
 
-      const data = this.printData;
+      const options = {
+        printData: this.printData || {},
+        defaultTemplate: tempItem.templeteJson ? JSON.parse(tempItem.templeteJson) : {},
+      };
+
+      // 自定义打印 > 默认接口打印 >  printData数据打印
+      if (this.onPrintData) {
+        // 自定义数据 - 类似 Element UI before-close 机制
+        let isCustomHandled = false;
+        // 定义 done 函数
+        const done = data => {
+          isCustomHandled = true;
+          if (data) {
+            options.printData = data;
+            this.$hiprint.print(options);
+          } else {
+            this.$message.error("打印数据不能为空");
+          }
+        };
+
+        // 调用自定义回调，传入模板信息和 done 函数
+        this.onPrintData(tempItem, done);
+
+        // 如果自定义回调没有调用 done，则走默认逻辑
+        if (!isCustomHandled) {
+          if (tempItem.sourceUrl) {
+            this.printByApi(options, tempItem);
+          } else {
+            // 没有自定义回调，走默认逻辑
+            options.printData = this.printData || {};
+            this.$hiprint.print(options);
+          }
+        }
+      } else if (tempItem.sourceUrl) {
+        this.printByApi(options, tempItem);
+      } else {
+        this.printDefault(options);
+      }
+    },
+    printByApi(options, tempItem) {
+      // 默认接口数据
+      options.printData = this.getPrintDataByApi(tempItem);
       const isValidData =
-        data &&
-        ((Array.isArray(data) && data.length > 0) ||
-          (typeof data === "object" && Object.keys(data).length > 0));
+        options.printData &&
+        ((Array.isArray(options.printData) && options.printData.length > 0) ||
+          (typeof options.printData === "object" && Object.keys(options.printData).length > 0));
 
       if (!isValidData) {
         return this.$message.error("打印数据不能为空");
       }
-
-      this.$hiprint.print({
-        printData: data,
-        defaultTemplate: tempItem.templeteJson ? JSON.parse(tempItem.templeteJson) : {},
-      });
+      this.$hiprint.print(options);
+    },
+    printDefault(options) {
+      // 默认接口数据
+      options.printData = this.printData || {};
+      this.$hiprint.print(options);
+    },
+    // 默认接口获取数据
+    async getPrintDataByApi(tempItem) {
+      try {
+        let ids = [];
+        if (this.multipleSelection && this.multipleSelection.length > 0) {
+          ids = this.multipleSelection.reduce((acc, item) => {
+            acc.push(item.id);
+            return acc;
+          }, []);
+        }
+        const res = await this.get({
+          url: `${tempItem.sourceUrl}`,
+          data: {
+            ids: ids,
+          },
+        });
+        if (res.code !== 200) return {};
+        if (Array.isArray(res.result) && res.result.length > 0) return res.result;
+        return {};
+      } catch (error) {
+        console.error(`获取打印数据失败: ${tempItem.sourceUrl}`, error);
+      }
     },
   },
 };

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

@@ -68,7 +68,7 @@
             </div>
           </div>
           <div
-            v-if="tableData.options.downloadBtn && !isSmartPrintComputed"
+            v-if="tableData.options.downloadBtn"
             class="avatar-container right-menu-item hover-effect el-dropdown"
             @click="printTable"
           >
@@ -79,12 +79,17 @@
             </div>
           </div>
           <div
-            v-if="isSmartPrintComputed"
+            v-if="isSmartPrintBtn"
             class="avatar-container right-menu-item hover-effect el-dropdown"
           >
             <div class="avatar-wrapper">
               <div class="layui-table-tool-self">
-                <print-template-selector :menuId="menuId" :printData="tableData.printData" />
+                <print-template-selector
+                  :menuId="menuId"
+                  :printData="tableData.printData"
+                  :multipleSelection="multipleSelection"
+                  v-bind="$attrs"
+                />
               </div>
             </div>
           </div>
@@ -415,6 +420,7 @@ export default {
             headTool: true, // 开启头部工具栏
             refreshBtn: true, // 开启表格头部刷新按钮
             downloadBtn: true, // 开启表格头部下载按钮
+            // smartPrintBtn: false,// 是否启用智能打印,字段不存在时候用全局配置
           }, // 序号和复选框
           rows: [], // 表数据
           columns: [], // 表头
@@ -471,11 +477,6 @@ export default {
     method: {
       type: String,
     },
-    // 是否启用智能打印
-    isSmartPrint: {
-      type: Boolean,
-      default: null,
-    },
   },
 
   data() {
@@ -522,11 +523,12 @@ export default {
     finalMethod() {
       return this.method || (this.$olBaseConfig && this.$olBaseConfig.method) || "get";
     },
-    isSmartPrintComputed() {
-      if (this.isSmartPrint !== null) {
-        return this.isSmartPrint;
+    isSmartPrintBtn() {
+      const hasKey = Object.keys(this.tableData.options).includes("smartPrintBtn");
+      if (hasKey) {
+        return !!this.tableData.options.smartPrintBtn;
       }
-      return (this.$olBaseConfig && this.$olBaseConfig.isSmartPrint) || false;
+      return (this.$olBaseConfig && this.$olBaseConfig.smartPrintBtn) || false;
     },
   },
   created() {