restore strings->replaceVariable

Author: fuzhenn

src/core/util/strings.js

@@ -144,7 +144,8 @@ export function splitContent(content, font, wrapWidth, textWidth) {
 
 // const contentExpRe = /\{([\w_]+)\}/g;
 // export const CONTENT_EXPRE = /{([^}.]+)}/;
-export let CONTENT_EXPRE = /{([\u0000-\u0019\u0021-\uFFFF]+)}/g;
+// export const CONTENT_EXPRE = /{([\u0000-\u0019\u0021-\uFFFF]+)}/g;
+export const CONTENT_EXPRE = /\{([\w_]+)\}/g;
 
 /**
  * Replace variables wrapped by square brackets ({foo}) with actual values in props.

test/core/UtilSpec.js

@@ -20,11 +20,23 @@ describe('Util', function () {
             expect(r).to.eql(' is not .');
         });
 
-        it('replace variables with unicode name', function () {
-            var str = 'Be {🙂}, not be {😢}.';
-            var r = maptalks.StringUtil.replaceVariable(str, {'🙂': 'happy', '😢': 'sad'});
-            expect(r).to.eql('Be happy, not be sad.');
-        });
+        // it('replace variables with unicode name', function () {
+        //     var str = 'Be {🙂}, not be {😢}.';
+        //     var r = maptalks.StringUtil.replaceVariable(str, {'🙂': 'happy', '😢': 'sad'});
+        //     expect(r).to.eql('Be happy, not be sad.');
+        // });
+
+        // it('replace variables with chinese properties', function () {
+        //     var str = 'Be {心情0}, not be {心情1}.';
+        //     var r = maptalks.StringUtil.replaceVariable(str, {'心情0': 'happy', '心情1': 'sad'});
+        //     expect(r).to.eql('Be happy, not be sad.');
+        // });
+
+        // it('replace variables with chinese properties', function () {
+        //     var str = 'hello {属性+d_1}.';
+        //     var r = maptalks.StringUtil.replaceVariable(str, {'属性': 'world'});
+        //     expect(r).to.eql('hello');
+        // });
     });
 
     it('sign', function () {