eoss-ui 0.8.48 → 0.8.49

package/lib/upload.js

@@ -4750,8 +4750,8 @@ module.exports = require("spark-md5");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=7388a79d&
-var mainvue_type_template_id_7388a79d_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=bf79f780&
+var mainvue_type_template_id_bf79f780_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5135,10 +5135,10 @@ var mainvue_type_template_id_7388a79d_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_7388a79d_render._withStripped = true
+mainvue_type_template_id_bf79f780_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=7388a79d&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=bf79f780&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5886,6 +5886,7 @@ var _props;
     lists: {
       deep: true,
       handler: function handler(val) {
+        if (this._isSortRebuilding) return;
         this.$emit('update:fileCount', val.length);
         this.$emit('getFilesAmount', val.length);
       }
@@ -6326,6 +6327,19 @@ var _props;
 
       console.log('files', files);
       if (this.isSort) {
+        // 同步拖拽排序后的顺序到数据层，采用先清空再重建的方式
+        // 避免 SortableJS 移动 DOM 后与 Vue 虚拟 DOM 产生引用错位
+        this._isSortRebuilding = true;
+        this.lists = [];
+        this.$nextTick(function () {
+          _this10.lists = files;
+          _this10._isSortRebuilding = false;
+          // 重建完成后清除 table-body 的 newData 缓存
+          // 使下次拖拽基于最新的 this.data 而非旧缓存
+          _this10.$nextTick(function () {
+            _this10._resetTableBodyCache();
+          });
+        });
         if (this.onSort) {
           this.onSort(files);
         } else {
@@ -6411,11 +6425,17 @@ var _props;
       this.onChange && this.onChange(file, fileList);
     },
     handleRemove: function handleRemove(file, fileList) {
+      var _this11 = this;
+
       this.cleanupChunk(file);
       this.$emit('input', fileList.length ? fileList : '');
       this.$emit('remove', file, fileList);
       this.$emit('change', fileList);
       this.onRemove && this.onRemove(file, fileList);
+      // 删除后重置 table-body 的排序缓存，防止再次拖拽时已删除文件从旧 newData 中复活
+      this.$nextTick(function () {
+        _this11._resetTableBodyCache();
+      });
     },
     handleError: function handleError(err, file, fileList) {
       console.log('err', err);
@@ -6450,7 +6470,7 @@ var _props;
     // el-upload 的自定义上传实现：建立可暂停的运行态并返回受控 Promise。
     // 暂停时不 resolve/reject（promise 维持 pending，文件保持"上传中"而非失败），继续时再次进入流程。
     chunkUpload: function chunkUpload(options) {
-      var _this11 = this;
+      var _this12 = this;
 
       var file = options.file;
       var uid = file.uid;
@@ -6465,13 +6485,13 @@ var _props;
       return new Promise(function (resolve, reject) {
         state.resolve = resolve;
         state.reject = reject;
-        _this11.runChunkFlow(uid);
+        _this12.runChunkFlow(uid);
       });
     },
 
     // 分片主流程（可被"继续"重新进入）：MD5(缓存) → 秒传/断点续传检测 → 并发上传缺失分片 → 合并入库。
     runChunkFlow: function runChunkFlow(uid) {
-      var _this12 = this;
+      var _this13 = this;
 
       var state = this._chunkState[uid];
       if (!state) return;
@@ -6479,13 +6499,13 @@ var _props;
       var file = options.file;
       var onProgress = options.onProgress || function () {};
       var baseParams = function baseParams() {
-        return _extends({}, _this12.param, {
+        return _extends({}, _this13.param, {
           fileMd5: state.fileMd5,
           fileName: file.name,
           fileSize: file.size,
           totalChunks: state.totalChunks,
-          bucketCode: _this12.code,
-          businessId: _this12.ownId
+          bucketCode: _this13.code,
+          businessId: _this13.ownId
         });
       };
       var isAbort = function isAbort(e) {
@@ -6493,13 +6513,13 @@ var _props;
       };
 
       Promise.resolve().then(function () {
-        return state.fileMd5 || _this12.computeFileMd5(file, onProgress);
+        return state.fileMd5 || _this13.computeFileMd5(file, onProgress);
       }).then(function (md5) {
         state.fileMd5 = md5;
         if (state.paused) return null;
         return util["a" /* default */].ajax({
           method: 'post',
-          url: _this12.chunkUrls.check,
+          url: _this13.chunkUrls.check,
           data: baseParams(),
           params: baseParams(),
           headers: options.headers
@@ -6511,14 +6531,14 @@ var _props;
         // 秒传命中：该业务桶下已存在同 MD5 文件，直接视为成功
         if (info.instant) {
           onProgress({ percent: 100 });
-          _this12.normalizeChunkDoc(info, file.name);
-          _this12.finishChunk(uid, {
+          _this13.normalizeChunkDoc(info, file.name);
+          _this13.finishChunk(uid, {
             rCode: 0,
             msg: checkRes.msg || '秒传成功',
             results: info
           });
           // 秒传文件已存在于服务端，刷新列表以展示其完整信息（含可下载/预览的 id）
-          _this12.requestFiles && _this12.getFiles();
+          _this13.requestFiles && _this13.getFiles();
           return;
         }
         // 断点续传：跳过服务端已存在的分片
@@ -6534,9 +6554,9 @@ var _props;
         });
         state.controller = typeof AbortController !== 'undefined' ? new AbortController() : null;
         var signal = state.controller ? state.controller.signal : undefined;
-        return _this12.runChunkQueue(pending, _this12._chunkConcurrent, function (index) {
+        return _this13.runChunkQueue(pending, _this13._chunkConcurrent, function (index) {
           if (state.paused) return Promise.reject({ __aborted: true });
-          return _this12.uploadOneChunk(file, index, state.totalChunks, state.fileMd5, options.headers, signal).then(function () {
+          return _this13.uploadOneChunk(file, index, state.totalChunks, state.fileMd5, options.headers, signal).then(function () {
             finished++;
             onProgress({
               percent: Math.min(95, 5 + Math.round(finished / state.totalChunks * 90))
@@ -6546,7 +6566,7 @@ var _props;
           if (state.paused) return; // 暂停于上传阶段，维持 pending
           return util["a" /* default */].ajax({
             method: 'post',
-            url: _this12.chunkUrls.merge,
+            url: _this13.chunkUrls.merge,
             data: baseParams(),
             params: baseParams(),
             headers: options.headers
@@ -6554,17 +6574,17 @@ var _props;
             console.log('mergeRes', mergeRes);
             if (mergeRes.rCode !== 0) return Promise.reject(mergeRes);
             onProgress({ percent: 100 });
-            _this12.normalizeChunkDoc(mergeRes.results, file.name);
-            _this12.finishChunk(uid, mergeRes);
+            _this13.normalizeChunkDoc(mergeRes.results, file.name);
+            _this13.finishChunk(uid, mergeRes);
             // 刷新列表：让刚入库的文件以与其他行一致的结构展示（时间/大小/上传人等）
-            _this12.requestFiles && _this12.getFiles();
+            _this13.requestFiles && _this13.getFiles();
           });
         });
       }).catch(function (e) {
         console.log('err', e);
         // 暂停导致的中止：保持 pending 等待"继续"；其余才算失败
         if (state.paused || isAbort(e)) return;
-        _this12.failChunk(uid, e);
+        _this13.failChunk(uid, e);
       });
     },
 
@@ -6677,7 +6697,7 @@ var _props;
 
     // 上传单个分片（multipart/form-data）；signal 用于暂停时中止
     uploadOneChunk: function uploadOneChunk(file, index, totalChunks, fileMd5, headers, signal) {
-      var _this13 = this;
+      var _this14 = this;
 
       var start = index * this._chunkSize;
       var end = Math.min(start + this._chunkSize, file.size);
@@ -6691,7 +6711,7 @@ var _props;
       formData.append('bucketCode', this.code);
       formData.append('businessId', this.ownId);
       Object.keys(this.param || {}).forEach(function (key) {
-        formData.append(key, _this13.param[key]);
+        formData.append(key, _this14.param[key]);
       });
       return util["a" /* default */].ajax({
         method: 'post',
@@ -6708,10 +6728,10 @@ var _props;
 
     // 分块读取文件并增量计算 MD5（避免大文件一次性读入内存）
     computeFileMd5: function computeFileMd5(file, onProgress) {
-      var _this14 = this;
+      var _this15 = this;
 
       return new Promise(function (resolve, reject) {
-        var size = _this14._chunkSize;
+        var size = _this15._chunkSize;
         var chunks = Math.max(1, Math.ceil(file.size / size));
         var spark = new external_spark_md5_default.a.ArrayBuffer();
         var reader = new FileReader();
@@ -6764,6 +6784,31 @@ var _props;
         };
         schedule();
       });
+    },
+
+    /**
+     * 重置 table-body 组件内部的 newData 缓存。
+     * table-body.js 在拖拽排序时会把结果存入 newData，后续排序优先从 newData 取数据源。
+     * 但文件被删除后 newData 不会自动清除，导致已删除文件在下次拖拽时复活。
+     */
+    _resetTableBodyCache: function _resetTableBodyCache() {
+      if (this.listType !== 'table') return;
+      var upload = this.$refs.upload;
+      if (!upload) return;
+      var tableList = upload.$children.find(function (c) {
+        return c.$options.name === 'TableList';
+      });
+      if (!tableList) return;
+      var elTable = tableList.$children.find(function (c) {
+        return c.$options.name === 'ElTable';
+      });
+      if (!elTable) return;
+      var tableBody = elTable.$children.find(function (c) {
+        return c.$options.name === 'ElTableBody';
+      });
+      if (tableBody) {
+        tableBody.newData = null;
+      }
     }
   }
 });
@@ -6782,7 +6827,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7388a79d_render,
+  mainvue_type_template_id_bf79f780_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.48",
+  "version": "0.8.49",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/upload/src/main.vue

@@ -770,6 +770,7 @@ export default {
     lists: {
       deep: true,
       handler(val) {
+        if (this._isSortRebuilding) return;
         this.$emit('update:fileCount', val.length);
         this.$emit('getFilesAmount', val.length);
       }
@@ -1355,6 +1356,19 @@ export default {
     handleSort(files) {
       console.log('files', files);
       if (this.isSort) {
+        // 同步拖拽排序后的顺序到数据层，采用先清空再重建的方式
+        // 避免 SortableJS 移动 DOM 后与 Vue 虚拟 DOM 产生引用错位
+        this._isSortRebuilding = true;
+        this.lists = [];
+        this.$nextTick(() => {
+          this.lists = files;
+          this._isSortRebuilding = false;
+          // 重建完成后清除 table-body 的 newData 缓存
+          // 使下次拖拽基于最新的 this.data 而非旧缓存
+          this.$nextTick(() => {
+            this._resetTableBodyCache();
+          });
+        });
         if (this.onSort) {
           this.onSort(files);
         } else {
@@ -1460,6 +1474,10 @@ export default {
       this.$emit('remove', file, fileList);
       this.$emit('change', fileList);
       this.onRemove && this.onRemove(file, fileList);
+      // 删除后重置 table-body 的排序缓存，防止再次拖拽时已删除文件从旧 newData 中复活
+      this.$nextTick(() => {
+        this._resetTableBodyCache();
+      });
     },
     handleError(err, file, fileList) {
       console.log('err', err);
@@ -1832,6 +1850,30 @@ export default {
         };
         schedule();
       });
+    },
+    /**
+     * 重置 table-body 组件内部的 newData 缓存。
+     * table-body.js 在拖拽排序时会把结果存入 newData，后续排序优先从 newData 取数据源。
+     * 但文件被删除后 newData 不会自动清除，导致已删除文件在下次拖拽时复活。
+     */
+    _resetTableBodyCache() {
+      if (this.listType !== 'table') return;
+      const upload = this.$refs.upload;
+      if (!upload) return;
+      const tableList = upload.$children.find(
+        (c) => c.$options.name === 'TableList'
+      );
+      if (!tableList) return;
+      const elTable = tableList.$children.find(
+        (c) => c.$options.name === 'ElTable'
+      );
+      if (!elTable) return;
+      const tableBody = elTable.$children.find(
+        (c) => c.$options.name === 'ElTableBody'
+      );
+      if (tableBody) {
+        tableBody.newData = null;
+      }
     }
   }
 };

package/src/index.js

@@ -127,7 +127,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.8.48',
+  version: '0.8.49',
   install,
   Archives,
   Button,