@tongfun/tf-widget 0.1.186 → 0.1.187

package/lib/tf-widget.common.js

@@ -193699,8 +193699,8 @@ var addressvue_type_template_id_3fee96d2_staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./node_modules/axios/index.js
-var axios = __webpack_require__(9669);
-var axios_default = /*#__PURE__*/__webpack_require__.n(axios);
+var node_modules_axios = __webpack_require__(9669);
+var axios_default = /*#__PURE__*/__webpack_require__.n(node_modules_axios);
 ;// CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/checkPrivateRedeclaration.js
 function _checkPrivateRedeclaration(obj, privateCollection) {
   if (privateCollection.has(obj)) {
@@ -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=b951c6f6&scoped=true&
-var widget_img_rendervue_type_template_id_b951c6f6_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('img',{style:(_vm.imgStyle),attrs:{"src":_vm.displayUrl}})])}
-var widget_img_rendervue_type_template_id_b951c6f6_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=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/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&
@@ -261542,6 +261542,7 @@ var widget_img_rendervue_type_template_id_b951c6f6_scoped_true_staticRenderFns =
 //
 //
 //
+//
 
 /* harmony default export */ var widget_img_rendervue_type_script_lang_js_ = ({
   name: 'WidgetImgRender',
@@ -261578,10 +261579,10 @@ var widget_img_rendervue_type_template_id_b951c6f6_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=b951c6f6&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=06acdf83&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=b951c6f6&prod&scoped=true&lang=less&
+;// 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
 
@@ -261594,11 +261595,11 @@ var widget_img_rendervue_type_template_id_b951c6f6_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_b951c6f6_scoped_true_render,
-  widget_img_rendervue_type_template_id_b951c6f6_scoped_true_staticRenderFns,
+  widget_img_rendervue_type_template_id_06acdf83_scoped_true_render,
+  widget_img_rendervue_type_template_id_06acdf83_scoped_true_staticRenderFns,
   false,
   null,
-  "b951c6f6",
+  "06acdf83",
   null
   
 )
@@ -262765,14 +262766,32 @@ function getQrCodeShortUrl(data) {
     data
   });
 }
+/**
+ * 批量生成二维码（短链接字符串）
+ */
+function getShortUrlList(data) {
+  return (0,utils/* request */.WY)({
+    url: '/api/erp/print/getShortUrlList',
+    method: 'post',
+    data
+  });
+}
 async function getQrCodeShortUrlIgnoreToken(data) {
-  const response = await axios_default()({
+  const response = await axios({
     url: '/api/erp/print/anno/getShortUrl',
     method: 'post',
     data
   });
   return response.data;
 }
+async function getQrCodeShortUrlListIgnoreToken(data) {
+  const response = await axios_default()({
+    url: '/api/erp/print/anno/getShortUrlLis',
+    method: 'post',
+    data
+  });
+  return response.data;
+}
 
 /**
  * 绑定关系查询
@@ -262839,7 +262858,7 @@ function getInitConfig() {
     // todo: 太长了
     async trigger(dataIds, configId, ignoreToken = false) {
       if (!dataIds.length) {
-        throw new Error('请选择打印配置');
+        throw new Error('请提供打印的数据ID');
       }
       if (!configId) {
         throw new Error('通用打印组件需要提供一个configId');
@@ -262901,52 +262920,105 @@ function getInitConfig() {
         const qrCodeConfigList = this.findQrCode();
         if (qrCodeConfigList.length) {
           // 生成一个短链接
-          const generateOneQr = async (targetRow, qrCodeConfig) => {
-            const qrContent = {};
-            //  目前只有走第一个分支，二维码的展示模版永远是‘当前预览’，
-            //  其他的通用模版，在配置端已经禁用，功能已经开发完毕，但是未开启，未部署
-            if (qrCodeConfig.property.displayTemplate === 'printDetail') {
-              qrContent.rowId = targetRow.row_id;
-              qrContent.configId = configId;
-            } else {
-              qrContent.value = qrCodeConfig.property.value;
+          // const generateOneQr = async (targetRow, qrCodeConfig) => {
+          //   const qrContent = {}
+          //   //  目前只有走第一个分支，二维码的展示模版永远是‘当前预览’，
+          //   //  其他的通用模版，在配置端已经禁用，功能已经开发完毕，但是未开启，未部署
+          //   if (qrCodeConfig.property.displayTemplate === 'printDetail') {
+          //     qrContent.rowId = targetRow.row_id
+          //     qrContent.configId = configId
+          //   } else {
+          //     qrContent.value = qrCodeConfig.property.value
+          //   }
+          //
+          //   const shortUrlParams = {
+          //     targetLink: qrCodeConfig.property.targetUrl === 'currentPreviewUrl' ? null : qrCodeConfig.property.targetUrl, // todo:null
+          //     extraInfo: qrContent
+          //   }
+          //   const res = ignoreToken
+          //     ? await getQrCodeShortUrlIgnoreToken(shortUrlParams)
+          //     : await getQrCodeShortUrl(shortUrlParams)
+          //   if (res.code !== 0) {
+          //     throw new Error('获取二维码出错')
+          //   }
+          //   const qrUrlKey = `qrCode-${qrCodeConfig.property.id}`
+          //   targetRow[qrUrlKey] = res.data
+          // }
+
+          // 生成短连接的参数
+          const generateAllOrParams = headQrCodeConfigLists => {
+            const allQrParams = [];
+            for (const receipt of printData) {
+              if (headQrCodeConfigLists.length) {
+                for (const headQrConfig of headQrCodeConfigLists) {
+                  const targetRow = receipt.records[0];
+                  const qrCodeConfig = headQrConfig;
+                  const qrContent = {};
+                  //  目前只有走第一个分支，二维码的展示模版永远是‘当前预览’，
+                  //  其他的通用模版，在配置端已经禁用，功能已经开发完毕，但是未开启，未部署
+                  if (qrCodeConfig.property.displayTemplate === 'printDetail') {
+                    qrContent.rowId = targetRow.row_id;
+                    qrContent.configId = configId;
+                  } else {
+                    qrContent.value = qrCodeConfig.property.value;
+                  }
+                  const shortUrlParams = {
+                    id: targetRow.row_id,
+                    targetLink: qrCodeConfig.property.targetUrl === 'currentPreviewUrl' ? null : qrCodeConfig.property.targetUrl,
+                    // todo:null
+                    extraInfo: qrContent
+                  };
+                  allQrParams.push(shortUrlParams);
+                }
+              }
             }
-            const shortUrlParams = {
-              targetLink: qrCodeConfig.property.targetUrl === 'currentPreviewUrl' ? null : qrCodeConfig.property.targetUrl,
-              // todo:null
-              extraInfo: qrContent
-            };
-            const res = ignoreToken ? await getQrCodeShortUrlIgnoreToken(shortUrlParams) : await getQrCodeShortUrl(shortUrlParams);
+            return allQrParams;
+          };
+          const generateAllQr = async generateAllOrParams => {
+            const res = ignoreToken ? await getQrCodeShortUrlListIgnoreToken(generateAllOrParams) : await getShortUrlList(generateAllOrParams);
             if (res.code !== 0) {
               throw new Error('获取二维码出错');
             }
-            const qrUrlKey = `qrCode-${qrCodeConfig.property.id}`;
-            targetRow[qrUrlKey] = res.data;
+            return res.data;
           };
 
-          // 要生成短链接的队列
+          // // 要生成短链接的队列
+          // const qrCodeGenerateQueue = []
+          // const appendQrCodeUrl = (targetRow, qrCodeConfig) => {
+          //   qrCodeGenerateQueue.push(generateOneQr(targetRow, qrCodeConfig))
+          // }
+
+          // // 要生成短链接的队列
           const qrCodeGenerateQueue = [];
-          const appendQrCodeUrl = (targetRow, qrCodeConfig) => {
-            qrCodeGenerateQueue.push(generateOneQr(targetRow, qrCodeConfig));
+          const appendQrCodeUrl = (targetRow, qrCodeConfig, qrData) => {
+            qrCodeGenerateQueue.push(new Promise((resolve, reject) => {
+              const qrUrlKey = `qrCode-${qrCodeConfig.property.id}`;
+              targetRow[qrUrlKey] = qrData;
+              resolve(true);
+            }));
           };
 
           // main
           const headQrCodeConfigList = qrCodeConfigList.filter(item => ['ContainerAbsolute', 'ContainerGrid'].includes(item.belongContainer));
           const bodyQrCodeConfigList = []; // 目前还不支持
-          for (const receipt of printData) {
-            if (headQrCodeConfigList.length) {
-              for (const headQrConfig of headQrCodeConfigList) {
-                appendQrCodeUrl(receipt.records[0], headQrConfig);
-              }
-            }
-
-            // 预留，目前还不支持在循环体中加入二维码的设置
-            if (bodyQrCodeConfigList.length) {
-              for (const bodyQrConfig of bodyQrCodeConfigList) {
-                for (const bodyDataRow of receipt.records) {
-                  appendQrCodeUrl(bodyDataRow, bodyQrConfig);
+          const allParams = generateAllOrParams(headQrCodeConfigList);
+          if (allParams.length) {
+            const qrList = await generateAllQr(allParams);
+            for (const receipt of printData) {
+              if (headQrCodeConfigList.length) {
+                for (const headQrConfig of headQrCodeConfigList) {
+                  appendQrCodeUrl(receipt.records[0], headQrConfig, qrList[receipt.rowId]);
                 }
               }
+
+              // 预留，目前还不支持在循环体中加入二维码的设置
+              // if (bodyQrCodeConfigList.length) {
+              //   for (const bodyQrConfig of bodyQrCodeConfigList) {
+              //     for (const bodyDataRow of receipt.records) {
+              //       appendQrCodeUrl(bodyDataRow, bodyQrConfig)
+              //     }
+              //   }
+              // }
             }
           }