From c2f2c951fefd476aa4fddfe17dec85b2e04e1be3 Mon Sep 17 00:00:00 2001
From: "283591387@qq.com" <jxx>
Date: Sat, 6 Jan 2024 13:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99voltable,volupload=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/basic/VolTable.vue         | 27 ++++++++++++-------
 .../src/components/basic/VolUpload.vue        | 11 +++++---
 .../src/components/basic/VolTable.vue         | 27 ++++++++++++-------
 .../src/components/basic/VolUpload.vue        | 17 +++++++++---
 4 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/Vol.Vue3版本/src/components/basic/VolTable.vue b/Vol.Vue3版本/src/components/basic/VolTable.vue
index 1cec5817..2281d587 100644
--- a/Vol.Vue3版本/src/components/basic/VolTable.vue
+++ b/Vol.Vue3版本/src/components/basic/VolTable.vue
@@ -138,7 +138,10 @@
           <!-- 2021.09.21增加编辑时对readonly属性判断 -->
            <template v-else-if="column.edit&&!column.readonly&&['file', 'img','excel'].indexOf(column.edit.type) != -1" >
                 <div style="display:flex;align-items: center;" @click.stop>
-                  <i v-if="!column.showUpload||column.showUpload(scope.row, column)" style="padding: 3px;margin-right: 10px;color:#8f9293;cursor: pointer;" @click="showUpload(scope.row, column)" class="el-icon-upload"></i>     <template v-if="column.edit.type == 'img'">
+                  <i v-if="!column.showUpload||column.showUpload(scope.row, column)" 
+                  style="padding: 3px;margin-right: 10px;color:#8f9293;cursor: pointer;" 
+                  @click="showUpload(scope.row, column)" class="el-icon-upload"></i>    
+                   <template v-if="column.edit.type == 'img'">
                     <img
                     v-for="(file, imgIndex) in getFilePath(
                       scope.row[column.field],
@@ -146,7 +149,7 @@
                     )"
                     :key="imgIndex"
                     :onerror="defaultImg"
-                    @click="viewImg(scope.row, column, file.path, $event)"
+                    @click="viewImg(scope.row, column, file.path, $event,imgIndex)"
                     class="table-img"
                     :src="file.path"
                   />
@@ -468,7 +471,7 @@
         </div>
     </template>
   </VolBox>
-
+  <vol-image-viewer ref="viewer"></vol-image-viewer>
 </template>
 <script>
 import VolTableRender from './VolTable/VolTableRender';
@@ -490,10 +493,12 @@ export default defineComponent({
       }
     }
   },
-  components: { 'table-render': VolTableRender,
-  VolUpload: defineAsyncComponent(() =>import("@/components/basic/VolUpload.vue") ),
-  VolBox: defineAsyncComponent(() => import("@/components/basic/VolBox.vue")),
-},
+  components: {
+    'vol-image-viewer':defineAsyncComponent(() => import("./VolImageViewer.vue")),
+    'table-render': VolTableRender,
+    VolUpload: defineAsyncComponent(() =>import("./VolUpload.vue") ),
+    VolBox: defineAsyncComponent(() => import("./VolBox.vue")),
+  },
   props: {
     rowKey: {
       // 树形结构的主键字段，如果设置值默认会开启树形table；注意rowKey字段的值必须是唯一（2021.05.02）
@@ -1277,9 +1282,11 @@ export default defineComponent({
       }
       this.rowData.push(row);
     },
-    viewImg(row, column, url, $event) {
-      $event.stopPropagation();
-      this.base.previewImg(url);
+    viewImg(row, column, url, $event,index) {
+        $event.stopPropagation();
+        const imgs=  this.getFilePath(row[column.field], column).map(x=>{return x.path});
+        this.$refs.viewer.show(imgs,index);
+      //this.base.previewImg(url);
       // window.open(row[column.field]);
     },
     link(row, column, $e) {
diff --git a/Vol.Vue3版本/src/components/basic/VolUpload.vue b/Vol.Vue3版本/src/components/basic/VolUpload.vue
index d066389c..9ca8732c 100644
--- a/Vol.Vue3版本/src/components/basic/VolUpload.vue
+++ b/Vol.Vue3版本/src/components/basic/VolUpload.vue
@@ -81,12 +81,16 @@
       </div>
       <slot name="tip"></slot>
     </div>
+    <vol-image-viewer ref="viewer"></vol-image-viewer>
   </div>
 </template>
 <script>
 let OSS = require('ali-oss');
+import VolImageViewer from './VolImageViewer.vue';
 export default {
-  components: {},
+  components: {
+    'vol-image-viewer':VolImageViewer
+  },
   props: {
     desc: {
       //是否显示默认介绍
@@ -261,8 +265,9 @@ export default {
       return path.substring(_index + 1);
     },
     previewImg(index) {
-      //查看大图预览模式待完
-      this.base.previewImg(this.getImgSrc(this.files[index]));
+        const imgs= this.files.map(x=>{return this.getImgSrc(x)});
+        this.$refs.viewer.show(imgs,index);
+    //  this.base.previewImg(this.getImgSrc(this.files[index]));
       //  window.open(this.getImgSrc((this.files.length>0?this.files:this.fileInfo)[index]));
     },
     getSelector() {
diff --git a/开发版dev/Vol.Vue3版本/src/components/basic/VolTable.vue b/开发版dev/Vol.Vue3版本/src/components/basic/VolTable.vue
index 1cec5817..2281d587 100644
--- a/开发版dev/Vol.Vue3版本/src/components/basic/VolTable.vue
+++ b/开发版dev/Vol.Vue3版本/src/components/basic/VolTable.vue
@@ -138,7 +138,10 @@
           <!-- 2021.09.21增加编辑时对readonly属性判断 -->
            <template v-else-if="column.edit&&!column.readonly&&['file', 'img','excel'].indexOf(column.edit.type) != -1" >
                 <div style="display:flex;align-items: center;" @click.stop>
-                  <i v-if="!column.showUpload||column.showUpload(scope.row, column)" style="padding: 3px;margin-right: 10px;color:#8f9293;cursor: pointer;" @click="showUpload(scope.row, column)" class="el-icon-upload"></i>     <template v-if="column.edit.type == 'img'">
+                  <i v-if="!column.showUpload||column.showUpload(scope.row, column)" 
+                  style="padding: 3px;margin-right: 10px;color:#8f9293;cursor: pointer;" 
+                  @click="showUpload(scope.row, column)" class="el-icon-upload"></i>    
+                   <template v-if="column.edit.type == 'img'">
                     <img
                     v-for="(file, imgIndex) in getFilePath(
                       scope.row[column.field],
@@ -146,7 +149,7 @@
                     )"
                     :key="imgIndex"
                     :onerror="defaultImg"
-                    @click="viewImg(scope.row, column, file.path, $event)"
+                    @click="viewImg(scope.row, column, file.path, $event,imgIndex)"
                     class="table-img"
                     :src="file.path"
                   />
@@ -468,7 +471,7 @@
         </div>
     </template>
   </VolBox>
-
+  <vol-image-viewer ref="viewer"></vol-image-viewer>
 </template>
 <script>
 import VolTableRender from './VolTable/VolTableRender';
@@ -490,10 +493,12 @@ export default defineComponent({
       }
     }
   },
-  components: { 'table-render': VolTableRender,
-  VolUpload: defineAsyncComponent(() =>import("@/components/basic/VolUpload.vue") ),
-  VolBox: defineAsyncComponent(() => import("@/components/basic/VolBox.vue")),
-},
+  components: {
+    'vol-image-viewer':defineAsyncComponent(() => import("./VolImageViewer.vue")),
+    'table-render': VolTableRender,
+    VolUpload: defineAsyncComponent(() =>import("./VolUpload.vue") ),
+    VolBox: defineAsyncComponent(() => import("./VolBox.vue")),
+  },
   props: {
     rowKey: {
       // 树形结构的主键字段，如果设置值默认会开启树形table；注意rowKey字段的值必须是唯一（2021.05.02）
@@ -1277,9 +1282,11 @@ export default defineComponent({
       }
       this.rowData.push(row);
     },
-    viewImg(row, column, url, $event) {
-      $event.stopPropagation();
-      this.base.previewImg(url);
+    viewImg(row, column, url, $event,index) {
+        $event.stopPropagation();
+        const imgs=  this.getFilePath(row[column.field], column).map(x=>{return x.path});
+        this.$refs.viewer.show(imgs,index);
+      //this.base.previewImg(url);
       // window.open(row[column.field]);
     },
     link(row, column, $e) {
diff --git a/开发版dev/Vol.Vue3版本/src/components/basic/VolUpload.vue b/开发版dev/Vol.Vue3版本/src/components/basic/VolUpload.vue
index c986d99b..9ca8732c 100644
--- a/开发版dev/Vol.Vue3版本/src/components/basic/VolUpload.vue
+++ b/开发版dev/Vol.Vue3版本/src/components/basic/VolUpload.vue
@@ -81,12 +81,16 @@
       </div>
       <slot name="tip"></slot>
     </div>
+    <vol-image-viewer ref="viewer"></vol-image-viewer>
   </div>
 </template>
 <script>
 let OSS = require('ali-oss');
+import VolImageViewer from './VolImageViewer.vue';
 export default {
-  components: {},
+  components: {
+    'vol-image-viewer':VolImageViewer
+  },
   props: {
     desc: {
       //是否显示默认介绍
@@ -261,8 +265,9 @@ export default {
       return path.substring(_index + 1);
     },
     previewImg(index) {
-      //查看大图预览模式待完
-      this.base.previewImg(this.getImgSrc(this.files[index]));
+        const imgs= this.files.map(x=>{return this.getImgSrc(x)});
+        this.$refs.viewer.show(imgs,index);
+    //  this.base.previewImg(this.getImgSrc(this.files[index]));
       //  window.open(this.getImgSrc((this.files.length>0?this.files:this.fileInfo)[index]));
     },
     getSelector() {
@@ -438,6 +443,10 @@ export default {
               x.data.bucketFolder + '/' + x.data.unique + file.name,
               file
             );
+            // 如果有配置cdn，返回的url需要拼接cdn
+            if ( window.oss.ali.cdn) {
+              result.url = new URL( x.data.bucketFolder + '/' + x.data.unique + file.name, window.oss.ali.cdn).toString();
+            }
             file.path = result.url;
             file.newName = x.data.unique + file.name;
           }
@@ -884,4 +893,4 @@ export default {
     background: #101010;
   }
 }
-</style>
\ No newline at end of file
+</style>