@tongfun/tf-widget 0.1.188 → 0.1.190

package/lib/tf-widget.common.js

@@ -261290,9 +261290,9 @@ var srcvue_type_template_id_3ae0309e_scoped_true_render = function () {var _vm=t
 var srcvue_type_template_id_3ae0309e_scoped_true_staticRenderFns = []
 
 
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/print-render.vue?vue&type=template&id=65533614&scoped=true&
-var print_rendervue_type_template_id_65533614_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"print-render",style:({width:_vm.silentMode? _vm.displayWidth.width : 'unset'})},[_c('div',{ref:"printTarget",staticClass:"print-target",style:(_vm.displayWidth)},_vm._l((_vm.data),function(receipt){return _c('div',{key:receipt.rowId,staticClass:"single-receipt",style:(_vm.displayWidth)},_vm._l((_vm.parsePages(receipt)),function(pageInfo,pageIndex){return _c('div',{key:pageIndex,staticClass:"paper-dom",style:(_vm.paperStyle)},[_vm._l((_vm.config.layout),function(container,layoutIndex){return _c('ContainerRender',{key:container.id,attrs:{"type":container.type,"property":container.property,"is-show":_vm.parseIsShow(pageIndex, container, pageInfo, layoutIndex),"widgets":container.widgets,"print-data":_vm.parsePageData(receipt, pageInfo, pageIndex, container.type)}})}),(_vm.showPage)?_c('div',{staticClass:"page-bottom",style:(_vm.pageFooter)},[_vm._v(_vm._s(pageIndex + 1)+"/"+_vm._s(pageInfo.pagesNum))]):_vm._e()],2)}),0)}),0),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.printTargetImgDisplay),expression:"printTargetImgDisplay"}],ref:"printTargetImg",staticClass:"print-target-imgs"},_vm._l((_vm.renderImgList),function(imgItem,index){return _c('div',{key:index,staticClass:"paper-img"},[_c('img',{style:({display:'block'}),attrs:{"src":imgItem,"width":"100%"}})])}),0)])}
-var print_rendervue_type_template_id_65533614_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/print-render.vue?vue&type=template&id=128af749&scoped=true&
+var print_rendervue_type_template_id_128af749_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"print-render",style:({width:_vm.silentMode? _vm.displayWidth.width : 'unset'})},[_c('div',{ref:"printTarget",staticClass:"print-target",style:(_vm.displayWidth)},_vm._l((_vm.data),function(receipt){return _c('div',{key:receipt.rowId,staticClass:"single-receipt",style:(_vm.displayWidth)},_vm._l((_vm.parsePages(receipt)),function(pageInfo,pageIndex){return _c('div',{key:pageIndex,staticClass:"paper-dom",style:(_vm.paperStyle)},[_vm._l((_vm.config.layout),function(container,layoutIndex){return _c('ContainerRender',{key:container.id,attrs:{"type":container.type,"property":container.property,"is-show":_vm.parseIsShow(pageIndex, container, pageInfo, layoutIndex),"widgets":container.widgets,"print-data":_vm.parsePageData(receipt, pageInfo, pageIndex, container.type)}})}),(_vm.showPage)?_c('div',{staticClass:"page-bottom",style:(_vm.pageFooter)},[_vm._v(_vm._s(pageIndex + 1)+"/"+_vm._s(pageInfo.pagesNum))]):_vm._e()],2)}),0)}),0),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.printTargetImgDisplay),expression:"printTargetImgDisplay"}],ref:"printTargetImg",staticClass:"print-target-imgs"},_vm._l((_vm.renderImgList),function(imgItem,index){return _c('div',{key:index,staticClass:"paper-img"},[_c('img',{style:({display:'block'}),attrs:{"src":imgItem,"width":"100%"}})])}),0)])}
+var print_rendervue_type_template_id_128af749_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/index.vue?vue&type=template&id=8947ad5a&scoped=true&
@@ -261530,9 +261530,9 @@ var widget_text_render_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var widget_text_render = (widget_text_render_component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=template&id=06acdf83&scoped=true&
-var widget_img_rendervue_type_template_id_06acdf83_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"widget-img-render"},[_c('el-image',{style:(_vm.imgStyle),attrs:{"src":_vm.displayUrl,"fit":'cover'}})],1)}
-var widget_img_rendervue_type_template_id_06acdf83_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=template&id=f9ef82c0&scoped=true&
+var widget_img_rendervue_type_template_id_f9ef82c0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"widget-img-render"},[_c('el-image',{style:(_vm.imgStyle),attrs:{"src":_vm.displayUrl,"fit":'contain'}})],1)}
+var widget_img_rendervue_type_template_id_f9ef82c0_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=script&lang=js&
@@ -261579,10 +261579,10 @@ var widget_img_rendervue_type_template_id_06acdf83_scoped_true_staticRenderFns =
 });
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=script&lang=js&
  /* harmony default export */ var widget_widget_img_rendervue_type_script_lang_js_ = (widget_img_rendervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=style&index=0&id=06acdf83&prod&scoped=true&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=style&index=0&id=f9ef82c0&prod&scoped=true&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=style&index=0&id=06acdf83&prod&scoped=true&lang=less&
+;// CONCATENATED MODULE: ./package/tf-print-render/src/widget/widget-img-render.vue?vue&type=style&index=0&id=f9ef82c0&prod&scoped=true&lang=less&
 
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/widget/widget-img-render.vue
 
@@ -261595,11 +261595,11 @@ var widget_img_rendervue_type_template_id_06acdf83_scoped_true_staticRenderFns =
 
 var widget_img_render_component = (0,componentNormalizer/* default */.Z)(
   widget_widget_img_rendervue_type_script_lang_js_,
-  widget_img_rendervue_type_template_id_06acdf83_scoped_true_render,
-  widget_img_rendervue_type_template_id_06acdf83_scoped_true_staticRenderFns,
+  widget_img_rendervue_type_template_id_f9ef82c0_scoped_true_render,
+  widget_img_rendervue_type_template_id_f9ef82c0_scoped_true_staticRenderFns,
   false,
   null,
-  "06acdf83",
+  "f9ef82c0",
   null
   
 )
@@ -261968,9 +261968,9 @@ var container_table_render_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var container_table_render = (container_table_render_component.exports);
-;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/container-grid-render.vue?vue&type=template&id=37377d22&scoped=true&
-var container_grid_rendervue_type_template_id_37377d22_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"grid-render",style:(_vm.styleObj)},[_c('table',{staticClass:"grid-table"},[_vm._l((_vm.columnSet),function(col){return _c('col',{key:col.id,attrs:{"width":col.width}})}),_vm._l((_vm.rowList),function(row){return _c('tr',{key:row.id,attrs:{"height":row.height}},_vm._l((row.rowColumns),function(cell){return _c('td',{key:cell.id,attrs:{"rowspan":cell.rowSpan,"colspan":cell.colSpan}},[_c('GridCell',{attrs:{"widget":cell.widget,"height":row.height}})],1)}),0)})],2)])}
-var container_grid_rendervue_type_template_id_37377d22_scoped_true_staticRenderFns = []
+;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/container-grid-render.vue?vue&type=template&id=7ca51167&scoped=true&
+var container_grid_rendervue_type_template_id_7ca51167_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"grid-render",style:(_vm.styleObj)},[_c('table',{staticClass:"grid-table"},[_vm._l((_vm.columnSet),function(col){return _c('col',{key:col.id,attrs:{"width":col.width}})}),_vm._l((_vm.rowList),function(row,rowIndex){return _c('tr',{key:row.id,attrs:{"height":row.height}},_vm._l((row.rowColumns),function(cell){return _c('td',{key:cell.id,attrs:{"rowspan":cell.rowSpan,"colspan":cell.colSpan}},[_c('GridCell',{attrs:{"widget":cell.widget,"height":_vm.parseHeight(cell.rowSpan, row, rowIndex)}})],1)}),0)})],2)])}
+var container_grid_rendervue_type_template_id_7ca51167_scoped_true_staticRenderFns = []
 
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/container-grid-cell-render.vue?vue&type=template&id=3ac951f2&scoped=true&
@@ -262157,14 +262157,25 @@ var container_grid_cell_render_component = (0,componentNormalizer/* default */.Z
         justifyContent: positionMap[this.horizontalPosition]
       };
     }
+  },
+  methods: {
+    parseHeight(rowSpan, row, rowIndex) {
+      if (rowSpan === 1) {
+        return row.height;
+      }
+      const rowSpanList = this.rowList.slice(rowIndex, rowSpan + 1);
+      return rowSpanList.reduce((pre, cur) => {
+        return pre + cur.height;
+      }, 0);
+    }
   }
 });
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/container/container-grid-render.vue?vue&type=script&lang=js&
  /* harmony default export */ var container_container_grid_rendervue_type_script_lang_js_ = (container_grid_rendervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/container-grid-render.vue?vue&type=style&index=0&id=37377d22&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/container/container-grid-render.vue?vue&type=style&index=0&id=7ca51167&prod&lang=less&scoped=true&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-print-render/src/container/container-grid-render.vue?vue&type=style&index=0&id=37377d22&prod&lang=less&scoped=true&
+;// CONCATENATED MODULE: ./package/tf-print-render/src/container/container-grid-render.vue?vue&type=style&index=0&id=7ca51167&prod&lang=less&scoped=true&
 
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/container/container-grid-render.vue
 
@@ -262177,11 +262188,11 @@ var container_grid_cell_render_component = (0,componentNormalizer/* default */.Z
 
 var container_grid_render_component = (0,componentNormalizer/* default */.Z)(
   container_container_grid_rendervue_type_script_lang_js_,
-  container_grid_rendervue_type_template_id_37377d22_scoped_true_render,
-  container_grid_rendervue_type_template_id_37377d22_scoped_true_staticRenderFns,
+  container_grid_rendervue_type_template_id_7ca51167_scoped_true_render,
+  container_grid_rendervue_type_template_id_7ca51167_scoped_true_staticRenderFns,
   false,
   null,
-  "37377d22",
+  "7ca51167",
   null
   
 )
@@ -262510,9 +262521,9 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
             const lastPageRecordsNum = this.calculationRecordsNum(otherLayout, tableLayout);
             // todo 增加一页操作
             if (lastPageRecordsNum < lastPageRecords) {
-              pages.map(item => {
-                item.pagesNum += 1;
-              });
+              // pages.map(item => {
+              //   item.pagesNum += 1
+              // })
               pages.push({
                 firstPageRecords: recordsNum,
                 // 第一页显示数量
@@ -262522,6 +262533,11 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
                 // 并且最后一页不显示table
                 pagesNum: pagesNum + 1
               });
+              pages.map((item, index) => {
+                if (index !== pages.length - 1) {
+                  item.pagesNum = pages[pages.length - 1].pagesNum;
+                }
+              });
             }
             break;
           }
@@ -262552,9 +262568,6 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
             const lastPageRecordsNum = this.calculationRecordsNum(otherLayout, tableLayout);
             // todo 增加一页操作
             if (lastPageRecordsNum < lastPageRecords) {
-              pages.map(item => {
-                item.pagesNum += 1;
-              });
               pages.push({
                 firstPageRecords: firstPageRecordsCt,
                 // 第一页显示数量
@@ -262564,6 +262577,11 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
                 // 并且最后一页不显示table
                 pagesNum: pagesNum + 2
               });
+              pages.map((item, index) => {
+                if (index !== pages.length - 1) {
+                  item.pagesNum = pages[pages.length - 1].pagesNum;
+                }
+              });
             }
             break;
           }
@@ -262673,10 +262691,10 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
 });
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/print-render.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_print_rendervue_type_script_lang_js_ = (print_rendervue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/print-render.vue?vue&type=style&index=0&id=65533614&prod&scoped=true&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-print-render/src/print-render.vue?vue&type=style&index=0&id=128af749&prod&scoped=true&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./package/tf-print-render/src/print-render.vue?vue&type=style&index=0&id=65533614&prod&scoped=true&lang=less&
+;// CONCATENATED MODULE: ./package/tf-print-render/src/print-render.vue?vue&type=style&index=0&id=128af749&prod&scoped=true&lang=less&
 
 ;// CONCATENATED MODULE: ./package/tf-print-render/src/print-render.vue
 
@@ -262689,11 +262707,11 @@ var dom_to_image_default = /*#__PURE__*/__webpack_require__.n(dom_to_image);
 
 var print_render_component = (0,componentNormalizer/* default */.Z)(
   src_print_rendervue_type_script_lang_js_,
-  print_rendervue_type_template_id_65533614_scoped_true_render,
-  print_rendervue_type_template_id_65533614_scoped_true_staticRenderFns,
+  print_rendervue_type_template_id_128af749_scoped_true_render,
+  print_rendervue_type_template_id_128af749_scoped_true_staticRenderFns,
   false,
   null,
-  "65533614",
+  "128af749",
   null
   
 )