Browse Source

codeeditor正则修改

es6
windy 7 years ago
parent
commit
e99be87193
  1. 2
      bi/base.js
  2. 4
      bi/widget.js
  3. 2
      dist/base.js
  4. 6
      dist/bundle.js
  5. 52
      dist/bundle.min.js
  6. 4
      dist/widget.js
  7. 2
      src/base/single/editor/editor.code.js

2
bi/base.js

@ -19151,7 +19151,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
},
_analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|(\s+)|\w*\w|\$\{[^\$\(\)\+\-\*\/)\$,]*\w\}|\$\{[^\$\(\)\+\-\*\/]*\w\}|\$\{[^\$\(\)\+\-\*\/]*[\u4e00-\u9fa5]\}|\w|(.)|\n/g;
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g;
return v.match(regx);
},

4
bi/widget.js

@ -3078,6 +3078,7 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
this.editor = BI.createWidget({
type: "bi.sign_editor",
value: this._alertInEditorValue(o.min),
allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"),
validationChecker: function(v){
return BI.isNaturalNumber(v);
@ -13458,7 +13459,8 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, {
value: o.value,
height: o.height,
textAlign: "left",
width: o.isPrimary ? 70 : 90
width: o.isPrimary ? 70 : 90,
lgap: o.isPrimary ? 0 : 10
});
BI.createWidget({
type: "bi.vertical_adapt",

2
dist/base.js vendored

@ -19151,7 +19151,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
},
_analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|(\s+)|\w*\w|\$\{[^\$\(\)\+\-\*\/)\$,]*\w\}|\$\{[^\$\(\)\+\-\*\/]*\w\}|\$\{[^\$\(\)\+\-\*\/]*[\u4e00-\u9fa5]\}|\w|(.)|\n/g;
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g;
return v.match(regx);
},

6
dist/bundle.js vendored

@ -48174,7 +48174,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
},
_analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|(\s+)|\w*\w|\$\{[^\$\(\)\+\-\*\/)\$,]*\w\}|\$\{[^\$\(\)\+\-\*\/]*\w\}|\$\{[^\$\(\)\+\-\*\/]*[\u4e00-\u9fa5]\}|\w|(.)|\n/g;
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g;
return v.match(regx);
},
@ -81557,6 +81557,7 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
this.editor = BI.createWidget({
type: "bi.sign_editor",
value: this._alertInEditorValue(o.min),
allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"),
validationChecker: function(v){
return BI.isNaturalNumber(v);
@ -91937,7 +91938,8 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, {
value: o.value,
height: o.height,
textAlign: "left",
width: o.isPrimary ? 70 : 90
width: o.isPrimary ? 70 : 90,
lgap: o.isPrimary ? 0 : 10
});
BI.createWidget({
type: "bi.vertical_adapt",

52
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored

@ -3078,6 +3078,7 @@ BI.DateTimeSelect = BI.inherit(BI.Widget, {
this.editor = BI.createWidget({
type: "bi.sign_editor",
value: this._alertInEditorValue(o.min),
allowBlank: false,
errorText: BI.i18nText("BI-Please_Input_Natural_Number"),
validationChecker: function(v){
return BI.isNaturalNumber(v);
@ -13458,7 +13459,8 @@ BI.RelationViewItem = BI.inherit(BI.BasicButton, {
value: o.value,
height: o.height,
textAlign: "left",
width: o.isPrimary ? 70 : 90
width: o.isPrimary ? 70 : 90,
lgap: o.isPrimary ? 0 : 10
});
BI.createWidget({
type: "bi.vertical_adapt",

2
src/base/single/editor/editor.code.js

@ -141,7 +141,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
},
_analyzeContent: function (v) {
var regx = /\$[\{][^\}]*[\}]|(\s+)|\w*\w|\$\{[^\$\(\)\+\-\*\/)\$,]*\w\}|\$\{[^\$\(\)\+\-\*\/]*\w\}|\$\{[^\$\(\)\+\-\*\/]*[\u4e00-\u9fa5]\}|\w|(.)|\n/g;
var regx = /\$[\{][^\}]*[\}]|[^\$\{]*[^\$\{]/g;
return v.match(regx);
},

Loading…
Cancel
Save