跟新进度 2020 12 1

VSSCMP_WEB/src/pages/education/schoolBasedResources/folderManage/Index.vue

@@ -223,11 +223,13 @@ export default {
                     this.menuMode = 'personal'
                 }
                 this.rightMenuData = row
+                console.log(111111111111, this.rightMenuData)
                 // this.rightMenuFolder = []
             } else {
                 // 右键空白处
                 this.menuMode = 'blank'
                 this.rightMenuData = this.breadcrumb[this.breadcrumb.length - 1].parent
+                console.log(22222222, this.rightMenuData)
             }
             this.menuVisible = false
             this.menuVisible = true

VSSCMP_WEB/src/pages/education/schoolBasedResources/folderManage/components/ManageCtxMenu.vue

@@ -6,7 +6,7 @@
             <li class="menu_item padding_35" v-show="menuMode !== 'blank'" @click="clickFile">打开</li>
             <li class="menu_item padding_35" v-show="menuMode !== 'blank' && !currentIsFiLe" @click="handleEdit">编辑</li>
             <li class="menu_item padding_35" v-show="menuMode !== 'blank' && !currentIsFiLe" @click="deleteVisible = true">删除</li>
-            <li class="menu_item" style="text-align:center" v-show="menuMode === 'blank' && !currentIsFiLe" @click="newFolderVisible = true">新建文件夹</li>
+            <li class="menu_item" style="text-align:center" v-show="menuMode === 'blank' && !currentIsFiLe" @click="prepareCreate">新建文件夹</li>
         </ul>
         <!-- <ul class="menu" style='width:230px'  v-show="menuMode === 'blank' && currentIsFiLe">
             <li class="menu_item" style="text-align:center">合并所有文档到新文件夹</li>
@@ -165,13 +165,13 @@ export default {
                 usual: '常规文件夹是专门用来放置学校常规资源，不限制上传浇水，不限制上传文档数量，建好后可以一直使用。',
                 task: '任务文件夹是收集任务式的资源，有明确的上传教师范围，有明确的篇数要求，一般都是针对一个学期的文件夹。'
             },
+            folderIsEdit: false, // 文件夹操作是否是编辑状态? false: 新建文件夹状态， true：编辑文件夹状态
             ruleForm: {
                 name: '',
                 folderType: 'usual',
                 private: 'private',
                 limitCount: 'limit',
                 limitCountNumber: 0,
-                uploadCount: '',
                 publicTeacher: [],
                 manager: [],
                 uploadTeacher: []
@@ -222,10 +222,17 @@ export default {
             let params = { b_id: this.rightMenuData.b_id }
             this.$api.schoolBasedResourcesApi.getSchoolFolderInfo(params).then(res => {
                 this.$handleResponse(res).then(data => {
-                    console.log(data)
+                    this.folderIsEdit = true
+                    this.initEditForm(data)
+                    this.newFolderVisible = true
                 })
             })
         },
+        prepareCreate () {
+            this.folderIsEdit = false
+            this.clearFormData()
+            this.newFolderVisible = true
+        },
         hanlderCreateOrUpdate (formName) {
             /* 新建或修改学校文件夹 */
             this.$refs[formName].validate((valid) => {
@@ -239,9 +246,9 @@ export default {
                     let uploadTeacher = this.userListToString(form.uploadTeacher)
                     let uploadCount = folderType === 1 ? 0 : (form.limitCount === 'limit' ? 1 : 2)
                     data = {
-                        b_id: undefined,
-                        parent_id: this.rightMenuData.b_id,
-                        step_number: this.rightMenuData.step_number + 1 || 1,
+                        b_id: this.folderIsEdit ? this.rightMenuData.b_id : undefined,
+                        parent_id: this.folderIsEdit ? this.rightMenuData.parent_id : this.rightMenuData.b_id,
+                        step_number: this.folderIsEdit ? this.rightMenuData.step_number : (this.rightMenuData.step_number + 1 || 1),
                         folder_name: form.name,
                         folder_type: folderType,
                         is_public: isPublic,
@@ -249,19 +256,21 @@ export default {
                         public_user_names: isPublic === 3 ? publicTeacher.userNames : undefined,
                         manage_user_ids: manager.userIds,
                         manage_user_names: manager.userNames,
-                        upload_count: uploadCount,
+                        upload_type: uploadCount,
                         limit_count: uploadCount === 1 ? parseInt(form.limitCountNumber) : undefined,
                         teacher_user_ids: folderType === 2 ? uploadTeacher.userIds : undefined,
                         teacher_user_names: folderType === 2 ? uploadTeacher.userNames : undefined
                     }
+                    console.log(data, this.rightMenuData)
                     this.$emit('createOrUpdateFolder', data)
                 } else {
-                    console.log('error submit!!')
+                    console.log('提交参数有误!!')
                     return false
                 }
             })
         },
         userListToString (userList) {
+            /* 把分享用户数组转为字符串 */
             let data = {
                 userIds: '',
                 userNames: ''
@@ -277,6 +286,16 @@ export default {
             }
             return data
         },
+        stringToUserList (ids, names) {
+            /* 把分享用户字符串转为数组 */
+            let idsStr = ids.split(',')
+            let namesStr = names.split(',')
+            let userList = []
+            for (let i = 0; i < idsStr.length; i++) {
+                userList.push({ id: idsStr[i], realname: namesStr[i] })
+            }
+            return userList
+        },
         handleDelete () {
             /* 删除学校文件夹 */
             let data = {}
@@ -286,6 +305,31 @@ export default {
                 }
                 this.$emit('handleDeleteFolder', data)
             }
+        },
+        initEditForm (data) {
+            /* 根据获取的文件夹对象数据改变对应的form表单的值 */
+            let ruleForm = this.ruleForm
+            ruleForm.name = data.folder_name
+            ruleForm.folderType = data.folder_type === 1 ? 'usual' : 'task'
+            ruleForm.private = data.is_public === 1 ? 'private' : (data.is_public === 2 ? 'publicToAll' : 'publickToPart')
+            ruleForm.limitCount = data.upload_type === 2 ? 'noLimit' : 'limit'
+            ruleForm.limitCountNumber = data.limit_count || 0
+            ruleForm.publicTeacher = data.public_user_ids ? this.stringToUserList(data.public_user_ids, data.public_user_names) : []
+            ruleForm.manager = data.manage_user_ids ? this.stringToUserList(data.manage_user_ids, data.manage_user_names) : []
+            ruleForm.uploadTeacher = data.teacher_user_ids ? this.stringToUserList(data.teacher_user_ids, data.teacher_user_names) : []
+        },
+        clearFormData () {
+            /* 初始化表单数据 */
+            this.ruleForm = {
+                name: '',
+                folderType: 'usual',
+                private: 'private',
+                limitCount: 'limit',
+                limitCountNumber: 0,
+                publicTeacher: [],
+                manager: [],
+                uploadTeacher: []
+            }
         }
     }
 }

VSSCMP_WEB/src/pages/education/schoolBasedResources/myResources/components/MyuploadCtxMenu.vue

@@ -181,14 +181,15 @@ export default {
             this.userSelector.list = list
         },
         handleShare () {
+            /* 分享 */
             let userList = this.userSelector.list
-            if (userList.length === 0) {
-                this.$message({
-                    message: '分享名单不能为空',
-                    type: 'error'
-                })
-                return
-            }
+            // if (userList.length === 0) {
+            //     this.$message({
+            //         message: '分享名单不能为空',
+            //         type: 'error'
+            //     })
+            //     return
+            // }
             let fileInfoId = this.rightMenuData.file_info_id
             let teacherUserIds = ''
             let teacherUserNames = ''