ol-base-components 3.3.5 → 3.3.7

package/package.json

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

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

@@ -1,10 +1,13 @@
 <template>
   <ol-search
+    :key="key"
     :form-search-data="formSearchData"
-    @onSave="onSave"
+    isCustoms
     v-bind="$attrs"
+    @onSave="onSave"
+    method="post"
     v-on="$listeners"
-    :key="key"
+    ref="customSearchRef"
   />
 </template>
 
@@ -78,15 +81,15 @@ export default {
         if (res.code !== 200) return;
         const configList = res.result.settingJson ? JSON.parse(res.result.settingJson) : [];
         this.$set(this.formSearchData, "tableSearch", configList);
-        this.$nextTick(() => {
-          this.key++;
-        });
+        this.$refs.customSearchRef.init();
+        // this.$nextTick(() => {
+        //   this.key++;
+        // });
       });
     },
     //保存
     onSave(configList) {
       const targetMenuId = this.menuId || (this.currentPageItem && this.currentPageItem.id);
-
       this.post({
         url: `/api/app/menu-search-setting`,
         data: {

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

@@ -281,6 +281,15 @@ export default {
       type: Function,
       default: null,
     },
+    isCustoms: {
+      type: Boolean,
+      default: false,
+    },
+    // 请求方式 post get
+    method: {
+      type: String,
+      default: "get",
+    },
   },
   data() {
     return {
@@ -323,13 +332,9 @@ export default {
   },
   methods: {
     async init() {
-      if (
-        !this.formSearchData ||
-        !this.formSearchData.customs ||
-        !this.formSearchData.customs.length
-      ) {
+      if (!this.isCustoms) {
         const swaggerData = await getData();
-        let swaggersearchColumns = swaggerData.paths[this.url].get.parameters || [];
+        let swaggersearchColumns = swaggerData.paths[this.url][this.method].parameters || [];
         if (typeof this.onSwagger === "function") {
           try {
             const res = await this.onSwagger({ columns: swaggersearchColumns });
@@ -496,12 +501,7 @@ export default {
       const filterConditions = [];
       Object.keys(formSearch).forEach(key => {
         const tempItem = this.formSearchData.tableSearch.find(item => item.value === key);
-        if (
-          formSearch[key] !== undefined &&
-          formSearch[key] !== null &&
-          formSearch[key] !== "" &&
-          formSearch[key] != []
-        ) {
+        if (formSearch[key] !== undefined && formSearch[key] !== null && formSearch[key] !== "") {
           filterConditions.push({
             key: key,
             values: Array.isArray(formSearch[key]) ? formSearch[key] : [formSearch[key]], //必须包数组，后端会统一处理
@@ -513,11 +513,7 @@ export default {
     },
     // 搜索查询按钮
     handleSearch(formName, item) {
-      if (
-        !this.formSearchData ||
-        !this.formSearchData.customs ||
-        !this.formSearchData.customs.length
-      ) {
+      if (!this.isCustoms) {
         if (this.formSearch.createdTime) {
           this.formSearch.BeginTime = this.formSearch.createdTime[0];
           this.formSearch.EndTime = this.formSearch.createdTime[1];

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

@@ -22,6 +22,10 @@ export default {
       type: String,
       default: "",
     },
+    printData: {
+      type: [Object, Array],
+      default: () => {},
+    },
   },
   data() {
     return {
@@ -75,8 +79,19 @@ export default {
       if (!Array.isArray(this.templateList)) return;
       const tempItem = this.templateList.find(item => item.id === command);
       if (!tempItem) return this.$message.error("未找到打印模板");
+
+      const data = this.printData;
+      const isValidData =
+        data &&
+        ((Array.isArray(data) && data.length > 0) ||
+          (typeof data === "object" && Object.keys(data).length > 0));
+
+      if (!isValidData) {
+        return this.$message.error("打印数据不能为空");
+      }
+
       this.$hiprint.print({
-        printData: this.tableData?.printData || {},
+        printData: data,
         defaultTemplate: tempItem.templeteJson ? JSON.parse(tempItem.templeteJson) : {},
       });
     },

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

@@ -65,7 +65,7 @@
           >
             <div class="avatar-wrapper">
               <div class="layui-table-tool-self">
-                <print-template-selector :menuId="menuId" />
+                <print-template-selector :menuId="menuId" :printData="tableData.printData" />
               </div>
             </div>
           </div>
@@ -440,6 +440,11 @@ export default {
       type: Function,
       default: null,
     },
+    // 请求方式 post get
+    method: {
+      type: String,
+      default: "get",
+    },
   },
 
   data() {
@@ -497,8 +502,8 @@ export default {
       getData()
         .then(async swaggerData => {
           let swaggerColumns =
-            swaggerData.paths[this.url].get.responses["200"].content["application/json"].schema
-              .properties.items.items.properties;
+            swaggerData.paths[this.url][this.method].responses["200"].content["application/json"]
+              .schema.properties.items.items.properties;
           if (typeof this.onSwagger === "function") {
             try {
               const res = await this.onSwagger({ columns: swaggerColumns });