首页改版，消息已读bug修复

src/business/platform/cat/type/tree.vue

@@ -1,50 +1,51 @@
 <template>
-  <div class="jbd-tree">
-    <ibps-tree
-      :title="title"
-      :width="width"
-      :height="height"
-      :data="treeData"
-      :location="location"
-      :options="treeOptions"
-      :contextmenus="hasContextmenu?treeContextmenus:[]"
-      :position="position"
-      @action-event="handleTreeAction"
-      @node-click="handleNodeClick"
-      @expand-collapse="handleExpandCollapse"
-      ref = "treeIndex"
-    />
-    <!-- 分类编辑 -->
-    <type-edit
-      :id="editId"
-      :parent-data="typeData"
-      :is-private="isPrivate"
-      :category-key="categoryKey"
-      :visible="typeFormVisible"
-      :title="editTitle"
-      @callback="loadTreeData"
-      @close="visible => typeFormVisible = visible"
-    />
-    <type-move
-      :id="editId"
-      :parent-data="typeData"
-      :is-private="isPrivate"
-      :category-key="categoryKey"
-      :data="treeData"
-      :visible="moveFormVisible"
-      :title="editTitle"
-      @callback="loadTreeData"
-      @close="visible => moveFormVisible = visible"
-    />
-    <!-- 分类排序 -->
-    <type-sort
-      :id="editId"
-      :visible="sortFormVisible"
-      title="分类排序"
-      @callback="loadTreeData"
-      @close="visible => sortFormVisible = visible"
-    />
-  </div>
+    <div class="jbd-tree">
+        <ibps-tree
+            :title="title"
+            :width="width"
+            :height="height"
+            :data="treeData"
+            :location="location"
+            :options="treeOptions"
+            :contextmenus="hasContextmenu ? treeContextmenus : []"
+            :position="position"
+            :hasPermission="hasPermission"
+            @action-event="handleTreeAction"
+            @node-click="handleNodeClick"
+            @expand-collapse="handleExpandCollapse"
+            ref="treeIndex"
+        />
+        <!-- 分类编辑 -->
+        <type-edit
+            :id="editId"
+            :parent-data="typeData"
+            :is-private="isPrivate"
+            :category-key="categoryKey"
+            :visible="typeFormVisible"
+            :title="editTitle"
+            @callback="loadTreeData"
+            @close="visible => typeFormVisible = visible"
+        />
+        <type-move
+            :id="editId"
+            :parent-data="typeData"
+            :is-private="isPrivate"
+            :category-key="categoryKey"
+            :data="treeData"
+            :visible="moveFormVisible"
+            :title="editTitle"
+            @callback="loadTreeData"
+            @close="visible => moveFormVisible = visible"
+        />
+        <!-- 分类排序 -->
+        <type-sort
+            :id="editId"
+            :visible="sortFormVisible"
+            title="分类排序"
+            @callback="loadTreeData"
+            @close="visible => sortFormVisible = visible"
+        />
+    </div>
 </template>
 
 <script>
@@ -55,161 +56,168 @@ import TypeEdit from '@/views/platform/cat/type/edit'
 import TypeSort from '@/views/platform/cat/type/sort'
 import TypeMove from '@/views/platform/cat/type/move'
 export default {
-  components: {
-    TypeEdit,
-    TypeSort,
-    TypeMove
-  },
-  props: {
-    title: {
-      type: String
+    components: {
+        TypeEdit,
+        TypeSort,
+        TypeMove
     },
-    location: {
-      type: String,
-      default: 'initial'
-    },
-    categoryKey: {
-      type: String,
-      required: true
-    },
-    hasContextmenu: { // 是否有右键菜单
-      type: Boolean,
-      default: false
-    },
-    width: {
-      type: [String, Number],
-      default: 200
-    },
-    height: {
-      type: [String, Number],
-      default: 500
-    },
-    position: {
-      type: String,
-      default: 'west'
-    }
-  },
-  data() {
-    return {
-      typeFormVisible: false,
-      sortFormVisible: false,
-      moveFormVisible:false,
-      editId: '', // 编辑dialog需要使用
-      editTitle: '编辑分类',
-
-      // 树配置
-      treeOptions: { 'rootPId': '-1' },
-      treeContextmenus: [
-        { icon: 'add', label: '添加分类', value: 'add' },
-        { icon: 'edit', label: '编辑分类', value: 'edit', rights: ['node'] },
-        { icon: 'delete', label: '删除分类', value: 'remove', rights: ['node'] },
-        { type: 'divided' },
-        { icon: 'sort', label: '分类排序', value: 'sort' },
-        { icon: 'arrows-v', label: '移动节点', value: 'moveNode', rights: ['node'] }
-      ],
-      treeData: [],
-
-      isPrivate: false,
-      typeData: {} // 记录分类信息
-    }
-  },
-  created() {
-    this.loadTreeData()
-  },
-  methods: {
-    loadTreeData() {
-      findTreeData({ 'categoryKey': this.categoryKey }).then(response => {
-        this.treeData = response.data || []
-        this.$emit('treeData',response.data)
-      })
-    },
-    handleTreeAction(command, position, selection, data) {
-      switch (command) {
-        case 'refresh':// 查询
-          this.loadTreeData()
-          break
-        case 'add':// 添加
-          this.typeData = data // { 'name': data.name, 'id': data.id }
-          this.isPrivate = false
-          this.editTitle = '添加分类'
-          this.handTreeEdit()
-          break
-        case 'addPrivate':// 添加
-          this.typeData = data // { 'name': data.name, 'id': data.id }
-          this.isPrivate = true
-          this.editTitle = '添加私有分类'
-          this.handTreeEdit()
-          break
-        case 'edit':// 编辑
-          this.typeData = data
-          this.isPrivate = true
-          this.editTitle = '编辑分类'
-          this.handTreeEdit(data.id)
-          break
-        case 'moveNode':// 移动节点
-        this.typeData = data
-        this.isPrivate = true
-        this.editTitle = '移动节点'
-        this.handTreeMove(data.id)
-          break
-        case 'remove':// 删除
-          this.handleTreeRemove(data.id)
-          break
-        case 'export':// 导出
-          this.handTreeExport(data.id, data.name)
-          break
-        case 'sort':// 排序
-          this.handTreeSort(data)
-          break
-      }
-    },
-    handleNodeClick(data) {
-      this.$emit('node-click', data.parentId === '-1' ? '' : data.id,data)
-    },
-    handleExpandCollapse(isExpand) {
-      this.$emit('expand-collapse', isExpand)
-    },
-    handTreeEdit(editId) {
-      this.editId = editId || ''
-      this.typeFormVisible = true
-    },
-    handTreeMove(editId) {
-      this.editId = editId || ''
-      this.moveFormVisible = true
+    props: {
+        title: {
+            type: String
+        },
+        location: {
+            type: String,
+            default: 'initial'
+        },
+        categoryKey: {
+            type: String,
+            required: true
+        },
+        hasContextmenu: {
+            // 是否有右键菜单
+            type: Boolean,
+            default: false
+        },
+        width: {
+            type: [String, Number],
+            default: 200
+        },
+        height: {
+            type: [String, Number],
+            default: 500
+        },
+        position: {
+            type: String,
+            default: 'west'
+        },
+        hasPermission: {
+            // 是否有权限控制
+            type: Boolean,
+            default: false
+        }
     },
-    handTreeSort(data) {
-      const children = data.children
-      if (children && children.length > 0) {
-        if (children.length === 1) {
-          ActionUtils.warning('只有一个节点无需排序')
-        } else {
-          this.editId = data.id || ''
-          this.sortFormVisible = true
+    data() {
+        return {
+            typeFormVisible: false,
+            sortFormVisible: false,
+            moveFormVisible: false,
+            editId: '', // 编辑dialog需要使用
+            editTitle: '编辑分类',
+            // 树配置
+            treeOptions: { rootPId: '-1' },
+            treeContextmenus: [
+                { icon: 'add', label: '添加分类', value: 'add' },
+                { icon: 'edit', label: '编辑分类', value: 'edit', rights: ['node'] },
+                { icon: 'delete', label: '删除分类', value: 'remove', rights: ['node'] },
+                { type: 'divided' },
+                { icon: 'sort', label: '分类排序', value: 'sort' },
+                { icon: 'arrows-v', label: '移动节点', value: 'moveNode', rights: ['node'] }
+            ],
+            treeData: [],
+            isPrivate: false,
+            typeData: {} // 记录分类信息
         }
-      } else {
-        ActionUtils.warning('无子节点排序')
-      }
     },
-    handleTreeRemove(ids) {
-      ActionUtils.removeRecord(ids).then((ids) => {
-        remove({ typeId: ids }).then(response => {
-          ActionUtils.removeSuccessMessage()
-          this.loadTreeData()
-        }).catch((err) => {
-          console.error(err)
-        })
-      }).catch(() => { })
+    created() {
+        this.loadTreeData()
     },
-    showTree(){
-       this.$nextTick(() => {
-          this.$refs.treeIndex.handleExpandCollapse();
-      })
+    methods: {
+        loadTreeData() {
+            findTreeData({ categoryKey: this.categoryKey }).then(response => {
+                this.treeData = response.data || []
+                if (this.hasPermission) {
+                    this.treeData = this.treeData.filter(i => i.isShow !== '1')
+                }
+                this.$emit('treeData', response.data)
+            })
+        },
+        handleTreeAction(command, position, selection, data) {
+            switch (command) {
+                case 'refresh': // 查询
+                    this.loadTreeData()
+                    break
+                case 'add': // 添加
+                    this.typeData = data // { 'name': data.name, 'id': data.id }
+                    this.isPrivate = false
+                    this.editTitle = '添加分类'
+                    this.handTreeEdit()
+                    break
+                case 'addPrivate': // 添加
+                    this.typeData = data // { 'name': data.name, 'id': data.id }
+                    this.isPrivate = true
+                    this.editTitle = '添加私有分类'
+                    this.handTreeEdit()
+                    break
+                case 'edit': // 编辑
+                    this.typeData = data
+                    this.isPrivate = true
+                    this.editTitle = '编辑分类'
+                    this.handTreeEdit(data.id)
+                    break
+                case 'moveNode': // 移动节点
+                    this.typeData = data
+                    this.isPrivate = true
+                    this.editTitle = '移动节点'
+                    this.handTreeMove(data.id)
+                    break
+                case 'remove': // 删除
+                    this.handleTreeRemove(data.id)
+                    break
+                case 'export': // 导出
+                    this.handTreeExport(data.id, data.name)
+                    break
+                case 'sort': // 排序
+                    this.handTreeSort(data)
+                    break
+            }
+        },
+        handleNodeClick(data) {
+            this.$emit('node-click', data.parentId === '-1' ? '' : data.id, data)
+        },
+        handleExpandCollapse(isExpand) {
+            this.$emit('expand-collapse', isExpand)
+        },
+        handTreeEdit(editId) {
+            this.editId = editId || ''
+            this.typeFormVisible = true
+        },
+        handTreeMove(editId) {
+            this.editId = editId || ''
+            this.moveFormVisible = true
+        },
+        handTreeSort(data) {
+            const children = data.children
+            if (children && children.length > 0) {
+                if (children.length === 1) {
+                    ActionUtils.warning('只有一个节点无需排序')
+                } else {
+                    this.editId = data.id || ''
+                    this.sortFormVisible = true
+                }
+            } else {
+                ActionUtils.warning('无子节点排序')
+            }
+        },
+        handleTreeRemove(ids) {
+            ActionUtils.removeRecord(ids).then((ids) => {
+                remove({ typeId: ids }).then((response) => {
+                    ActionUtils.removeSuccessMessage()
+                    this.loadTreeData()
+                }).catch((err) => {
+                    console.error(err)
+                })
+            }).catch(() => { })
+        },
+        showTree() {
+            this.$nextTick(() => {
+                this.$refs.treeIndex.handleExpandCollapse()
+            })
+        }
     }
-  }
 }
 </script>
 <style>
-/* .jbd-tree  .el-tree > .el-tree-node > .el-tree-node__content {
-    display: none;
-  } */
+/* .jbd-tree .el-tree > .el-tree-node > .el-tree-node__content {
+        display: none;
+    } */
 </style>

src/layout/header-aside/components/header-message/index.vue

@@ -7,7 +7,7 @@
             placement="bottom"
         >
             <el-button class="ibps-ml-0 ibps-mr btn-text can-hover" type="text">
-                <el-badge :max="99" :value="messageCount">
+                <el-badge :max="9999" :value="messageCount">
                     <ibps-icon name="bell-o" size="16" />
                 </el-badge>
             </el-button>
@@ -24,7 +24,7 @@
                 class="ibps-ml-0 ibps-mr btn-text can-hover"
                 type="text"
             >
-                <el-badge :max="99" :value="messageCount">
+                <el-badge :max="9999" :value="messageCount">
                     <ibps-icon name="bell-o" size="16" />
                 </el-badge>
             </el-button>
@@ -69,7 +69,7 @@
             inside
             readonly
             @callback="loadData"
-            @close="(visible) => (dialogFormVisible = visible)"
+            @close="closeDialog"
         />
     </div>
 </template>
@@ -194,6 +194,10 @@
             clickMore() {
                 // 更多消息
                 this.$router.push('/message')
+            },
+            closeDialog(visible) {
+                this.dialogFormVisible = visible
+                this.loadData()
             }
         },
         // 销毁事件

src/views/platform/message/inner/detail/dialog.vue

@@ -54,7 +54,7 @@ export default {
       dialogVisible: this.visible,
       dialogLoading: false,
       toolbars: [
-        { key: 'cancel' }
+        { key: 'cancel', label: '关闭' }
       ]
     }
   },