Browse Source

收藏标签限制,复制默认选择

liuQiang 1 year ago
parent
commit
7d15446e1d

+ 10 - 5
src/views/collect/index.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="topPath">
       <!-- <el-icon><ArrowDown /></el-icon> -->
-      <span @click="backTopPath">最近文件</span>
+      <span @click="backTopPath">收藏文件</span>
       <PathLabel
         @folderClick="folderClick"
         :pathLabelData="pathLabelData"
@@ -37,8 +37,8 @@
                   v-model="changeTabName"
                   size="mini"
                   @blur="reTabName"
-                  maxlength="32"
-                  placeholder="请输入不多于32位字符"
+                  maxlength="5"
+                  placeholder="请输入不多于5位字符"
                   :autofocus="true"
                 ></el-input>
               </div>
@@ -58,8 +58,8 @@
               v-model="tabName"
               size="mini"
               @change="addCollectFn"
-              maxlength="32"
-              placeholder="请输入不多于32位字符"
+              maxlength="5"
+              placeholder="请输入不多于5位字符"
               :autofocus="true"
             ></el-input>
           </div>
@@ -599,6 +599,11 @@ const addCollectFn = async () => {
   }
 
   const list = toRaw(tabList.value);
+  if(list.length>=10){
+     isAddCollect.value = false;
+    tabName.value = "";
+    return ElMessage.error("已到最大数量,请先删除其他收藏标签!")
+  }
   let order = 0;
   if (list.length > 0) {
     order = getBigOrder(list);

+ 11 - 2
src/views/department/modalComponebts/FileCollect.vue

@@ -8,7 +8,7 @@
                     </el-form-item>
                     <el-form-item label="收藏标签">
                         <div class="newTag" v-if="tagCollect">
-                            <el-input v-model="newTag" placeholder="请输入新标签" @blur="tagBlur"></el-input>
+                            <el-input v-model="newTag" placeholder="请输入新标签" maxlength="5" @blur="tagBlur"></el-input>
                         </div>
                         <el-select v-model="collectForm.folders" class="m-2" placeholder="请选择" size="large"
                             @change="collectChange">
@@ -35,6 +35,13 @@
 import { ref, onMounted, toRef } from "vue"
 import { ElMessage } from "element-plus"
 import collect from "../../../api/collect/collect"
+import {
+  listLabel,
+  addLabel,
+  delLabel,
+  updateLabel,
+  sortLabel,
+} from "@/api/biz/label.js";
 export default {
     props: {
         collects: {
@@ -78,11 +85,13 @@ export default {
             fileCollect.value = result
             collectForm.value.name = fname
         }
-        function tagBlur() {
+        async function tagBlur() {
             if(!newTag.value){
                 ElMessage({ message: '标签名不能为空', type: 'error' })
                 return
             }
+            const res = await listLabel();
+            if(res.rows.length >= 10) return ElMessage.error("已到最大数量,请先删除其他收藏标签!")
             collect.addNewTag({ labelName: newTag.value, orderNum: sortNum.value + 1 }).then(res => {
                 if (res.code === 200) {
                     ElMessage({

+ 4 - 4
src/views/myfile/components/FileTree.vue

@@ -2,7 +2,7 @@
     <div>
         <el-dialog v-model="treeOpen" :title="options" width="30%" :close-on-click-modal="false">
               <!-- <el-tree v-if="!changeMes"  :data="thisFoder"  :props="defaultProps"  highlight-current :current-node-key="dirIds" node-key='id' @node-click="handleNodeClick" /> -->
-              <div v-if="!changeMes" class="topspan" :class="{'alive':dirIds ==thisFoder.id}"  @click="handleNodeClick">{{thisFoder.label}}</div>
+              <div v-if="!changeMes" class="topspan" :class="{'alive':dirIds ==thisFoder.id}"  @click="handleNodeClick(null)">{{thisFoder.label}}</div>
             <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick" />
             <template #footer>
                 <span class="dialog-footer">
@@ -100,12 +100,12 @@ export default {
             emit("getChildren", treeOpen.value)
         }
         function handleNodeClick(data) {
-            // console.log('1',thisFoder.value);
+        //    console.log('data',data);
             if(data){
-
                 dirIds.value = data.id
             }else{
-                dirIds.value = thisFoder.value.id
+                // console.log('1',props.thisFolder);
+                dirIds.value = props.thisFolder
             }
             // console.log('dirIds.value',dirIds.value);
         }

+ 7 - 2
src/views/myfile/modalComponebts/FileCollect.vue

@@ -8,7 +8,7 @@
                     </el-form-item>
                     <el-form-item label="收藏标签">
                         <div class="newTag" v-if="tagCollect">
-                            <el-input v-model="newTag" placeholder="请输入新标签" maxlength="10" @blur="tagBlur"></el-input>
+                            <el-input v-model="newTag" placeholder="请输入新标签" maxlength="5" @blur="tagBlur"></el-input>
                         </div>
                         <el-select v-model="collectForm.folders" class="m-2" placeholder="请选择" size="large"
                             @change="collectChange">
@@ -35,6 +35,9 @@
 import { ref, onMounted, toRef } from "vue"
 import { ElMessage } from "element-plus"
 import collect from "../../../api/collect/collect"
+import {
+  listLabel,
+} from "@/api/biz/label.js";
 export default {
     props: {
         collects: {
@@ -78,11 +81,13 @@ export default {
             fileCollect.value = result
             collectForm.value.name = fname
         }
-        function tagBlur() {
+       async function tagBlur() {
             if(!newTag.value){
                 // ElMessage({ message: '标签名不能为空', type: 'error' })
                 return
             }
+            const res = await listLabel();
+            if(res.rows.length >= 10) return ElMessage.error("已到最大数量,请先删除其他收藏标签!")
             collect.addNewTag({ labelName: newTag.value, orderNum: sortNum.value + 1 }).then(res => {
                 if (res.code === 200) {
                     ElMessage({

+ 2 - 2
src/views/publicment/MyFile.vue

@@ -460,12 +460,12 @@ import {documentation}from "@/api/biz/actor.js"
 import { delFavorite } from '@/api/biz/favorite.js'
 import documents from '../../api/document/document'
 import fileCount from '../../api/fileCount/fileCount'
-import FileTree from './components/FileTree.vue'
+import FileTree from '@/views/myfile/components/FileTree.vue'
 import BreadMenu from './components/BreadMenu.vue'
 import FileEdit from './components/FileEdit.vue'
 import TransferModal from './modalComponebts/Transfer.vue'
 import CreateFloder from './modalComponebts/CreateFloder.vue'
-import FileCollect from './modalComponebts/FileCollect.vue'
+import FileCollect from '@/views/myfile/modalComponebts/FileCollect.vue'
 import FolderReName from './modalComponebts/FolderReName.vue'
 import SpaceBig from './modalComponebts/SpaceBig.vue'
 // import PlaceGridFolder from './components/PlaceGridFolder.vue'

+ 1 - 1
src/views/publicment/modalComponebts/FileCollect.vue

@@ -8,7 +8,7 @@
                     </el-form-item>
                     <el-form-item label="收藏标签">
                         <div class="newTag" v-if="tagCollect">
-                            <el-input v-model="newTag" placeholder="请输入新标签" @blur="tagBlur"></el-input>
+                            <el-input v-model="newTag" placeholder="请输入新标签" maxlength="5" @blur="tagBlur"></el-input>
                         </div>
                         <el-select v-model="collectForm.folders" class="m-2" placeholder="请选择" size="large"
                             @change="collectChange">