bl-common-vue3 3.3.4 → 3.3.6

package/lib/vue3common.common.js

@@ -144241,18 +144241,13 @@ var LinkLibraryvue_type_style_index_0_id_4fb68a90_lang_less_scoped_true = __webp
 const LinkLibrary_exports_ = /*#__PURE__*/exportHelper_default()(LinkLibraryvue_type_script_lang_js, [['render',LinkLibraryvue_type_template_id_4fb68a90_scoped_true_render],['__scopeId',"data-v-4fb68a90"]])
 
 /* harmony default export */ var LinkLibrary = (LinkLibrary_exports_);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/ExportComponents/index.vue?vue&type=template&id=21e0b32d
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/ExportComponents/index.vue?vue&type=template&id=3f0b164b
 
-var ExportComponentsvue_type_template_id_21e0b32d_hoisted_1 = {
-  key: 0
-};
-var ExportComponentsvue_type_template_id_21e0b32d_hoisted_2 = {
-  key: 1
-};
-function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $props, $setup, $data, $options) {
-  var _component_a_progress = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-progress");
 
-  var _component_a_button = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-button");
+var ExportComponentsvue_type_template_id_3f0b164b_hoisted_1 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, " 正在导出数据，请耐心等待，请勿关闭窗口... ", -1);
+
+function ExportComponentsvue_type_template_id_3f0b164b_render(_ctx, _cache, $props, $setup, $data, $options) {
+  var _component_a_progress = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-progress");
 
   var _component_a_modal = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-modal");
 
@@ -144260,20 +144255,9 @@ function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $pro
     visible: _ctx.visible,
     title: "数据导出进度",
     onOk: _ctx.closeModal,
+    footer: false,
     width: 500
   }, {
-    footer: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
-      return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_a_button, {
-        key: "submit",
-        type: "primary",
-        onClick: _ctx.closeModal
-      }, {
-        default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
-          return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])("确定")];
-        }),
-        _: 1
-      }, 8, ["onClick"])];
-    }),
     default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_a_progress, {
         "stroke-color": {
@@ -144281,12 +144265,12 @@ function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $pro
           '100%': '#87d068'
         },
         percent: _ctx.percentage
-      }, null, 8, ["percent"]), _ctx.percentage != 100 ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ExportComponentsvue_type_template_id_21e0b32d_hoisted_1, " 正在导出数据，请耐心等待，请勿关闭窗口... ")) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ExportComponentsvue_type_template_id_21e0b32d_hoisted_2, " 导出成功,请等待文件生成 "))])];
+      }, null, 8, ["percent"]), ExportComponentsvue_type_template_id_3f0b164b_hoisted_1])];
     }),
     _: 1
   }, 8, ["visible", "onOk"]);
 }
-// CONCATENATED MODULE: ./src/components/ExportComponents/index.vue?vue&type=template&id=21e0b32d
+// CONCATENATED MODULE: ./src/components/ExportComponents/index.vue?vue&type=template&id=3f0b164b
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
 var es_number_to_fixed = __webpack_require__("b680");
@@ -144510,11 +144494,6 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       type: Boolean,
       default: false
     },
-    total: {
-      //当前要导出的总条数
-      type: [Number, String],
-      default: 0
-    },
     title: {
       //导出框名称
       type: String,
@@ -144530,7 +144509,7 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       type: String,
       default: ""
     },
-    ask: {
+    method: {
       //接口请求方法
       type: String,
       default: ""
@@ -144568,25 +144547,22 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       Counted: 0,
       //要导出的列表具体有多少页
       ExportList: [],
-      paramsobject: {}
+      paramsobject: {},
+      total: 0
     });
 
     var getlist = function getlist() {
-      console.log('1111111111111');
       state.paramsobject.page = state.page;
       state.paramsobject.limit = props.limit;
       state.paramsobject.pageSize = props.limit;
-      console.log('222222222222');
       context.emit("request", {
         params: {
-          method: props.ask,
+          method: props.method,
           server: props.service,
           url: props.url,
           extra: state.paramsobject
         },
         success: function success(res) {
-          console.log('33333333333333');
-
           if (props.service == '/org' && props.url == '/bill/list') {
             res.list.forEach(function (item) {
               item.actual_retreat = Number(item.actual_retreat);
@@ -144597,27 +144573,44 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
           }
 
           state.ExportList = [].concat(Object(toConsumableArray["a" /* default */])(state.ExportList), Object(toConsumableArray["a" /* default */])(res.list));
+          state.total = res.total;
 
-          if (state.page == state.Counted) {
-            state.percentage = 100;
-            setTimeout(function () {
-              var list = utils_util.deepClone(state.ExportList);
-              xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
-              context.emit("success", "导出成功,请等待文件生成");
-            }, 200);
+          if (state.page == 1) {
+            if (state.ExportList.length < state.total) {
+              state.Counted = Math.ceil(state.total / props.limit);
+              state.page++;
+              state.percentage = Number((state.ExportList.length / state.total * 100).toFixed(1));
+              getlist();
+            } else {
+              state.percentage = 100;
+              setTimeout(function () {
+                var list = utils_util.deepClone(state.ExportList);
+                xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
+                context.emit("success", "导出成功,请等待文件生成");
+                closeModal();
+              }, 200);
+            }
           } else {
-            state.page++;
-            state.percentage = Number((state.ExportList.length / props.total * 100).toFixed(1));
-            getlist();
+            if (state.page == state.Counted) {
+              state.percentage = 100;
+              setTimeout(function () {
+                var list = utils_util.deepClone(state.ExportList);
+                xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
+                context.emit("success", "导出成功,请等待文件生成");
+                closeModal();
+              }, 200);
+            } else {
+              state.page++;
+              state.percentage = Number((state.ExportList.length / state.total * 100).toFixed(1));
+              getlist();
+            }
           }
         }
       });
     };
 
     var into = function into() {
-      state.Counted = Math.ceil(props.total / props.limit);
       state.paramsobject = props.params;
-      console.log(state.Counted);
       getlist();
     };
 
@@ -144649,7 +144642,7 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
 
 
 
-const ExportComponents_exports_ = /*#__PURE__*/exportHelper_default()(ExportComponentsvue_type_script_lang_js, [['render',ExportComponentsvue_type_template_id_21e0b32d_render]])
+const ExportComponents_exports_ = /*#__PURE__*/exportHelper_default()(ExportComponentsvue_type_script_lang_js, [['render',ExportComponentsvue_type_template_id_3f0b164b_render]])
 
 /* harmony default export */ var ExportComponents = (ExportComponents_exports_);
 // CONCATENATED MODULE: ./src/components/components.js

package/lib/vue3common.umd.js

@@ -144250,18 +144250,13 @@ var LinkLibraryvue_type_style_index_0_id_4fb68a90_lang_less_scoped_true = __webp
 const LinkLibrary_exports_ = /*#__PURE__*/exportHelper_default()(LinkLibraryvue_type_script_lang_js, [['render',LinkLibraryvue_type_template_id_4fb68a90_scoped_true_render],['__scopeId',"data-v-4fb68a90"]])
 
 /* harmony default export */ var LinkLibrary = (LinkLibrary_exports_);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/ExportComponents/index.vue?vue&type=template&id=21e0b32d
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/ExportComponents/index.vue?vue&type=template&id=3f0b164b
 
-var ExportComponentsvue_type_template_id_21e0b32d_hoisted_1 = {
-  key: 0
-};
-var ExportComponentsvue_type_template_id_21e0b32d_hoisted_2 = {
-  key: 1
-};
-function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $props, $setup, $data, $options) {
-  var _component_a_progress = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-progress");
 
-  var _component_a_button = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-button");
+var ExportComponentsvue_type_template_id_3f0b164b_hoisted_1 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, " 正在导出数据，请耐心等待，请勿关闭窗口... ", -1);
+
+function ExportComponentsvue_type_template_id_3f0b164b_render(_ctx, _cache, $props, $setup, $data, $options) {
+  var _component_a_progress = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-progress");
 
   var _component_a_modal = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-modal");
 
@@ -144269,20 +144264,9 @@ function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $pro
     visible: _ctx.visible,
     title: "数据导出进度",
     onOk: _ctx.closeModal,
+    footer: false,
     width: 500
   }, {
-    footer: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
-      return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_a_button, {
-        key: "submit",
-        type: "primary",
-        onClick: _ctx.closeModal
-      }, {
-        default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
-          return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])("确定")];
-        }),
-        _: 1
-      }, 8, ["onClick"])];
-    }),
     default: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["withCtx"])(function () {
       return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementVNode"])("div", null, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createVNode"])(_component_a_progress, {
         "stroke-color": {
@@ -144290,12 +144274,12 @@ function ExportComponentsvue_type_template_id_21e0b32d_render(_ctx, _cache, $pro
           '100%': '#87d068'
         },
         percent: _ctx.percentage
-      }, null, 8, ["percent"]), _ctx.percentage != 100 ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ExportComponentsvue_type_template_id_21e0b32d_hoisted_1, " 正在导出数据，请耐心等待，请勿关闭窗口... ")) : (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", ExportComponentsvue_type_template_id_21e0b32d_hoisted_2, " 导出成功,请等待文件生成 "))])];
+      }, null, 8, ["percent"]), ExportComponentsvue_type_template_id_3f0b164b_hoisted_1])];
     }),
     _: 1
   }, 8, ["visible", "onOk"]);
 }
-// CONCATENATED MODULE: ./src/components/ExportComponents/index.vue?vue&type=template&id=21e0b32d
+// CONCATENATED MODULE: ./src/components/ExportComponents/index.vue?vue&type=template&id=3f0b164b
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.to-fixed.js
 var es_number_to_fixed = __webpack_require__("b680");
@@ -144519,11 +144503,6 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       type: Boolean,
       default: false
     },
-    total: {
-      //当前要导出的总条数
-      type: [Number, String],
-      default: 0
-    },
     title: {
       //导出框名称
       type: String,
@@ -144539,7 +144518,7 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       type: String,
       default: ""
     },
-    ask: {
+    method: {
       //接口请求方法
       type: String,
       default: ""
@@ -144577,25 +144556,22 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
       Counted: 0,
       //要导出的列表具体有多少页
       ExportList: [],
-      paramsobject: {}
+      paramsobject: {},
+      total: 0
     });
 
     var getlist = function getlist() {
-      console.log('1111111111111');
       state.paramsobject.page = state.page;
       state.paramsobject.limit = props.limit;
       state.paramsobject.pageSize = props.limit;
-      console.log('222222222222');
       context.emit("request", {
         params: {
-          method: props.ask,
+          method: props.method,
           server: props.service,
           url: props.url,
           extra: state.paramsobject
         },
         success: function success(res) {
-          console.log('33333333333333');
-
           if (props.service == '/org' && props.url == '/bill/list') {
             res.list.forEach(function (item) {
               item.actual_retreat = Number(item.actual_retreat);
@@ -144606,27 +144582,44 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
           }
 
           state.ExportList = [].concat(Object(toConsumableArray["a" /* default */])(state.ExportList), Object(toConsumableArray["a" /* default */])(res.list));
+          state.total = res.total;
 
-          if (state.page == state.Counted) {
-            state.percentage = 100;
-            setTimeout(function () {
-              var list = utils_util.deepClone(state.ExportList);
-              xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
-              context.emit("success", "导出成功,请等待文件生成");
-            }, 200);
+          if (state.page == 1) {
+            if (state.ExportList.length < state.total) {
+              state.Counted = Math.ceil(state.total / props.limit);
+              state.page++;
+              state.percentage = Number((state.ExportList.length / state.total * 100).toFixed(1));
+              getlist();
+            } else {
+              state.percentage = 100;
+              setTimeout(function () {
+                var list = utils_util.deepClone(state.ExportList);
+                xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
+                context.emit("success", "导出成功,请等待文件生成");
+                closeModal();
+              }, 200);
+            }
           } else {
-            state.page++;
-            state.percentage = Number((state.ExportList.length / props.total * 100).toFixed(1));
-            getlist();
+            if (state.page == state.Counted) {
+              state.percentage = 100;
+              setTimeout(function () {
+                var list = utils_util.deepClone(state.ExportList);
+                xlsx_xlsx(list, removeUndefined(props.columnstitle), props.title);
+                context.emit("success", "导出成功,请等待文件生成");
+                closeModal();
+              }, 200);
+            } else {
+              state.page++;
+              state.percentage = Number((state.ExportList.length / state.total * 100).toFixed(1));
+              getlist();
+            }
           }
         }
       });
     };
 
     var into = function into() {
-      state.Counted = Math.ceil(props.total / props.limit);
       state.paramsobject = props.params;
-      console.log(state.Counted);
       getlist();
     };
 
@@ -144658,7 +144651,7 @@ var currentImg = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["ref"])(""
 
 
 
-const ExportComponents_exports_ = /*#__PURE__*/exportHelper_default()(ExportComponentsvue_type_script_lang_js, [['render',ExportComponentsvue_type_template_id_21e0b32d_render]])
+const ExportComponents_exports_ = /*#__PURE__*/exportHelper_default()(ExportComponentsvue_type_script_lang_js, [['render',ExportComponentsvue_type_template_id_3f0b164b_render]])
 
 /* harmony default export */ var ExportComponents = (ExportComponents_exports_);
 // CONCATENATED MODULE: ./src/components/components.js