diff --git a/o2web/source/o2_core/o2/widget/Tree.js b/o2web/source/o2_core/o2/widget/Tree.js index 462384b42c592c4dc07a508ee2667226a33f1d6e..0d9ede019c55b88979735df6f88ff6423aeb3f17 100644 --- a/o2web/source/o2_core/o2/widget/Tree.js +++ b/o2web/source/o2_core/o2/widget/Tree.js @@ -17,7 +17,7 @@ o2.widget.Tree = new Class({ "icon": "icon", "style": "", "sub": "sub", - "defalut" : "defalut" + "default" : "default" }, initialize: function(container, options){ this.setOptions(options); @@ -76,6 +76,7 @@ o2.widget.Tree = new Class({ if (mapping.icon) this.jsonMapping.icon = mapping.icon; if (mapping.style) this.jsonMapping.style = mapping.style; if (mapping.sub) this.jsonMapping.sub = mapping.sub; + if (mapping.default) this.jsonMapping.default = mapping.default; }, loadJsonTree: function(treeJson, tree, node){ @@ -87,6 +88,7 @@ o2.widget.Tree = new Class({ if (item[this.jsonMapping.action]) options.action = item[this.jsonMapping.action]; if (item[this.jsonMapping.style]) options.style = item[this.jsonMapping.style]; if (item[this.jsonMapping.icon]) options.icon = item[this.jsonMapping.icon]; + if (item[this.jsonMapping.default]) options.default = item[this.jsonMapping.default]; var treeNode = node.appendChild(options); @@ -156,7 +158,7 @@ o2.widget.Tree = new Class({ obj[this.jsonMapping.text] = options.text; obj[this.jsonMapping.action] = options.action; obj[this.jsonMapping.style] = options.style; - obj[this.jsonMapping.defalut] = options.defalut; + obj[this.jsonMapping.default] = options.default; obj[this.jsonMapping.icon] = (options.icon) ? options.icon : "none"; return obj; } diff --git a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js index e36e3d851db2f038a7198f188c435e3f577a82a3..fb24538669a49a354751bfa7d839dac0f40919e0 100644 --- a/o2web/source/o2_core/o2/xScript/ViewEnvironment.js +++ b/o2web/source/o2_core/o2/xScript/ViewEnvironment.js @@ -62,9 +62,12 @@ * textValue :文本。
* numberValue :数字。
* dateTimeValue :日期时间。
+ * dateValue :仅日期。
+ * timeValue :仅时间。
* booleanValue :布尔值。
* - * @property {(String|Number|Boolean)} value - 过滤的值,根据formatType提供匹配的数据类型的值,如果是dateTimeValue数据类型,则提供日期格式的字符串,格式如“YYYY-MM-DD HH:MM:SS”。 + * @property {(String|Number|Boolean)} value - 过滤的值,根据formatType提供匹配的数据类型的值。如果是dateTimeValue数据类型,则提供日期格式的字符串,格式如“YYYY-MM-DD HH:MM:SS”。 + * 如果是dateValue数据类型,则提供日期格式的字符串,格式如“YYYY-MM-DD”。如果是timeValue数据类型,则提供时间格式的字符串,格式如“HH:MM:SS”。 * @example *{ * "path":"o.title", diff --git a/o2web/source/x_component_query_StatementDesigner/Statement.js b/o2web/source/x_component_query_StatementDesigner/Statement.js index f75c35339f4b754bd1a5183d4cc711149e1da795..c2207008a35b59bc428584fa90acbb37587658c5 100644 --- a/o2web/source/x_component_query_StatementDesigner/Statement.js +++ b/o2web/source/x_component_query_StatementDesigner/Statement.js @@ -65,6 +65,22 @@ MWF.xApplication.query.StatementDesigner.Statement = new Class({ } }.bind(this), 60000); }, + getDefaultEditorData: function(){ + return { + "javascriptEditor": { + "monaco_theme": "vs", + "fontSize" : "12px", + "editor": "monaco" + } + }; + // return { + // "javascriptEditor": { + // "theme": "tomorrow", + // "fontSize" : "12px", + // "editor": "ace" + // } + // }; + }, getEditorTheme: function(callback){ if (!o2.editorData){ o2.UD.getData("editor", function(json){