Pull request #1937: 无JIRA任务 看一下文档demo的水印是否有问题

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '22c88a5497687c8c8b784d76ef580b9b9f878499':
  无JIRA任务 看一下文档demo的水印是否有问题

src/base/single/editor/editor.textarea.js

@@ -114,6 +114,7 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
                         disabled: o.disabled,
                         hgap: 6,
                         vgap: o.height > 24 ? 4 : 2,
+                        height: o.height > 24 ? "" : o.height,
                     });
                     this.watermark.element.bind({
                         mousedown: function (e) {