Merge branch 'lang_dev' of http://8.136.199.33:3000/eta_front/eta_front into lang_dev

src/lang/commonLang.js

@@ -345,6 +345,18 @@ export default {
       en: 'Switch to Chinese',
       zh: '切换中文',
     },
+    ya_hei:{
+      en:'Microsoft YaHei',
+      zh:'微软雅黑'
+    },
+    sim_sun:{
+      en:'SimSun',
+      zh:'宋体'
+    },
+    sim_hei:{
+      en:'SimHei',
+      zh:'黑体'
+    }
   },
   Edb,
   Chart,

src/views/sandbox_manage/common/toolConfig.js

@@ -23,9 +23,9 @@ export let configOpt = {
 export const colorsOptions = ['#333','#5B9BD5','#f00','#fff','#00f','#000','#00FFFF','#70DB93','#9F5F9F','#A67D3D','#5F9F9F']
 
 export const familyOptions = [
-	{name:'微软雅黑',value:'微软雅黑'},
-	{name:'宋体',value:'宋体'},
-	{name:'黑体',value:'黑体'}
+	{name:localStorage.getItem('i18n')=='zh'?'微软雅黑':'Microsoft YaHei',value:'微软雅黑'},
+	{name:localStorage.getItem('i18n')=='zh'?'宋体':'SimSun',value:'宋体'},
+	{name:localStorage.getItem('i18n')=='zh'?'黑体':'SimHei',value:'黑体'}
 ]
 export const fontSizeOptions = [
 	{name:'12px',value:12},