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

src/views/SellTemplate/components/CopyFile.vue

@@ -56,7 +56,7 @@
             
         </template>
         
-        <div class="TreeFile-container" @click="OffEdit">
+        <div class="TreeFile-container" @click="!type?OffEdit:''">
             <el-tree-select
             placeholder="请选择文件"
             node-key="FileId"
@@ -67,7 +67,7 @@
             check-strictly
             :render-after-expand="false"
             style="width: 220px"
-            :filter-node-method="filterNode"
+            filterable
             @check="handleTreeNodeClick"
             />
             
@@ -154,10 +154,6 @@ import ConfigService from "@/services/ConfigService";
             datas.FolderObj = data
         }
     }
-    const filterNode = (value: string, data: Tree) => {
-        if (!value) return true
-        return data.FileName.includes(value)
-    }
     const save = () => {
         let title = props.details.FileName
         if(props.type) title = props.type==1?'另存':'替换'
@@ -229,7 +225,7 @@ import ConfigService from "@/services/ConfigService";
         } else {
             ElMessage({
                 showClose: true,
-                message: `移动文件${props.details.FileType?'':'夹'}失败`,
+                message: `复制文件${props.details.FileType?'':'夹'}失败`,
                 type: "warning",
             });
         }

src/views/SellTemplate/components/TreeFile.vue

@@ -60,7 +60,7 @@
             check-strictly
             :render-after-expand="false"
             style="width: 220px"
-            :filter-node-method="filterNode"
+            filterable
             @check="handleTreeNodeClick"
             />
             

src/views/SellTemplate/components/journeyAdsList.vue

@@ -105,7 +105,7 @@
 import { ApiResult } from '@/configs/axios';
 import OrgService from '@/services/OrgService';
 import { ref,reactive,watch,inject,nextTick } from 'vue';
-import { View,Download,EditPen,Delete,Star } from '@element-plus/icons-vue';
+import { Edit,View,Download,EditPen,Delete,Star } from '@element-plus/icons-vue';
 import { ElMessage,ElTree,ElLoading, ElMessageBox } from 'element-plus';
 
 import ConfigService from "@/services/ConfigService";