Merge remote-tracking branch 'origin/ch/need_pool369'

src/utils/buttonConfig.js

@@ -457,6 +457,7 @@ export const chartLibPermission = {
     // chartLib_publicClassifyOpt_edit: 'chartLib:publicClassifyOpt:edit',//公开目录编辑
     chartLib_publicClassifyOpt_del: 'chartLib:publicClassifyOpt:del',//公开目录删除
     chartLib_publicClassifyOpt_batch_move: 'chartLib:publicClassifyOpt:batch:move',//公开目录批量移动
+    chartLib_move: 'chartLib:move', // 移动图表
 }
 
 /*

src/views/dataEntry_manage/chartSetting.vue

@@ -125,7 +125,7 @@
                             src="~@/assets/img/data_m/move_ico.png"
                             alt=""
                             style="width: 14px; height: 14px; margin-right: 8px"
-                            v-if="data.Button.MoveButton"
+                            v-if="classifyShowType === 'own' ? data.Button.MoveButton : isMoveChartShow()"
                           />
                           <!-- 添加子项 -->
                           <img
@@ -1065,6 +1065,12 @@ export default {
 			return BtnMap[key] ? checkPermissionBtn(BtnMap[key]) : checkPermissionBtn(chartLibPermission[key]);
 		},
 
+    //移动图表是否展示
+    isMoveChartShow() {
+      return this.permissionBtn.checkPermissionBtn(
+        this.permissionBtn.chartLibPermission.chartLib_move
+      )
+    },
 
     /* 获取目录 我的/公共目录 */
     async getTreeData(params) {
@@ -1318,7 +1324,8 @@ export default {
     /* 判断节点是否能被拖拽 */
     canDragHandle(node) {
       let canMove = false;
-      if (node.data.Button.MoveButton) {
+      const {chartLibPermission,checkPermissionBtn} = this.permissionBtn
+      if (this.classifyShowType === 'own' ? node.data.Button.MoveButton : checkPermissionBtn(chartLibPermission.chartLib_move)) {
         canMove = true;
       }
       return canMove;