diff --git a/.gitignore b/.gitignore index a0270fb28..1eb1d0eeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ node_modules -dist \ No newline at end of file +packages/demo/dist +packages/fineui/dist/* +!packages/fineui/dist/font \ No newline at end of file diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot new file mode 100644 index 000000000..0748c3d45 Binary files /dev/null and b/packages/fineui/dist/font/iconfont.eot differ diff --git a/packages/fineui/dist/font/iconfont.svg b/packages/fineui/dist/font/iconfont.svg new file mode 100644 index 000000000..dc1ea8d93 --- /dev/null +++ b/packages/fineui/dist/font/iconfont.svg @@ -0,0 +1,2241 @@ + + + + Created by iconfont + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf new file mode 100644 index 000000000..fb2d0fa00 Binary files /dev/null and b/packages/fineui/dist/font/iconfont.ttf differ diff --git a/packages/fineui/dist/font/iconfont.woff b/packages/fineui/dist/font/iconfont.woff new file mode 100644 index 000000000..a2217989b Binary files /dev/null and b/packages/fineui/dist/font/iconfont.woff differ diff --git a/packages/fineui/dist/font/iconfont.woff2 b/packages/fineui/dist/font/iconfont.woff2 new file mode 100644 index 000000000..adb8a1a22 Binary files /dev/null and b/packages/fineui/dist/font/iconfont.woff2 differ diff --git a/packages/fineui/src/base/collection/collection.js b/packages/fineui/src/base/collection/collection.js index d8de3b717..e66d677b7 100644 --- a/packages/fineui/src/base/collection/collection.js +++ b/packages/fineui/src/base/collection/collection.js @@ -359,11 +359,9 @@ export class CollectionView extends Widget { _isOverflowY() { const o = this.options; - const { overflowX } = this.options; + const { overflowY, scrollable, scrolly } = o; // 兼容一下 - const scrollable = o.scrollable, - scrolly = o.scrolly; - if (overflowX === false) { + if (overflowY === false) { return false; } if (scrolly) { diff --git a/packages/fineui/src/case/trigger/trigger.text.js b/packages/fineui/src/case/trigger/trigger.text.js index cce8cf6d6..dfe9cef1b 100644 --- a/packages/fineui/src/case/trigger/trigger.text.js +++ b/packages/fineui/src/case/trigger/trigger.text.js @@ -47,7 +47,6 @@ export class TextTrigger extends Trigger { height: o.height, text: text || o.defaultText, tipType: o.tipType, - title: o.title, warningTitle: o.warningTitle, hgap: o.textHgap, vgap: o.textVgap, diff --git a/packages/fineui/src/case/trigger/trigger.text.select.js b/packages/fineui/src/case/trigger/trigger.text.select.js index 730a9feff..48af5c5de 100644 --- a/packages/fineui/src/case/trigger/trigger.text.select.js +++ b/packages/fineui/src/case/trigger/trigger.text.select.js @@ -43,7 +43,7 @@ export class SelectTextTrigger extends Trigger { textTgap: o.textTgap, textBgap: o.textBgap, tipType: o.tipType, - title: o.title, + title: null, allowClear: o.allowClear, listeners: [ { diff --git a/packages/fineui/src/core/utils/dom.js b/packages/fineui/src/core/utils/dom.js index fcc53e9d7..52af3c798 100644 --- a/packages/fineui/src/core/utils/dom.js +++ b/packages/fineui/src/core/utils/dom.js @@ -2,7 +2,7 @@ * 对DOM操作的通用函数 */ import { Widget } from "../4.widget" -import { each, isEmpty, isNull } from "../2.base"; +import { each, isEmpty, isNull, isNotNull } from "../2.base"; import $ from "jquery"; export function ready(fn) { @@ -103,13 +103,14 @@ export function getTextSizeHeight(text, fontSize = 12) { // 获取滚动条的宽度，页面display: none时候获取到的为0 let _scrollWidth = null; -export function getScrollWidth() { - if (isNull(_scrollWidth) || _scrollWidth === 0) { +export function getScrollWidth(css) { + if (isNull(_scrollWidth) || isNotNull(css) || _scrollWidth === 0) { const ul = Widget._renderEngine.createElement("
").width(50).height(50) .css({ position: "absolute", top: "-9999px", overflow: "scroll", + ...css }) .appendTo("body"); _scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; diff --git a/packages/fineui/src/less/base/single/text.less b/packages/fineui/src/less/base/single/text.less index bd4aada73..dcdabf602 100644 --- a/packages/fineui/src/less/base/single/text.less +++ b/packages/fineui/src/less/base/single/text.less @@ -3,5 +3,7 @@ .bi-text { .overflow-hidden(); .box-sizing(border-box); - word-break: break-all; + // https://developer.mozilla.org/en-US/docs/Web/CSS/word-break 参考mdn最标准的规范. 不再接受任何质疑 + word-break: normal; + overflow-wrap: anywhere; } \ No newline at end of file diff --git a/packages/fineui/src/less/widget/multitree/check/multi.tree.check.pane.less b/packages/fineui/src/less/widget/multitree/check/multi.tree.check.pane.less deleted file mode 100644 index e193fb210..000000000 --- a/packages/fineui/src/less/widget/multitree/check/multi.tree.check.pane.less +++ /dev/null @@ -1,9 +0,0 @@ -@import "../../../index.less"; - -.bi-multi-tree-check-pane { - & .multi-tree-continue-select { - } - & .multi-tree-check-selected { - color: @color-bi-text-multi-tree-check-pane-check-button; - } -} \ No newline at end of file diff --git a/packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js b/packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js index e383ee518..809d1dc67 100644 --- a/packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js +++ b/packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js @@ -42,7 +42,7 @@ export class MultiTreeCheckPane extends Pane { type: TextButton.xtype, title: i18nText("BI-Continue_Select"), text: i18nText("BI-Continue_Select"), - cls: "multi-tree-check-selected", + cls: "bi-high-light", }); continueSelect.on(TextButton.EVENT_CHANGE, () => { opts.onClickContinueSelect();