Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/application_controller.rb

@@ -426,9 +426,9 @@ class ApplicationController < ActionController::Base
 	# 小类别列表
 	def shixun_small_type
 		list = []
-		mirrors = MirrorRepository.select([:id, :type_name]).published_small_mirror
+		mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror
 		mirrors.try(:each) do |mirror|
-			list << {id: mirror.id, type_name: mirror.type_name}
+			list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description}
 		end
 		list
 	end

public/react/src/modules/page/Index.js

@@ -55,12 +55,12 @@ class Index extends Component {
       	window.$('#root').css('position', 'absolute')
 
 		// TPI浏览器缩放
-		setTimeout(() => {
-			const agent = navigator.userAgent;
-			if (agent.indexOf('Mac OS') == -1) {
-				window._initZoomCheck()
-			}
-		}, 800)
+		// setTimeout(() => {
+		// 	const agent = navigator.userAgent;
+		// 	if (agent.indexOf('Mac OS') == -1) {
+		// 		window._initZoomCheck()
+		// 	}
+		// }, 800)
 
 
 		this.onDrawerButtonClick = this.onDrawerButtonClick.bind(this)

public/react/src/modules/page/component/TPICodeSetting.js

@@ -146,23 +146,25 @@ class TPICodeSetting extends Component {
 					{/* <a href="https://github.com/Microsoft/monaco-editor/wiki/Monaco-Editor-Accessibility-Guide"></a> */}
     	  		</h3>
 				<div className="-padding-24 " style={{    marginBottom: '40px' }}>
-                    <Tooltip title={ task_pass ? "允许学员跳关挑战实训" : "禁止学员跳关挑战实训"} disableFocusListener={true}>
+					<Tooltip title={ task_pass ? "允许学员跳关挑战" : "不允许学员跳关挑战"} disableFocusListener={true}>                    
 						<div className="-layout-h -center -justify-between">
 							<div className="ide-settings--item-key">跳关</div>
 							<div className="ide-settings--item-value">{ task_pass ? '允许' : '不允许'}</div>
+
 						</div>
 					</Tooltip>
 
+
                     <Tooltip title={ test_set_permission ? "允许学员通过金币解锁查看测试集内容" 
-							: "禁止学员通过金币解锁查看测试集内容"} disableFocusListener={true}>
+							: "不允许学员通过金币解锁查看测试集内容"} disableFocusListener={true}>
 						<div className="-layout-h -center -justify-between">
 							<div className="ide-settings--item-key">测试集解锁</div>
 							<div className="ide-settings--item-value">{ test_set_permission ? '允许' : '不允许'}</div>
 						</div>
 					</Tooltip>
 					
-                    <Tooltip title={ forbid_copy ? "禁用页面复制和粘贴功能" 
-							: "启用页面复制和粘贴功能"} disableFocusListener={true}>
+                    <Tooltip title={ forbid_copy ? "不允许学员复制和粘贴代码" 
+							: "允许学员复制和粘贴代码"} disableFocusListener={true}>
 
 						<div className="-layout-h -center -justify-between">
 							<div className="ide-settings--item-key">代码复制粘贴</div>