ol-base-components 3.4.0 → 3.4.2

package/package.json

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

package/src/App.vue

@@ -5,6 +5,7 @@
       :form-search-data="formSearchData"
       @handleSearch="handleSearch"
       :dragable="false"
+      @onSave="save"
     ></ol-customSearch>
     =========
     <!-- <div>table组件案例</div> -->
@@ -68,6 +69,7 @@ export default {
           headTool: true, // 开启头部工具栏
           refreshBtn: true, // 开启表格头部刷新按钮
           downloadBtn: true, // 开启表格头部下载按钮
+          // smartPrintBtn: false,
         }, // 序号和复选框
         rows: [
           {
@@ -848,6 +850,11 @@ export default {
         done(data);
       }
     },
+    save(e) {
+      console.log(123, e);
+
+      // this.formSearchData.value.usageStatus = null;
+    },
   },
 };
 </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

@@ -342,6 +342,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    formSearchData: {
+      type: Object,
+      default: () => {},
+    },
+    formSearch: {
+      type: Object,
+      default: () => {},
+    },
     tableSearch: {
       type: Array,
       default: () => [],
@@ -396,6 +404,8 @@ export default {
   },
   created() {
     this.loadAllDictList();
+    // 重置数据
+    this.setArrVModelReset();
   },
   watch: {
     visible: {
@@ -456,6 +466,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);
@@ -870,6 +886,16 @@ export default {
       this.configList.push(newItem);
       this.customsDialogVisible = false;
     },
+    // 处理数组和非数组的双向绑定值, 例如：下拉框和日期选择器切换成多选下拉框时间范围时候 双向绑定的值的类型要改变。this.formSearch是实际双向绑定的值
+    setArrVModelReset() {
+      this.tableSearch.forEach(item => {
+        const { value: key, inputType } = item;
+        if (!Object.keys(this.formSearch).includes(key)) return;
+        if (!(inputType === "select" || inputType === "picker")) return; //只有下拉框和日期选择器会有 双向绑定数组
+        delete this.formSearchData.value[key];
+        delete this.formSearch[key];
+      });
+    },
   },
 };
 </script>

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

@@ -14,6 +14,7 @@
         v-bind="{
           ...(formSearchData.options && formSearchData.options.formProps),
         }"
+        :key="key"
       >
         <!-- 'label-width': '100px', -->
         <div
@@ -179,6 +180,8 @@
       v-if="configDialogVisible"
       :visible.sync="configDialogVisible"
       :table-search="formSearchData.tableSearch"
+      :formSearchData="formSearchData"
+      :formSearch="formSearch"
       :customs="formSearchData.customs"
       @save="handleSaveConfig"
       v-bind="$attrs"
@@ -306,6 +309,7 @@ export default {
       },
       tempBoxData: [],
       optionBox: [],
+      key: 0,
     };
   },
   async created() {
@@ -601,11 +605,15 @@ export default {
       this.configDialogVisible = true;
     },
     handleSaveConfig(configList) {
+      if (this.isCustomSearch) {
+        this.key++; // 下拉框多选时候高度被撑开，改成单选时候高度无法重置。所以重写渲染。这里不管直接全都重写渲染
+      }
       this.formSearchData.tableSearch = configList;
       this.findTableSearch =
         this.formSearchData.tableSearch.length > this.tableSearchSlice
           ? this.formSearchData.tableSearch.slice(0, this.tableSearchSlice)
           : this.formSearchData.tableSearch;
+
       this.$emit("onSave", configList);
     },
     async loadOptionSources() {

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

@@ -34,12 +34,12 @@
             </div>
             <div class="card-body">
               <div class="card-info">
-                <span class="info-label">备注：</span>
-                <span class="info-value">{{ template.remark || "无" }}</span>
+                <span class="info-label">数据源URL：</span>
+                <span class="info-value">{{ template.sourceUrl || "无" }}</span>
               </div>
               <div class="card-info">
-                <span class="info-label">数据源URL：</span>
-                <span class="info-value">{{ template.printUrl || "无" }}</span>
+                <span class="info-label">备注：</span>
+                <span class="info-value">{{ template.remark || "无" }}</span>
               </div>
             </div>
             <div class="card-footer">
@@ -74,11 +74,11 @@
             <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="printUrl">
+          <el-form-item label="数据源URL" prop="sourceUrl">
             <el-input
-              v-model="form.printUrl"
+              v-model="form.sourceUrl"
               placeholder="请输入数据源URL"
-              @blur="form.printUrl = form.printUrl && form.printUrl.trim()"
+              @blur="form.sourceUrl = form.sourceUrl && form.sourceUrl.trim()"
             ></el-input>
           </el-form-item>
           <el-form-item label="备注">
@@ -120,7 +120,7 @@ export default {
         templeteName: "",
         remark: "",
         templeteJson: "",
-        printUrl: "",
+        sourceUrl: "",
       },
       rules: {
         templeteName: [{ required: true, message: "请输入模板名称", trigger: "blur" }],
@@ -192,7 +192,7 @@ export default {
         templeteName: "",
         remark: "",
         templeteJson: "",
-        printUrl: "",
+        sourceUrl: "",
       };
       this.dialogVisible = true;
       this.$nextTick(() => {
@@ -206,7 +206,7 @@ export default {
         templeteName: template.templeteName,
         remark: template.remark,
         templeteJson: template.templeteJson,
-        printUrl: template.printUrl || "",
+        sourceUrl: template.sourceUrl || "",
       };
       this.dialogVisible = true;
     },
@@ -240,7 +240,7 @@ export default {
                   id: this.form.id,
                   templeteName: this.form.templeteName,
                   templeteJson: this.form.templeteJson,
-                  printUrl: this.form.printUrl,
+                  sourceUrl: this.form.sourceUrl,
                 },
               });
               this.$message.success("编辑成功");
@@ -251,7 +251,7 @@ export default {
                   menuId: this.currentMenuId,
                   templeteName: this.form.templeteName,
                   templeteJson: this.form.templeteJson,
-                  printUrl: this.form.printUrl,
+                  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"
     />
@@ -50,15 +50,15 @@ export default {
       //     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":{}}]}',
-      //     printUrl: "api/app/aaa",
+      //     sourceUrl: "api/app/aaa",
       //   },
       //   {
       //     id: 2,
-      //     templeteName: "printURL模式",
+      //     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":{}}]}',
-      //     printUrl: "api/app/bbb",
+      //     sourceUrl: "api/app/bbb",
       //   },
       //   {
       //     id: 3,
@@ -66,7 +66,7 @@ export default {
       //     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":{}}]}',
-      //     printUrl: "",
+      //     sourceUrl: "",
       //   },
       // ],
     };
@@ -144,7 +144,7 @@ export default {
 
         // 如果自定义回调没有调用 done，则走默认逻辑
         if (!isCustomHandled) {
-          if (tempItem.printUrl) {
+          if (tempItem.sourceUrl) {
             this.printByApi(options, tempItem);
           } else {
             // 没有自定义回调，走默认逻辑
@@ -152,7 +152,7 @@ export default {
             this.$hiprint.print(options);
           }
         }
-      } else if (tempItem.printUrl) {
+      } else if (tempItem.sourceUrl) {
         this.printByApi(options, tempItem);
       } else {
         this.printDefault(options);
@@ -187,7 +187,7 @@ export default {
           }, []);
         }
         const res = await this.get({
-          url: `${tempItem.printUrl}`,
+          url: `${tempItem.sourceUrl}`,
           data: {
             ids: ids,
           },
@@ -196,7 +196,7 @@ export default {
         if (Array.isArray(res.result) && res.result.length > 0) return res.result;
         return {};
       } catch (error) {
-        console.error(`获取打印数据失败: ${tempItem.printUrl}`, 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,7 +79,7 @@
             </div>
           </div>
           <div
-            v-if="isSmartPrintComputed"
+            v-if="isSmartPrintBtn"
             class="avatar-container right-menu-item hover-effect el-dropdown"
           >
             <div class="avatar-wrapper">
@@ -420,6 +420,7 @@ export default {
             headTool: true, // 开启头部工具栏
             refreshBtn: true, // 开启表格头部刷新按钮
             downloadBtn: true, // 开启表格头部下载按钮
+            // smartPrintBtn: false,// 是否启用智能打印,字段不存在时候用全局配置
           }, // 序号和复选框
           rows: [], // 表数据
           columns: [], // 表头
@@ -476,11 +477,6 @@ export default {
     method: {
       type: String,
     },
-    // 是否启用智能打印
-    isSmartPrint: {
-      type: Boolean,
-      default: null,
-    },
   },
 
   data() {
@@ -527,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() {