Página inicial Explorar Ajuda
Entrar
CocoRoboLabs
/
r2r_pbl
3
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

update

lsc 5 meses atrás
pai
e342a27db5
commit
d8298575c4
15 arquivos alterados com 43 adições e 31 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.55b3ad8d43e9983469fddf5667213a5e.css
  3. 0 0
      dist/static/css/app.55b3ad8d43e9983469fddf5667213a5e.css.map
  4. 0 0
      dist/static/js/app.0ce1072284386a59f41e.js
  5. 0 0
      dist/static/js/app.0ce1072284386a59f41e.js.map
  6. 0 0
      dist/static/js/app.101f058efe68260edbdb.js
  7. 0 0
      dist/static/js/app.101f058efe68260edbdb.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 0 0
      dist/static/js/vendor.7dad2a9a838f0c719a00.js
  10. 0 0
      dist/static/js/vendor.7dad2a9a838f0c719a00.js.map
  11. 34 25
      src/components/pages/knowledge/components/selectTag.vue
  12. 2 0
      src/components/pages/knowledge/components/selectTag3.vue
  13. 1 0
      src/components/pages/knowledge/fileBox.vue
  14. 4 4
      src/components/pages/knowledge/folderDetail.vue
  15. 1 1
      src/components/pages/knowledge/folderFileBox.vue

+ 1 - 1
dist/index.html
Ver arquivo 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.cf51eff876b399cb0dd32696e6496584.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.32e54c5cbc322d18a05c.js></script><script type=text/javascript src=./static/js/app.0ce1072284386a59f41e.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.55b3ad8d43e9983469fddf5667213a5e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.7dad2a9a838f0c719a00.js></script><script type=text/javascript src=./static/js/app.101f058efe68260edbdb.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.55b3ad8d43e9983469fddf5667213a5e.css


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.55b3ad8d43e9983469fddf5667213a5e.css.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.0ce1072284386a59f41e.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.0ce1072284386a59f41e.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.101f058efe68260edbdb.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.101f058efe68260edbdb.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/vendor.7dad2a9a838f0c719a00.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/vendor.7dad2a9a838f0c719a00.js.map


+ 34 - 25
src/components/pages/knowledge/components/selectTag.vue
Ver arquivo 

@@ -9,6 +9,15 @@
 
       @change="handleChange"
 
       @remove-tag="removeTag"
 
     >
 
+      <!-- 全选项 -->
 
+      <el-option
 
+        key="select-all"
 
+        :label="options.length == values.length ? '取消全选': '全选'"
 
+        :value="selectAllValue"
 
+        :disabled="disabled"
 
+      />
 
+
 
+      <!-- 其他选项 -->
 
       <el-option
 
         v-for="item in options"
 
         :key="item.id"
 
@@ -19,31 +28,29 @@
 
     </el-select>
 
   </main>
 
 </template>
 
+
 
 <script>
 
+import { values } from 'lodash';
 
+
 
 export default {
 
   name: 'select-tags',
 
   props: {
 
-    // 选项
 
     options: {
 
       type: Array,
 
       default: () => []
 
     },
 
-    // 选中的值
 
     value: {
 
       type: Array,
 
       default: () => []
 
     },
 
-    // 提示
 
     placeholder: {
 
       type: String,
 
       default: '请选择'
 
     },
 
-    // 是否禁用
 
     disabled: {
 
       type: Boolean,
 
       default: false
 
     },
 
-    // 判断条件
 
     judgingCondition: {
 
       type: String | Number,
 
       default: ''
 
@@ -52,19 +59,27 @@ export default {
 
   data() {
 
     return {
 
       observer: null,
 
-      hideDom: null
 
+      hideDom: null,
 
+      selectAllValue: 'select-all', // 用于标识“全选”选项
 
     };
 
   },
 
   computed: {
 
-    /**
 
-     * @description 获取当前选中的值
 
-    */
 
     values: {
 
       get() {
 
         return this.value;
 
       },
 
       set(val) {
 
-        this.$emit('input', val);
 
+        // 优化全选和取消全选的逻辑
 
+        const isSelectAll = val.includes(this.selectAllValue);
 
+        const filteredVal = val.filter(item => item !== this.selectAllValue);
 
+        const isAllSelected = filteredVal.length === this.options.length;
 
+        console.log(isSelectAll);
 
+        
+        if (isSelectAll) {
 
+          this.$emit('input', isAllSelected ? [] : this.options.map(item => item.id)); // 全选或取消全选
 
+        } else {
 
+          this.$emit('input', val); // 普通选择
 
+        }
 
       }
 
     }
 
   },
 
@@ -75,14 +90,10 @@ export default {
 
     this.observer.disconnect();
 
   },
 
   methods: {
 
-    /**
 
-     * @description 监听tag变化
 
-     */
 
     mutationObserver() {
 
       const tagLIstDom = this.$refs.select.$el.querySelector('.el-select__tags');
 
       const tagSpanDom = this.$refs.select.$el.querySelector('.el-select__tags > span');
 
 
-      // 创建隐藏的计数节点
 
       this.hideDom = document.createElement('span');
 
       this.hideDom.classList.add('count-node');
 
       tagSpanDom.append(this.hideDom);
 
@@ -104,7 +115,7 @@ export default {
 
               } else {
 
                 e.style.display = 'inline-block';
 
               }
 
-              tagWidth += e.offsetWidth + 5;
 
+              tagWidth += e.offsetWidth + 7;
 
 
               if (tagWidth > tagLIstDom.offsetWidth) {
 
                 e.style.display = 'none';
 
@@ -130,22 +141,20 @@ export default {
 
       this.observer = new MutationObserver(callback);
 
       this.observer.observe(tagSpanDom, config);
 
     },
 
-    /**
 
-     * @description 选择框改变
 
-     */
 
     handleChange() {
 
       this.$emit('change', this.value);
 
     },
 
-    /**
 
-     *
 
-     * @param val 当前角色绑定的分校不允许删除
 
-     */
 
     removeTag(val) {
 
-      this.$emit('remove-tag', val);
 
+      if (val === this.selectAllValue) {
 
+        // 取消全选时清空所有选择
 
+        this.$emit('input', []);
 
+      } else {
 
+        this.$emit('remove-tag', val);
 
+      }
 
     }
 
   }
 
 };
 
 </script>
 
-<style scoped>
 
 
-</style>
 
+<style scoped>
 
+</style>

+ 2 - 0
src/components/pages/knowledge/components/selectTag3.vue
Ver arquivo 

@@ -91,6 +91,8 @@ export default {
 
 
       const callback = mutationsList => {
 
         mutationsList.forEach(item => {
 
+          console.log(item);
 
+          
           if (item.type === 'childList') {
 
             const tagList = item.target.childNodes;
 
             let tagWidth = 0;

+ 1 - 0
src/components/pages/knowledge/fileBox.vue
Ver arquivo 

@@ -18,6 +18,7 @@
 
           </el-option>
 
         </el-select> -->
 
         <selectTag
 
+          v-if="$parent.barNam == 1"
 
           v-model="checkFolderid"
 
           :options="myFolderArray2"
 
           :placeholder="'请选择文件夹'"

+ 4 - 4
src/components/pages/knowledge/folderDetail.vue
Ver arquivo 

@@ -53,8 +53,8 @@
 
         style="font-size: 12px;font-family: PingFang;color: #111824;margin-bottom: 12px;font-weight: 600;"
 
         v-if="check1.length || check2.length || check3.length"
 
         >标签</div>
 
-        
-        <div class="tag_box" v-if="data.userid == userid && data.isMo == '2'">
 
+        <!-- data.userid == userid &&  -->
 
+        <div class="tag_box" v-if="data.isMo == '2'">
 
           <div class="tag" v-loading="tagLoading1">
 
 
               <div class="tags" v-if="check1.length || check2.length || check3.length">
 
@@ -99,8 +99,8 @@
 
               </div>
 
             </div>
 
         </div>
 
-     
-        <div class="tag_box" v-else-if="data.isMo == '2'">
 
+        <!-- data.isMo == '2' -->
 
+        <div class="tag_box" v-else-if="false">
 
           <div class="tag_check">
 
             <div class="tag_check_box" v-if="this.check1.length">
 
               <span>学科：</span>

+ 1 - 1
src/components/pages/knowledge/folderFileBox.vue
Ver arquivo 

@@ -646,7 +646,7 @@ export default {
 
             }
 
           ];
 
           this.ajax //deleteFileByFilter
 
-            .post(this.$store.state.fileApi + "deleteFile", params)
 
+            .post(this.$store.state.fileApi + "deleteFileByFilter", params)
 
             .then(res => {
 
               this.$message({
 
                 message: "删除成功",

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff