centaline-data-driven 1.6.64 → 1.6.65

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -304,6 +304,7 @@ export default {
     vmodel: Object,
     api: String,
   },
+  inject: ['ViewerFileToggle', 'ChangeFileList'],
   data() {
     return {
       disableUpload: false,
@@ -351,13 +352,33 @@ export default {
           self.load(data);
         });
       }
-      this.disableUpload = this.model.lock;
-      if (!this.disableUpload && this.model.max && this.model.max > 0) {
-        if (this.model.getfileListLength() >= this.model.max) {
-          this.disableUpload = true;
+      self.disableUpload = self.model.lock;
+      if (!self.disableUpload && self.model.max && self.model.max > 0) {
+        if (self.model.getfileListLength() >= self.model.max) {
+          self.disableUpload = true;
         }
       }
+
+      this.$watch(
+        function () {
+          return JSON.stringify(this.model.fileList);
+        },
+        function (newStr) {
+          self.$nextTick(function () {
+            if (self.model.mediaViewPageType == 3) {
+              const { album } = self.buildMediaAlbum(
+                self.model.sourceList
+              );
+
+              const MediaAlbum = [album];
+              self.ChangeFileList(MediaAlbum, 0, 0);
+            }
+          });
+        }
+      );
     });
+
+
   },
   methods: {
     load(data) {
@@ -407,20 +428,46 @@ export default {
         return [];
       }
     },
+    buildMediaAlbum(sourceList, sourceFile, albumLabel) {
+      const label = (this.model && this.model.label) || '媒体';
+
+      // 过滤掉已删除的文件
+      const validFiles = sourceList.filter(item => item.flagDeleted !== true);
+
+      // 按 model.fileList 的顺序重新排序 validFiles
+      const orderedFiles = [];
+      if (this.model && this.model.fileList) {
+        this.model.fileList.forEach(fileItem => {
+          // fileItem.source 指向 sourceList 中的原始对象
+          if (fileItem.source && validFiles.includes(fileItem.source)) {
+            orderedFiles.push(fileItem.source);
+          }
+        });
+      }
+
+      // 构建相册对象
+      const album = {
+        albumName: label,
+        medias: orderedFiles.length ? orderedFiles : validFiles
+      };
+      const index = sourceFile ? album.medias.findIndex(v => v === sourceFile) : 0;
+
+      return { album, index };
+    },
     viewerfile(file) {
       var self = this;
-      var MediaAlbum = [{ albumName: this.model.label || "媒体", medias: [] }];
-
-      let fileList = this.model.sourceList.filter((item) => {
-        return item.flagDeleted !== true;
-      });
-      fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-      });
-      var index = MediaAlbum[0].medias.findIndex(
-        (v) => (v === file.source)
+      const { album, index } = this.buildMediaAlbum(
+        this.model.sourceList,
+        file.source,
+        this.model.label
       );
 
+      const MediaAlbum = [album];
+      if (self.model.mediaViewPageType == 3) {
+        this.ViewerFileToggle(true, MediaAlbum, 0, index);
+        return;
+      }
+
       if (self.model.moreActionRouter) {
         let submitData = {};
         submitData = self.model.form.self.getFileData(self.model.moreActionRouter);
@@ -923,6 +970,7 @@ export default {
       }
     }
   },
+
   beforeDestroy() {
     clearTimeout(this.qrtimer);
     if (this.timeoutHandle1) {