Merge branch 'v1.5' of github.com:dataease/dataease into v1.5

backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml

@@ -160,7 +160,7 @@
                 and panel_group.level = #{level}
             </if>
         </where>
-     ORDER BY CONVERT(panel_group.name using gbk)
+     ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk)
     </select>
 
     <delete id="deleteCircle">

backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml

@@ -33,7 +33,7 @@
 						`sys_auth`.`id` = `sys_auth_detail`.`auth_id`
 					)))
 		WHERE
-			sys_auth_detail.privilege_value = #{request.userId}
+			sys_auth_detail.privilege_value = 1
 			AND sys_auth.auth_source_type = #{request.modelType}
 			AND (
 				(
@@ -54,7 +54,7 @@
 		) authInfo ON v_auth_model.id = authInfo.auth_source
 	WHERE
 		FIND_IN_SET( v_auth_model.id, cids )
-		ORDER BY CONVERT(v_auth_model.label using gbk) asc
+		ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
   </select>
 
 </mapper>

frontend/src/components/canvas/components/Toolbar.vue

@@ -11,9 +11,6 @@
       </span>
     </div>
     <div v-else class="toolbar">
-      <el-tooltip :content="'移动端布局'">
-        <el-button class="icon iconfont-tb icon-yidongduan" size="mini" circle @click="openMobileLayout" />
-      </el-tooltip>
       <el-tooltip v-if="!canvasStyleData.auxiliaryMatrix" :content="$t('panel.new_element_distribution')+':'+$t('panel.suspension')">
         <el-button class="icon iconfont-tb icon-xuanfuanniu" size="mini" circle @click="auxiliaryMatrixChange" />
       </el-tooltip>