Browse Source

Merge pull request #188883 in DEC/fineui from release/11.0 to bugfix/11.0

* commit 'a70e47a90df288747b8651b3a14d56f895bcecaa':
  BI-114964 fix: revert https://code.fineres.com/projects/DEC/repos/fineui/pull-requests/187222/diff\#src/component/treevaluechooser/abstract.treevaluechooser.js
  BI-113934 style: 视觉iconfont更新
  KERNEL-11911 fix: "bi.textarea_editor"提供了setWatermark方法,但是却没动态更新title 同步
  无jira任务 cherr pick一下
master
superman 2 years ago
parent
commit
6c9bc9a903
  1. BIN
      dist/font/iconfont.eot
  2. 134
      dist/font/iconfont.svg
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 1
      src/base/single/editor/editor.textarea.js
  7. 2
      src/component/treevaluechooser/abstract.treevaluechooser.js

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

134
dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 710 KiB

After

Width:  |  Height:  |  Size: 764 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

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

@ -111,7 +111,6 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
cls: "bi-water-mark textarea-watermark", cls: "bi-water-mark textarea-watermark",
textAlign: "left", textAlign: "left",
whiteSpace: o.scrolly ? "normal" : "nowrap", whiteSpace: o.scrolly ? "normal" : "nowrap",
title: o.watermark,
text: o.watermark, text: o.watermark,
invalid: o.invalid, invalid: o.invalid,
disabled: o.disabled, disabled: o.disabled,

2
src/component/treevaluechooser/abstract.treevaluechooser.js

@ -701,7 +701,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
times: 1, times: 1,
isParent: false, isParent: false,
checked: true, checked: true,
halfCheck: false halfCheck: false,
}; };
}); });
}, },

Loading…
Cancel
Save