Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

components.d.ts

@@ -24,6 +24,7 @@ declare module 'vue' {
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCheckTag: typeof import('element-plus/es')['ElCheckTag']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElDialog: typeof import('element-plus/es')['ElDialog']
@@ -39,6 +40,7 @@ declare module 'vue' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
     ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']

src/services/ConfigService.ts

@@ -168,6 +168,11 @@ class ConfigService{
         return Api.Post("triptemplate_RemoveTripShare",msg)
     }
 
+    static async RemoveFileShareAsync(FileIdList:number[]):Promise<HttpResponse>{
+        let msg = {FileIdList}
+        return Api.Post("triptemplate_RemoveTripShareBatch",msg)
+    }
+
     static async UpdateShareAsync(params:{ShareId:number,ShareTargetIds:string,EditType:string}):Promise<HttpResponse>{
         return Api.Post("triptemplate_EditTripShare",params)
     }

src/views/SellTemplate/components/journeyAds.vue

@@ -109,11 +109,11 @@
                       :style="{'opacity':item.singleChoice?1:''}">
                       <el-checkbox size="sm" class="SelectAllBox" v-model="item.singleChoice"
                       @click.stop="singleChoice(item)"/></div></td>
-                  <td style="width: 30px;" @click.stop="item.FileType?OffEdit():editDelete(item,2)">
-                      <img v-if="item.FileType" class="q-px-md" :src="item.FileType==1?datas.pdfImg:datas.adsImg" 
-                      style="height: 25px;" />
-                      <img v-else class="q-px-md" src="@/assets/img/file.png" 
-                      style="height: 23px;" />
+                  <td style="width: 30px;" @click.stop="item.FileType?OffEdit():editDelete(item,2)" valign="middle" >
+                      <div :class="{'share-icon-box':item.IsShare}" style="display: inline-block;">
+                        <img v-if="item.FileType" class="q-px-md " :src="item.FileType==1?datas.pdfImg:datas.adsImg" style="height: 25px;" />
+                        <img v-else class="q-px-md" src="@/assets/img/file.png" style="height: 23px;" />
+                      </div>
                   </td>
                   <td class="journeyAds-title wrap row">
                       <div class="col" v-if="!item.editTitle" @click.stop="item.FileType?OffEdit():editDelete(item,2)">
@@ -149,7 +149,8 @@
                               <el-dropdown-menu class="q-pa-md" @click.stop="OffEdit">
                                 <el-dropdown-item v-if="item.FileType" icon="EditPen" @click.stop="startEditTitle(item)">重命名</el-dropdown-item>
                                 <el-dropdown-item v-if="item.FileType" icon="Clock" @click.stop="history(item)">历史版本</el-dropdown-item>
-                                <el-dropdown-item v-if="item.FileType" icon="Position" @click.stop="()=>shareId=item.FileId">分享</el-dropdown-item>
+                                <el-dropdown-item icon="Position" @click.stop="()=>shareId=item.FileId">分享</el-dropdown-item>
+                                <el-dropdown-item v-if="item.IsShare" icon="Hide" @click.stop="removeShareHandler(item)">取消分享</el-dropdown-item>
                                 <el-dropdown-item icon="Expand" @click.stop="MoveFile(item)">移动至</el-dropdown-item>
                               <el-dropdown-item icon="Delete" @click="editDelete(item,1)">删除</el-dropdown-item>
                             </el-dropdown-menu>
@@ -191,7 +192,7 @@
   <ShareForm
     :id="shareId"
     v-if="shareId > 0"
-    @close="() => (shareId = 0)"
+    @close="() => (shareId = 0,refreshHandler())"
   ></ShareForm>
   <Folder
     :folder-id="folderObj?.id"
@@ -236,6 +237,7 @@ import Folder from "./Folder.vue";
 import HistoricalVersion from "./HistoricalVersion.vue";
 import TreeFile from "./TreeFile.vue";
 import breadPeeling from "./breadPeeling.vue";
+import { ApiResult } from "@/configs/axios";
 
 const SalesEditorStore = useSellTemplateStore();
 const marketStore = useScreenStore();
@@ -260,6 +262,7 @@ const NewDataList = ref([] as Array<any>);
 const searchData = ref({} as any);
 searchData.value = inject(injectKeyTemplate);
 const deleteLoading = ref<any>(null);
+const removeShareLoading = ref<any>(null);
 const datas = reactive({
   Sort: 0,
   selectedDatas: [] as Array,
@@ -424,6 +427,32 @@ const startEditTitle = (row: any) => {
   editObj.value = JSON.parse(JSON.stringify(row));
 };
 
+const removeShareHandler= async (item:any) =>{
+  if(removeShareLoading.value) return
+  removeShareLoading.value=ElLoading.service({
+    lock: true,
+    text: "正在处理",
+  })
+  let errmsg=''
+  try {
+      let response = await ConfigService.RemoveFileShareAsync([item.FileId])
+      if(response.data.resultCode==ApiResult.SUCCESS){
+          ElMessage.success({
+              message:'设置成功'
+          })
+          item.IsShare=false
+      } else errmsg='取消分享失败，请刷新重试'
+  } catch (error) {
+      errmsg = '取消分享失败，请刷新重试'
+  }
+  if(errmsg!='') {
+      ElMessage.error({
+          message:errmsg
+      })
+  }
+  removeShareLoading.value.close();
+  removeShareLoading.value = null;
+}
 
 // 全选按钮
 const clickSelectAll = () => {
@@ -740,6 +769,20 @@ querySearchHandler();
 .journeyAdsple-table:hover .hoverShow {
   opacity: 1;
 }
+.share-icon-box{
+  position: relative;
+}
+.share-icon-box::after{
+  display: block;
+  position: absolute;
+  bottom: -4px;
+  right: 6px;
+  content: " ";
+  background: url('../../../assets/img/share.png');
+  width: 14px;
+  height: 14px;
+  z-index: 2;
+}
 .active {
   color: $themeColor;
 }