chore(release): Merge branch 'dev' into master

Author: hjzheng

demos/components/sms-editor/index.js

@@ -64,7 +64,7 @@ angular.module('componentsApp', ['ccms.components'])
 					{
 						type: 'taobao',
 						name: 'shortlink',
-						text: '淘短链AAAAAAAAAA111111111',
+						text: '同城关怀_2018-08-07',
 						prefix: ' ',
 						suffix: ' ',
 						defaultValue: 'c.tb.cn/c.0zYeW#'
@@ -183,6 +183,6 @@ angular.module('componentsApp', ['ccms.components'])
 		}
 
 		self.insertKeyword = function () {
-			self.channel.api.insertKeyword('淘短链AAAAAAAAAA111111111', 'taobao');
+			self.channel.api.insertKeyword('同城关怀_2018-08-07', 'taobao');
 		}
 	});

src/components/sms-editor/_sms-editor.scss

@@ -171,6 +171,7 @@
 }
 
 .sms-content {
+  font-family: "Microsoft Yahei";
   border: 1px solid #e5e5e5;
   color: #666;
   font-size: 14px;