归档，重命名长度限制，二级文件权限，dpset预览编辑,

src/views/department/MyFile.vue

@@ -1361,10 +1361,10 @@ export default {
         }
         //对mouseCli数组进行筛选，实现菜单的区分显示
         const filterMouseCli = () => {
-            const canPreviewArray = ['.doc','dps','et','.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
+            const canPreviewArray = ['.doc','.dps','.et','.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
             const typeArr = ['.png', '.jpg', '.jpeg', '.JPG', '.mp3', '.mp4']
             const imgTypeArr = ['.png', '.jpg', '.jpeg', '.JPG']
-            const canEditArr = ['.doc', 'dps','et','.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp','.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.pptx']
+            const canEditArr = ['.doc', '.dps','.et','.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp','.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.pptx']
             let arr = []
             if (!(typeArr.includes(copyFileType.value) || canPreviewArray.includes(copyFileType.value))) {
                 arr = mouseCli.value.filter(item => item.name !== "预览")

src/views/department/modalComponebts/CreateFloder.vue

@@ -13,18 +13,18 @@
                         </el-radio-group>
                     </el-form-item>
                    <template v-if="(boserForm.dirType === 2 || thisType.dirType == '2')">
-                    <template v-if="!upFolderData">
-                        <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
-                            <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
-                        </el-form-item>
-                        <el-form-item label="加密等级" v-if=" (!FolderRole.levelCode || free) && boserForm.isEncrypt === 'Y'">
-                            <el-radio-group v-model="boserForm.encryptLevel">
-                                <el-radio :label="item.levelCode" v-for="item in levelList" :key="item">{{item.levelName}}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </template>
+                        <template v-if="!upFolderData">
+                            <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
+                                <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
+                            </el-form-item>
+                            <el-form-item label="加密等级" v-if=" (!FolderRole.levelCode || free) && boserForm.isEncrypt === 'Y'">
+                                <el-radio-group v-model="boserForm.encryptLevel">
+                                    <el-radio :label="item.levelCode" v-for="item in levelList" :key="item">{{item.levelName}}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </template>
                         <template v-if="thisRole.length<1 || free">
-                            <el-form-item label="成员权限">
+                            <el-form-item v-if="!FolderRole.levelCode || free" label="成员权限">
                                 <el-checkbox-group v-model="boserForm.memberRoles">
                                     <el-checkbox v-for="item in dir_rules" :key="item.value"  :label="item.value">{{item.label}}</el-checkbox>
                                 </el-checkbox-group>

src/views/department/modalComponebts/FolderReName.vue

@@ -2,7 +2,7 @@
     <div>
         <div>
             <el-dialog v-model="folderName" title="重命名" width="30%">
-                <el-input v-model="newName"></el-input>
+                <el-input v-model="newName" maxlength="10"></el-input>
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="backToFile">取消</el-button>

src/views/myfile/MyFile.vue

@@ -1441,6 +1441,7 @@ export default {
         }
         function getCback(data) {
             thanks.value = data
+            refreshFile()
         }
         function getChildrenC(data) {
             folderCase.value = data
@@ -1496,10 +1497,10 @@ export default {
         }
         //对mouseCli数组进行筛选，实现菜单的区分显示
         const filterMouseCli = () => {
-            const canPreviewArray = ['.doc','dps','et', '.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
+            const canPreviewArray = ['.doc','.dps','.et', '.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
             const typeArr = ['.png', '.jpg', '.jpeg', '.JPG', '.mp3', '.mp4']
             const imgTypeArr = ['.png', '.jpg', '.jpeg', '.JPG','.PNG']
-            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','dps','et', '.pptx']
+            const canEditArr = ['.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.dps','.et', '.pptx']
             let arr = []
             if (!(typeArr.includes(copyFileType.value) || canPreviewArray.includes(copyFileType.value))) {
                 arr = mouseCli.value.filter(item => item.name !== "预览")

src/views/myfile/modalComponebts/FolderReName.vue

@@ -2,7 +2,7 @@
     <div>
         <div>
             <el-dialog v-model="folderName" title="重命名" width="30%">
-                <el-input v-model="newName"></el-input>
+                <el-input v-model="newName" maxlength="10"></el-input>
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="backToFile">取消</el-button>

src/views/myjoin/MyJoin.vue

@@ -9,7 +9,7 @@
                             <!-- <el-button @click="newFileAdd">新建文件</el-button> -->
                         </div>
                         <div>
-                            <el-table @row-contextmenu="handleRowClick" :data="myEjoy" style="width: 100%;cursor: pointer;" @row-click="rowClickFN">
+                            <el-table @row-contextmenu="handleRowClick" :data="myEjoy" style="width: 100%;cursor: pointer;" @row-click="rowJoinClickFN">
                                 <!-- <el-table-column type="selection" width="55" /> -->
                                 <el-table-column label="名称" width="200">
                                     <template #default="scope">
@@ -44,7 +44,7 @@
                         </div>
                     </el-tab-pane>
                     <el-tab-pane label="我参与的" name="second">
-                        <el-table :data="myPack" style="width: 100%;cursor: pointer;" @row-click="rowClickFN">
+                        <el-table :data="myPack" style="width: 100%;cursor: pointer;" @row-click="rowJoinClickFN">
                             <!-- <el-table-column type="selection" width="55" /> -->
                             <el-table-column label="名称" width="200">
                                 <template #default="scope">
@@ -98,6 +98,7 @@ import FileEdit from "@/views/myfile/components/FileEdit.vue";
 import { ElMessage } from 'element-plus';
 import archiveTray from "@/assets/images/archiveTray.png";
 import {documentation}from "@/api/biz/actor.js"
+import {getInfo}from "@/api/biz/info.js"
 export default {
     setup() {
         const activeName = ref('first')
@@ -124,13 +125,28 @@ export default {
             }
         ])
         const rowClickFN = (row,col,e)=>{
-            console.log('row',row);
+            // console.log('row',row);
             thisLClickRow.value = row
             clickRowId.value = row.docId
             copyRow.value = toRaw(row)
             addFileTab(copyRow.value,1);
             // showEdit.value = true
         }
+        const rowJoinClickFN = (row,col,e)=>{
+            console.log('row',row);
+            getInfo(row.docId).then((res)=>{
+                    // console.log('res',res);
+                    row = res.data
+                    if(row.isFiled === "Y"){
+                        return ElMessage({ message: '该文件已归档 不可再次编辑', type: 'error' })
+                    }
+                    thisLClickRow.value = row
+                    clickRowId.value = row.docId
+                    copyRow.value = toRaw(row)
+                    addFileTab(copyRow.value,1);
+                })
+            
+        }
         function getCountPeople() {
             fileCount.myCount({}).then(res => {
                 myEjoy.value = res.rows
@@ -213,6 +229,7 @@ export default {
                             type: "success",
                             message: "成功归档"
                         })
+                        getCountPeople()
                 }
                 cliCC.value = false
             }
@@ -253,7 +270,8 @@ export default {
             archiveTray,
             closeRMenu,
             cliCC,
-            chooseSet
+            chooseSet,
+            rowJoinClickFN
         }
     },
     components:{

src/views/publicment/MyFile.vue

@@ -154,7 +154,7 @@
                         </div>
                         <!-- 右侧 -->
                         <div>
-                            <img :src="sort" alt="">file-title
+                            <img :src="sort" alt="">
                             <!-- //控制宫格展示 -->
                             <img
                               v-if="fileGrid"
@@ -1362,10 +1362,10 @@ export default {
         }
         //对mouseCli数组进行筛选，实现菜单的区分显示
         const filterMouseCli = () => {
-            const canPreviewArray = ['.doc','dps','et','.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
+            const canPreviewArray = ['.doc','.dps','.et','.wps', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.pdf', '.rtf', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp', '.pot', '.potm', '.potx', '.pps', '.ppsm', '.ppsx', '.ppt', '.pptm', '.pptx']
             const typeArr = ['.png', '.jpg', '.jpeg', '.JPG', '.mp3', '.mp4']
             const imgTypeArr = ['.png', '.jpg', '.jpeg', '.JPG']
-            const canEditArr = ['.doc', 'dps','et','.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp','.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.pptx']
+            const canEditArr = ['.doc', '.dps','.et','.docm', '.docx', '.dot', '.dotm', '.dotx', '.txt', '.djvu', '.xps', '.csv', '.fods', '.ods', '.ots', '.xls', '.xlsm', '.xlsx', '.xlt', '.xltm', '.xltx', '.fodp', '.odp', '.otp','.doc', '.docm', '.docx', '.dot', '.dotm', '.dotx', '.epub', '.fodt', '.htm', '.html', '.mht', '.odt', '.ott', '.rtf', '.txt', '.djvu', '.xps', '.wps','.pptx']
             let arr = []
             if (!(typeArr.includes(copyFileType.value) || canPreviewArray.includes(copyFileType.value))) {
                 arr = mouseCli.value.filter(item => item.name !== "预览")

src/views/publicment/modalComponebts/CreateFloder.vue

@@ -13,18 +13,18 @@
                         </el-radio-group>
                     </el-form-item>
                    <template v-if="boserForm.dirType === 2 || thisType.dirType == '2'">
-                     <template v-if="!upFolderData">
-                        <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
-                            <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
-                        </el-form-item>
-                        <el-form-item label="加密等级" v-if=" (!FolderRole.levelCode || free) && boserForm.isEncrypt === 'Y'">
-                            <el-radio-group v-model="boserForm.encryptLevel">
-                                <el-radio :label="item.levelCode" v-for="item in levelList" :key="item">{{item.levelName}}</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
-                    </template>
+                        <template v-if="!upFolderData">
+                            <el-form-item label="是否加密" v-if="!FolderRole.levelCode || free">
+                                <el-switch v-model="boserForm.isEncrypt" active-value="Y" inactive-value="N" />
+                            </el-form-item>
+                            <el-form-item label="加密等级" v-if=" (!FolderRole.levelCode || free) && boserForm.isEncrypt === 'Y'">
+                                <el-radio-group v-model="boserForm.encryptLevel">
+                                    <el-radio :label="item.levelCode" v-for="item in levelList" :key="item">{{item.levelName}}</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </template>
                         <template v-if="thisRole.length<1 || free">
-                            <el-form-item label="成员权限">
+                            <el-form-item v-if="!FolderRole.levelCode || free" label="成员权限">
                                 <el-checkbox-group v-model="boserForm.memberRoles">
                                     <el-checkbox v-for="item in dir_rules" :key="item.value"  :label="item.value">{{item.label}}</el-checkbox>
                                 </el-checkbox-group>

src/views/publicment/modalComponebts/FolderReName.vue

@@ -2,7 +2,7 @@
     <div>
         <div>
             <el-dialog v-model="folderName" title="重命名" width="30%">
-                <el-input v-model="newName"></el-input>
+                <el-input v-model="newName" maxlength="10"></el-input>
                 <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="backToFile">取消</el-button>