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

Author: hjzheng

demos/components/sms-editor/index.js

@@ -120,10 +120,11 @@ angular.module('componentsApp', ['ccms.components'])
 				 */
 				shortLinkTip: '系统判断该短链为手动添加，为保证短链顺利打开请末尾加#号，前后分别加一个空格，例： c.tb.cn/c.2cmrV# 共18字。',
 				// content: '亲爱t.cn的?_[taobao]XMTB_】 / $$_[taobao]XMJDWMRZ_$$, 您的订单$$_[taobao]DDBH_$$t.cn$$_[taobao]DDBH_$$正在派送.  c.tb.cn($$ $ $$) 签名: $$_XBL_$$ http://www.taobao.com# {emo-5}',
-				content: '如果地区选择器要使用#_enter_##_enter_#后端数据, 请配置 ual 参数 ?_[taobao]shortlink_】?_[taobao]XMTB_】',
+				content: '如果地区{选择器}要使用#_enter_##_enter_#后端数据, 请配置 ual 参数 ?_[taobao]shortlink_】?_[taobao]XMTB_】',
 				// trimContent: false, // 是否 trim content 两边的空格, 默认是 true, 注意 目前标准版是 trim 的. B 版不期望处理, 没办法你懂得, 真心不期望这样做, 期望产品经理可以统一行为
 				signature: '[通道签名 1]',
 				disabled: false,
+				isSupportImage: false,
 				smsChargeTips: '自定义短信规则提示, <br/> 哈哈哈 <br/> 心情好啊!'
 			},
 			{

src/components/shop-selector/Constant.js

@@ -1,6 +1,5 @@
 // export const apiPrefix = '/api';
 export const apiPrefix = '/tenant/v2';
-export const areaUrl = 'http://qa-ual.fenxibao.com/shuyun-searchapi/1.0/area?platform=top';
 export const getGridColumnDef = isSupportedChannel => {
 	let column = [
 		{

src/components/shop-selector/ShopSelectorCtrl.js

@@ -341,7 +341,7 @@ export default class ShopSelectorCtrl {
 
 	// 获取地区数据
 	getAreaData() {
-		service.getAreaData().get(res => {
+		service.getAreaData(this.serverName).get(res => {
 			this._provinceList = res || [];
 		}, () => {
 			this._$ccTips.error(errorMsg);

src/components/shop-selector/service.js

@@ -1,5 +1,5 @@
 import genResource from 'angular-es-utils/rs-generator';
-import { apiPrefix, areaUrl } from './Constant';
+import { apiPrefix } from './Constant';
 
 // 参数转换
 function transformParams(params, paramsName) {
@@ -22,8 +22,8 @@ export default {
 	},
 
 	// 获取地区列表
-	getAreaData() {
-		return genResource(`${areaUrl}`, null, null, {
+	getAreaData(serverName) {
+		return genResource(`${ serverName }/shuyun-searchapi/1.0/area?platform=top`, null, null, {
 			get: {
 				method: 'GET',
 				isArray: true

src/components/sms-editor/SMSEditorCtrl.js

@@ -35,6 +35,8 @@ export default class SMSEditorCtrl {
 		this.opts || (this.opts = {});
 		this.keywordPrefix = this.opts.keywordPrefix || '$$';
 		this.keywordSuffix = this.opts.keywordSuffix || '$$';
+		// 是否支持图片
+		this.isSupportImage = angular.isDefined(this.opts.isSupportImage) ? this.opts.isSupportImage : true;
 		this.trimContent = angular.isDefined(this.opts.trimContent) ? this.opts.trimContent : true;
 
 		this._content = $element[0].querySelector('[data-content]');
@@ -308,9 +310,14 @@ export default class SMSEditorCtrl {
 			const content = item.length ? `<div>${item}</div>` : '<div><br/></div>';
 			sms.push(content);
 		}
-		const parsed = sms.join('').replace(/\{([^}]+)}/g, (result, $1) => {
-			return this.createImage($1);
-		});
+
+		let parsed = sms.join('');
+
+		if (this.isSupportImage) {
+			parsed = parsed.replace(/\{([^}]+)}/g, (result, $1) => {
+				return this.createImage($1);
+			});
+		}
 		return parsed;
 	}