From fccac31c51c0fe5d38705713f649dd58cdbaedbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BC=9F=E5=BA=9A?= <zhaoweigeng@wodcloud.com>
Date: Wed, 16 Nov 2022 11:37:57 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=BB=84=E7=BB=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E7=94=A8=E6=88=B7=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=80=E7=9B=B4=E7=BB=B4=E6=8C=81=E5=9C=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/main/develop/menu/menu-form.vue   | 11 +++++++++--
 src/page/main/system/organization/tree.vue |  5 +++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/page/main/develop/menu/menu-form.vue b/src/page/main/develop/menu/menu-form.vue
index e698dfa..25b9aba 100644
--- a/src/page/main/develop/menu/menu-form.vue
+++ b/src/page/main/develop/menu/menu-form.vue
@@ -79,7 +79,7 @@
         </div>
         <div class="icon_content bg-scroll">
           <div class="icon_item" v-for="(e,i) in showIconArr" :key="i+100" @click="changeIcon(e)">
-            <span> 
+            <span :title="e.name"> 
               <bg-icon
                 class="selectBgIcon"
                 :icon="'#' + e.icon"
@@ -321,7 +321,7 @@ defineExpose({ setForm , menuForm, menuRef })
             height: 36px;
             margin: 0 8px 8px 0;
             color: #202531;
-            padding-left: 16px;
+            padding: 0 16px;
             line-height: 36px;
             cursor: pointer;
             &:hover,
@@ -336,6 +336,13 @@ defineExpose({ setForm , menuForm, menuRef })
               width: 14px;
               margin-right: 10px;
             }
+            span {
+              display: inline-block;
+              width: 100%;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              overflow: hidden;
+            }
           }
         }
       }
diff --git a/src/page/main/system/organization/tree.vue b/src/page/main/system/organization/tree.vue
index 5987287..2547b46 100644
--- a/src/page/main/system/organization/tree.vue
+++ b/src/page/main/system/organization/tree.vue
@@ -49,7 +49,7 @@
          <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'org',action: 'create',target: 'child'})">新建下级组织</div>
          <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'edit',target: 'local'})">编辑目录</div>
          <div v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'delete',target: 'local'})">删除</div>
-         <div :class="{'disable': mvDataParent.indexOf(selectData) === 0 }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
+         <div :class="{'disable': mvDataParent.indexOf(selectData) === 0 || (mvDataParent.indexOf(selectData) === 1 && mvDataParent[0].data_type == 2) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvup',target: 'local'})">上移</div>
          <div :class="{'disable': mvDataParent.indexOf(selectData) === (mvDataParent.length-1) }" v-if="selectData && selectData.data_type === 0" class="action" @click="treeAction({type: 'directory',action: 'mvdown',target: 'local'})">下移</div>
         <!-- 组织 -->
          <div v-if="selectData && selectData.data_type === 1" class="action" @click="treeAction({type: 'org',action: 'create',target: 'local'})">新建本级组织</div>
@@ -175,7 +175,8 @@ import { useRouter } from 'vue-router';
         
       }
     }else if(params.action === 'mvup') {
-      if(mvDataParent.value.indexOf(selectData.value) === 0) {
+      // 已经是第一个元素 或者上一个元素是平台组织 则不可上移  平台组织始终在第一个
+      if(mvDataParent.value.indexOf(selectData.value) === 0 || ( mvDataParent.value.indexOf(selectData.value) === 1 && mvDataParent.value[0].data_type == 2) ) {
         // $message.error('已经是第一个元素，不可上移')
         return 0;
       }else {
-- 
2.26.0