Browse Source

KERNEL-14316 fix:同步以及修复相关细节问题

es6
Treecat 2 years ago
parent
commit
faa3b96827
  1. 4
      .gitignore
  2. BIN
      packages/fineui/dist/font/iconfont.eot
  3. 2241
      packages/fineui/dist/font/iconfont.svg
  4. BIN
      packages/fineui/dist/font/iconfont.ttf
  5. BIN
      packages/fineui/dist/font/iconfont.woff
  6. BIN
      packages/fineui/dist/font/iconfont.woff2
  7. 6
      packages/fineui/src/base/collection/collection.js
  8. 1
      packages/fineui/src/case/trigger/trigger.text.js
  9. 2
      packages/fineui/src/case/trigger/trigger.text.select.js
  10. 7
      packages/fineui/src/core/utils/dom.js
  11. 4
      packages/fineui/src/less/base/single/text.less
  12. 9
      packages/fineui/src/less/widget/multitree/check/multi.tree.check.pane.less
  13. 2
      packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js

4
.gitignore vendored

@ -1,2 +1,4 @@
node_modules node_modules
dist packages/demo/dist
packages/fineui/dist/*
!packages/fineui/dist/font

BIN
packages/fineui/dist/font/iconfont.eot vendored

Binary file not shown.

2241
packages/fineui/dist/font/iconfont.svg vendored

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 885 KiB

BIN
packages/fineui/dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff vendored

Binary file not shown.

BIN
packages/fineui/dist/font/iconfont.woff2 vendored

Binary file not shown.

6
packages/fineui/src/base/collection/collection.js

@ -359,11 +359,9 @@ export class CollectionView extends Widget {
_isOverflowY() { _isOverflowY() {
const o = this.options; const o = this.options;
const { overflowX } = this.options; const { overflowY, scrollable, scrolly } = o;
// 兼容一下 // 兼容一下
const scrollable = o.scrollable, if (overflowY === false) {
scrolly = o.scrolly;
if (overflowX === false) {
return false; return false;
} }
if (scrolly) { if (scrolly) {

1
packages/fineui/src/case/trigger/trigger.text.js

@ -47,7 +47,6 @@ export class TextTrigger extends Trigger {
height: o.height, height: o.height,
text: text || o.defaultText, text: text || o.defaultText,
tipType: o.tipType, tipType: o.tipType,
title: o.title,
warningTitle: o.warningTitle, warningTitle: o.warningTitle,
hgap: o.textHgap, hgap: o.textHgap,
vgap: o.textVgap, vgap: o.textVgap,

2
packages/fineui/src/case/trigger/trigger.text.select.js

@ -43,7 +43,7 @@ export class SelectTextTrigger extends Trigger {
textTgap: o.textTgap, textTgap: o.textTgap,
textBgap: o.textBgap, textBgap: o.textBgap,
tipType: o.tipType, tipType: o.tipType,
title: o.title, title: null,
allowClear: o.allowClear, allowClear: o.allowClear,
listeners: [ listeners: [
{ {

7
packages/fineui/src/core/utils/dom.js

@ -2,7 +2,7 @@
* 对DOM操作的通用函数 * 对DOM操作的通用函数
*/ */
import { Widget } from "../4.widget" import { Widget } from "../4.widget"
import { each, isEmpty, isNull } from "../2.base"; import { each, isEmpty, isNull, isNotNull } from "../2.base";
import $ from "jquery"; import $ from "jquery";
export function ready(fn) { export function ready(fn) {
@ -103,13 +103,14 @@ export function getTextSizeHeight(text, fontSize = 12) {
// 获取滚动条的宽度,页面display: none时候获取到的为0 // 获取滚动条的宽度,页面display: none时候获取到的为0
let _scrollWidth = null; let _scrollWidth = null;
export function getScrollWidth() { export function getScrollWidth(css) {
if (isNull(_scrollWidth) || _scrollWidth === 0) { if (isNull(_scrollWidth) || isNotNull(css) || _scrollWidth === 0) {
const ul = Widget._renderEngine.createElement("<div>").width(50).height(50) const ul = Widget._renderEngine.createElement("<div>").width(50).height(50)
.css({ .css({
position: "absolute", position: "absolute",
top: "-9999px", top: "-9999px",
overflow: "scroll", overflow: "scroll",
...css
}) })
.appendTo("body"); .appendTo("body");
_scrollWidth = ul[0].offsetWidth - ul[0].clientWidth; _scrollWidth = ul[0].offsetWidth - ul[0].clientWidth;

4
packages/fineui/src/less/base/single/text.less

@ -3,5 +3,7 @@
.bi-text { .bi-text {
.overflow-hidden(); .overflow-hidden();
.box-sizing(border-box); .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;
} }

9
packages/fineui/src/less/widget/multitree/check/multi.tree.check.pane.less

@ -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;
}
}

2
packages/fineui/src/widget/multitree/check/multi.tree.check.pane.js

@ -42,7 +42,7 @@ export class MultiTreeCheckPane extends Pane {
type: TextButton.xtype, type: TextButton.xtype,
title: i18nText("BI-Continue_Select"), title: i18nText("BI-Continue_Select"),
text: i18nText("BI-Continue_Select"), text: i18nText("BI-Continue_Select"),
cls: "multi-tree-check-selected", cls: "bi-high-light",
}); });
continueSelect.on(TextButton.EVENT_CHANGE, () => { continueSelect.on(TextButton.EVENT_CHANGE, () => {
opts.onClickContinueSelect(); opts.onClickContinueSelect();

Loading…
Cancel
Save