Merge pull request #292 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '1f0236d7e89d0e1ad407a5cbe958bc340707414b':
  sqleditor supportParam

demo/js/base/editor/demo.sql_editor.js

@@ -9,6 +9,7 @@ Demo.SQLEditor = BI.inherit(BI.Widget, {
         var self = this;
         this.formula = BI.createWidget({
             type : 'bi.sql_editor',
+            supportParam: true,
             width : 300,
             height : 200,
             value : "select * from DEMO_CONTRACT where 合同类型 = ${长期协议} and 购买数量 = sum([1,2,3,4])"

dist/base.js

@@ -21077,7 +21077,8 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             value: "",
             lineHeight: 2,
             showHint: true,
-            supportFunction: false
+            supportFunction: false,
+            supportParam: false
         });
     },
     _init: function () {
@@ -21201,14 +21202,14 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        var self = this, result;
+        var self = this, result, o = this.options;
         this.refresh();
         self.editor.setValue("");
         result = this._analyzeContent(v || "");
         BI.each(result, function (i, item) {
             var fieldRegx = /\$[\{][^\}]*[\}]/;
             var str = item.match(fieldRegx);
-            if (BI.isNotEmptyArray(str)) {
+            if (BI.isNotEmptyArray(str) && o.supportParam) {
                 self.insertParam(str[0].substring(2, item.length - 1));
             } else {
                 self.insertString(item);

dist/bundle.js

@@ -46855,7 +46855,8 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             value: "",
             lineHeight: 2,
             showHint: true,
-            supportFunction: false
+            supportFunction: false,
+            supportParam: false
         });
     },
     _init: function () {
@@ -46979,14 +46980,14 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        var self = this, result;
+        var self = this, result, o = this.options;
         this.refresh();
         self.editor.setValue("");
         result = this._analyzeContent(v || "");
         BI.each(result, function (i, item) {
             var fieldRegx = /\$[\{][^\}]*[\}]/;
             var str = item.match(fieldRegx);
-            if (BI.isNotEmptyArray(str)) {
+            if (BI.isNotEmptyArray(str) && o.supportParam) {
                 self.insertParam(str[0].substring(2, item.length - 1));
             } else {
                 self.insertString(item);

dist/demo.js

@@ -843,6 +843,7 @@ Demo.SQLEditor = BI.inherit(BI.Widget, {
         var self = this;
         this.formula = BI.createWidget({
             type : 'bi.sql_editor',
+            supportParam: true,
             width : 300,
             height : 200,
             value : "select * from DEMO_CONTRACT where 合同类型 = ${长期协议} and 购买数量 = sum([1,2,3,4])"

dist/fineui.js

@@ -48549,7 +48549,8 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             value: "",
             lineHeight: 2,
             showHint: true,
-            supportFunction: false
+            supportFunction: false,
+            supportParam: false
         });
     },
     _init: function () {
@@ -48673,14 +48674,14 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        var self = this, result;
+        var self = this, result, o = this.options;
         this.refresh();
         self.editor.setValue("");
         result = this._analyzeContent(v || "");
         BI.each(result, function (i, item) {
             var fieldRegx = /\$[\{][^\}]*[\}]/;
             var str = item.match(fieldRegx);
-            if (BI.isNotEmptyArray(str)) {
+            if (BI.isNotEmptyArray(str) && o.supportParam) {
                 self.insertParam(str[0].substring(2, item.length - 1));
             } else {
                 self.insertString(item);

src/base/sql/editor.sql.js

@@ -8,7 +8,8 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
             value: "",
             lineHeight: 2,
             showHint: true,
-            supportFunction: false
+            supportFunction: false,
+            supportParam: false
         });
     },
     _init: function () {
@@ -132,14 +133,14 @@ BI.SQLEditor = BI.inherit(BI.Widget, {
     },
 
     setValue: function (v) {
-        var self = this, result;
+        var self = this, result, o = this.options;
         this.refresh();
         self.editor.setValue("");
         result = this._analyzeContent(v || "");
         BI.each(result, function (i, item) {
             var fieldRegx = /\$[\{][^\}]*[\}]/;
             var str = item.match(fieldRegx);
-            if (BI.isNotEmptyArray(str)) {
+            if (BI.isNotEmptyArray(str) && o.supportParam) {
                 self.insertParam(str[0].substring(2, item.length - 1));
             } else {
                 self.insertString(item);