Quellcode durchsuchen

ex文件保护选人

liuQiang vor 1 Jahr
Ursprung
Commit
cdbe552326

+ 42 - 22
src/components/OnlyOffice/index.vue

@@ -4,6 +4,7 @@
 </template>
 
 <script>
+import { toRaw } from "vue";
 import { listVersion } from "@/api/biz/version";
 import { users } from "@/api/biz/info";
 export default {
@@ -80,46 +81,65 @@ export default {
 		// 	})
     // },
     onRequestUsers(event) {
-			users(this.docId).then(response => {
-				const users=new Array();
-				response.data.forEach((item,index)=>{
-					users.push({
+			// users(this.docId).then(response => {
+			// 	const users=new Array();
+			// 	response.data.forEach((item,index)=>{
+			// 		users.push({
+			// 				email:item.deptName,
+			// 				id: item.userId,
+			// 				name: item.userName
+			// 			})
+			// 	})
+				const users = toRaw(this.usersArr)
+       const curUsers =  users.map(item=>{
+          return {
 							email:item.deptName,
 							id: item.userId,
 							name: item.userName
-						})
-				})
-				
+						}
+        })
 				this.docEditor.setUsers({
 				  c: event.data.c,
-				  users: this.usersArr
+				  users: curUsers
 				})
-        // console.log('usersArr',this.usersArr);
-			})
+        // console.log('usersArr',users);
+        // console.log('this.docEditor',this.docEditor);
+			// })
     },
 		
     onRequestHistory() {
-			listVersion({ pageNum: 1, pageSize: 10000, docId: this.docId }).then(response => {
-				const his=new Array();
-				response.rows.forEach((item,index)=>{
-					his.push({
+			// listVersion({ pageNum: 1, pageSize: 10000, docId: this.docId }).then(response => {
+			// 	const his=new Array();
+			// 	response.rows.forEach((item,index)=>{
+			// 		his.push({
+			// 				created: item.createTime,
+			// 				key: item.fileId,
+			// 				user: {
+			// 					name: item.createBy
+			// 				},
+			// 				version: item.fileId
+			// 			})
+			// 	})
+				// this.docEditor.refreshHistory({
+				// 	currentVersion: 1,
+				// 	history: his
+				// })
+        const his = toRaw(this.hisArr)
+        const curHis =  his.map(item=>{
+          return {
 							created: item.createTime,
 							key: item.fileId,
 							user: {
 								name: item.createBy
 							},
 							version: item.fileId
-						})
-				})
-				// this.docEditor.refreshHistory({
-				// 	currentVersion: 1,
-				// 	history: his
-				// })
+						}
+        })
         this.docEditor.refreshHistory({
 					currentVersion: 1,
-					history: this.hisArr
+					history: curHis
 				})
-			})	
+			// })	
 		},
     onRequestHistoryData(event) {
 			console.log(event);

+ 25 - 1
src/views/myfile/modalComponebts/CreateFloder.vue

@@ -142,7 +142,8 @@ export default {
                         })
                         return
                     }
-                    documents.addDocument(
+                    if(boserForm.value.useTemp == 'N'){
+                        documents.addDocument(
                         {
                             "dirName": boserForm.value.dirName,
                             "parentId": drId - 0,
@@ -162,6 +163,29 @@ export default {
                         emit("getChildrenC", addBoser.value)
                         props.getFirstFolder()
                     })
+                    }else{
+                        documents.addDocumentByTemp(
+                        {
+                            "dirName": boserForm.value.dirName,
+                            "parentId": drId - 0,
+                            "spaceId": spId - 0,
+                            "isEncrypt":boserForm.value.isEncrypt,
+                            "encryptLevel":boserForm.value.isEncrypt == "Y"?boserForm.value.encryptLevel:null,
+                            "accessCode":boserForm.value.accessCode?sm3(boserForm.value.accessCode):''
+                        },tempId.value
+                    ).then(res => {
+                        if (res.code === 200) {
+                            ElMessage({
+                                message: '添加一级目录成功',
+                                type: 'success',
+                            })
+                        }
+                        addBoser.value = false
+                        emit("getChildrenC", addBoser.value)
+                        props.getFirstFolder()
+                    })
+                    }
+                    
                     console.log('1111', 1111)
                 } else {  //二级目录
                     let query = {}

+ 2 - 2
src/views/sms/record/index.vue

@@ -30,7 +30,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
             type="primary"
             plain
@@ -39,7 +39,7 @@
             v-hasPermi="['sms:record:add']"
         >新增
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
             type="success"