@leevan/jtui 2.0.29 → 2.0.31

package/examples/form/form.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: leevan
  * @Date: 2022-03-09 15:49:08
- * @LastEditTime: 2022-03-09 19:21:19
+ * @LastEditTime: 2023-10-12 16:07:22
  * @LastEditors: leevan
  * @FilePath: /jtui-pc/examples/form/form.vue
 -->
@@ -16,6 +16,13 @@
       :rules="rules"
     >
     </jt-form-pc>
+    <jt-upload-pc
+      :autostart="true"
+      target="/jtrequest/upf/telemetry_duty/chunk"
+      mergePath="/jtrequest/upf/telemetry_duty/mergeFile"
+      :simultaneousUploads="4"
+      @success="success"
+      ></jt-upload-pc>
   </div>
 </template>
 
@@ -52,6 +59,9 @@ export default {
   methods:{
       printData(){
           console.log(this.model);
+      },
+      success(res){
+        console.log(res)
       }
   }
 };

package/lib/jtui.common.js

@@ -18531,6 +18531,17 @@ module.exports = function (it) {
 };
 
 
+/***/ }),
+
+/***/ "1c1a":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_32aeb1ca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("cac8");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_32aeb1ca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_32aeb1ca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+ /* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_32aeb1ca_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
 /***/ }),
 
 /***/ "1c5f":
@@ -179498,17 +179509,6 @@ function groupBy (obj, iterate, context) {
 module.exports = groupBy
 
 
-/***/ }),
-
-/***/ "b78b":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_21dbf720_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d5c1");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_21dbf720_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_21dbf720_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
- /* unused harmony default export */ var _unused_webpack_default_export = (_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_JtUploadPc_vue_vue_type_style_index_0_id_21dbf720_scoped_true_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
-
 /***/ }),
 
 /***/ "b79d":
@@ -192025,6 +192025,38 @@ function helperStringRepeat (str, count) {
 module.exports = helperStringRepeat
 
 
+/***/ }),
+
+/***/ "c740":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var $ = __webpack_require__("23e7");
+var $findIndex = __webpack_require__("b727").findIndex;
+var addToUnscopables = __webpack_require__("44d2");
+var arrayMethodUsesToLength = __webpack_require__("ae40");
+
+var FIND_INDEX = 'findIndex';
+var SKIPS_HOLES = true;
+
+var USES_TO_LENGTH = arrayMethodUsesToLength(FIND_INDEX);
+
+// Shouldn't skip holes
+if (FIND_INDEX in []) Array(1)[FIND_INDEX](function () { SKIPS_HOLES = false; });
+
+// `Array.prototype.findIndex` method
+// https://tc39.github.io/ecma262/#sec-array.prototype.findindex
+$({ target: 'Array', proto: true, forced: SKIPS_HOLES || !USES_TO_LENGTH }, {
+  findIndex: function findIndex(callbackfn /* , that = undefined */) {
+    return $findIndex(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+  }
+});
+
+// https://tc39.github.io/ecma262/#sec-array.prototype-@@unscopables
+addToUnscopables(FIND_INDEX);
+
+
 /***/ }),
 
 /***/ "c775":
@@ -194298,6 +194330,13 @@ $({ target: 'Array', proto: true, forced: !USES_TO_LENGTH }, {
 addToUnscopables('includes');
 
 
+/***/ }),
+
+/***/ "cac8":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "cb11":
@@ -202972,13 +203011,6 @@ module.exports = _default;
 
 /***/ }),
 
-/***/ "d5c1":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "d69a":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -231258,7 +231290,7 @@ var es_function_name = __webpack_require__("b0c0");
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=6d38a231&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-table/index.vue?vue&type=template&id=1280f531&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"tableStyle-2",class:_vm.isWrap ? 'isWrap' : '',staticStyle:{"position":"absolute","top":"1px","left":"1px","right":"1px","bottom":"1px"}},[(_vm.isTool)?_c('div',{staticStyle:{"position":"relative"}},[_c('vxe-toolbar',{staticClass:"jt-toolbar",attrs:{"custom":{ icon: 'jtIcon iconpeizhi41 colStyle' }}})],1):_vm._e(),(_vm.tableType === 'default')?_c('vxe-table',{ref:_vm.id,staticClass:"jt-table-class-only",attrs:{"height":"auto","size":"mini","show-overflow":"","show-header-overflow":"","auto-resize":"","resizable":"","highlight-current-row":"","highlight-current-column":"","keep-source":"","id":_vm.id,"data":_vm.data.DataArray,"stripe":_vm.stripe,"border":_vm.border,"max-height":_vm.maxHeight,"show-footer":_vm.isFooter,"footer-method":_vm.footerMethod,"footer-span-method":_vm.footerColspanMethod,"footer-cell-class-name":_vm.footerCellClassName,"loading":_vm.loading,"row-style":_vm.rowStyle,"cell-style":_vm.cellStyle_m,"header-cell-class-name":_vm.headerClass,"span-method":_vm.spanMethod,"scroll-y":{ mode: 'wheel' },"sort-config":{ sortMethod: _vm.sortMethod },"radio-config":{ checkRowKey: null },"keyboard-config":{ isArrow: true },"checkbox-config":{ highlight: true },"export-config":{
       type: 'xlsx',
       types: ['xlsx', 'csv', 'html', 'xml', 'txt'],
@@ -231358,7 +231390,7 @@ return [(_vm.handlerConfig.btnGroup)?_c('el-dropdown',[_c('el-button',{attrs:{"s
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=6d38a231&
+// CONCATENATED MODULE: ./packages/jt-table/index.vue?vue&type=template&id=1280f531&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -233157,7 +233189,7 @@ var component = normalizeComponent(
         var ch = $event.target.clientHeight;
         var sh = $event.target.scrollHeight;
 
-        if (scrollTop + ch >= sh && scrollTop != 0) {
+        if (Math.ceil(scrollTop + ch) >= sh && scrollTop != 0) {
           _this2.$emit("scrollBottom", ++_this2.pageIndex);
         }
       }, 200);
@@ -234605,12 +234637,15 @@ JtFormPc.install = function (Vue) {
 
 
 /* harmony default export */ var jt_form_pc = (JtFormPc);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-upload-pc/JtUploadPc.vue?vue&type=template&id=21dbf720&scoped=true&
-var JtUploadPcvue_type_template_id_21dbf720_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('uploader',{ref:"Upload",staticClass:"uploader-example",attrs:{"file-status-text":_vm.statusText,"options":_vm.options,"autoStart":_vm.autoStart},on:{"file-success":_vm.onFileSuccess,"file-error":_vm.onFileError,"file-added":_vm.fileAdded,"files-added":_vm.filesAdded}},[_c('uploader-unsupport'),(!_vm.singleMode)?_c('uploader-drop',{staticClass:"jt-upload-drop"},[_c('i',{staticClass:"el-icon-upload jt-upload-icon"}),_c('div',{staticClass:"el-upload__text"},[_vm._v("将文件拖到此处，或 "),_c('uploader-btn',{staticClass:"jt-upload-btn",attrs:{"attrs":_vm.attrs}},[_vm._v(_vm._s(_vm.text))])],1)]):_vm._e(),(!_vm.singleMode)?_c('uploader-list',{ref:"list",staticClass:"jt-upload-list"}):_vm._e(),(_vm.singleMode)?_c('uploader-btn',{staticClass:"jt-upload-btn",attrs:{"attrs":_vm.attrs}},[_vm._v(_vm._s(_vm.text))]):_vm._e()],1)}
-var JtUploadPcvue_type_template_id_21dbf720_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7e503786-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-upload-pc/JtUploadPc.vue?vue&type=template&id=32aeb1ca&scoped=true&
+var JtUploadPcvue_type_template_id_32aeb1ca_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('uploader',{ref:"Upload",staticClass:"uploader-example",attrs:{"file-status-text":_vm.statusText,"options":_vm.options,"autoStart":_vm.autoStart},on:{"file-success":_vm.onFileSuccess,"file-error":_vm.onFileError,"file-added":_vm.fileAdded,"files-added":_vm.filesAdded}},[_c('uploader-unsupport'),(!_vm.singleMode)?_c('uploader-drop',{staticClass:"jt-upload-drop"},[_c('i',{staticClass:"el-icon-upload jt-upload-icon"}),_c('div',{staticClass:"el-upload__text"},[_vm._v("将文件拖到此处，或 "),_c('uploader-btn',{staticClass:"jt-upload-btn",attrs:{"attrs":_vm.attrs}},[_vm._v(_vm._s(_vm.text))])],1)]):_vm._e(),(!_vm.singleMode)?_c('uploader-list',{ref:"list",staticClass:"jt-upload-list"}):_vm._e(),(_vm.singleMode)?_c('uploader-btn',{staticClass:"jt-upload-btn",attrs:{"attrs":_vm.attrs}},[_vm._v(_vm._s(_vm.text))]):_vm._e()],1)}
+var JtUploadPcvue_type_template_id_32aeb1ca_scoped_true_staticRenderFns = []
+
 
+// CONCATENATED MODULE: ./packages/jt-upload-pc/JtUploadPc.vue?vue&type=template&id=32aeb1ca&scoped=true&
 
-// CONCATENATED MODULE: ./packages/jt-upload-pc/JtUploadPc.vue?vue&type=template&id=21dbf720&scoped=true&
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find-index.js
+var es_array_find_index = __webpack_require__("c740");
 
 // EXTERNAL MODULE: ./node_modules/vue-simple-uploader/dist/vue-uploader.js
 var vue_uploader = __webpack_require__("ef55");
@@ -234618,6 +234653,8 @@ var vue_uploader = __webpack_require__("ef55");
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/jt-upload-pc/JtUploadPc.vue?vue&type=script&lang=js&
 
 
+
+
 //
 //
 //
@@ -234745,7 +234782,17 @@ var vue_uploader = __webpack_require__("ef55");
         totalSize: file.size,
         type: file.type
       }).then(function (response) {
-        _this.$emit('success', response);
+        if ('Result' in response.data && response.data.Result == 500) {
+          var activeIndex = _this.$refs.list.fileList.findIndex(function (item) {
+            return item.name == file.name && item.size == file.size;
+          });
+
+          _this.$refs.list.fileList.splice(activeIndex, 1);
+
+          _this.$message.warning(file.name + response.data.Msg + ',请重新上传');
+        } else {
+          _this.$emit("success", response);
+        }
       }).catch(function (error) {
         console.log(error);
       });
@@ -234770,8 +234817,8 @@ var vue_uploader = __webpack_require__("ef55");
 });
 // CONCATENATED MODULE: ./packages/jt-upload-pc/JtUploadPc.vue?vue&type=script&lang=js&
  /* harmony default export */ var jt_upload_pc_JtUploadPcvue_type_script_lang_js_ = (JtUploadPcvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/jt-upload-pc/JtUploadPc.vue?vue&type=style&index=0&id=21dbf720&scoped=true&lang=css&
-var JtUploadPcvue_type_style_index_0_id_21dbf720_scoped_true_lang_css_ = __webpack_require__("b78b");
+// EXTERNAL MODULE: ./packages/jt-upload-pc/JtUploadPc.vue?vue&type=style&index=0&id=32aeb1ca&scoped=true&lang=css&
+var JtUploadPcvue_type_style_index_0_id_32aeb1ca_scoped_true_lang_css_ = __webpack_require__("1c1a");
 
 // CONCATENATED MODULE: ./packages/jt-upload-pc/JtUploadPc.vue
 
@@ -234784,11 +234831,11 @@ var JtUploadPcvue_type_style_index_0_id_21dbf720_scoped_true_lang_css_ = __webpa
 
 var JtUploadPc_component = normalizeComponent(
   jt_upload_pc_JtUploadPcvue_type_script_lang_js_,
-  JtUploadPcvue_type_template_id_21dbf720_scoped_true_render,
-  JtUploadPcvue_type_template_id_21dbf720_scoped_true_staticRenderFns,
+  JtUploadPcvue_type_template_id_32aeb1ca_scoped_true_render,
+  JtUploadPcvue_type_template_id_32aeb1ca_scoped_true_staticRenderFns,
   false,
   null,
-  "21dbf720",
+  "32aeb1ca",
   null
   
 )