Browse Source

Merge pull request #274918 in DEC/fineui from final/11.0 to release/11.0

* commit '6378314e1ba23e8cc18b940b7e5dabb194a51116':
  BI-138679 feat: 更新图标
  BI-147341 fix:contentFormat未考虑时区问题
  BI-142937 fix: 更新字体文件
  无JIRA super调用修复
  BI-143992 fix: 【6.0.17集成】FDL生成的ETL表,右键鼠标悬浮在灰化的来源、原始名上,提示不对
  无JIRA fix: pane的内存泄漏
  BI-146095 fix:文本下拉加载最后一次缓存时cachegroup新增了
  KERNEL-17875 fix: fineui Dep不能回收问题
master^2^2
superman 8 months ago
parent
commit
b87665d7be
  1. BIN
      packages/fineui/dist/font/iconfont.eot
  2. 60
      packages/fineui/dist/font/iconfont.svg
  3. BIN
      packages/fineui/dist/font/iconfont.ttf
  4. BIN
      packages/fineui/dist/font/iconfont.woff
  5. BIN
      packages/fineui/dist/font/iconfont.woff2
  6. 16
      packages/fineui/src/base/1.pane.js
  7. 7
      packages/fineui/src/core/func/alias.js
  8. 12
      packages/fineui/src/widget/downlist/item.downlist.js
  9. 6
      packages/fineui/src/widget/downlist/popup.downlist.js
  10. 5
      packages/fineui/src/widget/multilayerdownlist/popup.downlist.js
  11. 6
      packages/fineui/src/widget/multiselect/loader.js

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

Binary file not shown.

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

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1024 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

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.

16
packages/fineui/src/base/1.pane.js

@ -111,11 +111,11 @@ export class Pane extends Widget {
}
];
isNotEmptyString(o.loadingText) &&
loadingTipItems.push({
type: Text.xtype,
text: o.loadingText,
tgap: this._getSize(10),
});
loadingTipItems.push({
type: Text.xtype,
text: o.loadingText,
tgap: this._getSize(10),
});
return [
{
@ -158,4 +158,10 @@ export class Pane extends Widget {
this.options.items = items || [];
this.check();
}
destroyed() {
super.destroyed?.();
Layers.remove(`${this.getName()}-loading`);
this._loading?.destroy();
}
}

7
packages/fineui/src/core/func/alias.js

@ -9,7 +9,8 @@ import {
leftPad,
parseDateTime,
values,
isArray
isArray,
getDate
} from "../2.base";
import { replaceAll } from "./string";
import { getFullDayName, getMonthName, getTimezone } from "./date";
@ -680,10 +681,10 @@ export const contentFormat = function(cv, fmt) {
if (!(cv instanceof Date)) {
if (typeof cv === "number") {
// 毫秒数类型
cv = new Date(cv);
cv = getDate(cv);
} else {
// 字符串类型转化为date类型
cv = new Date(Date.parse((`${cv}`).replace(/-|\./g, "/")));
cv = getDate(Date.parse((`${cv}`).replace(/-|\./g, "/")));
}
}
if (!isInvalidDate(cv) && !isNull(cv)) {

12
packages/fineui/src/widget/downlist/item.downlist.js

@ -1,5 +1,14 @@
import { Label, Icon, BasicButton } from "@/base";
import { CenterAdaptLayout, shortcut, extend, createWidget, isPlainObject, LogicFactory, Direction, SIZE_CONSANTS } from "@/core";
import {
CenterAdaptLayout,
shortcut,
extend,
createWidget,
isPlainObject,
LogicFactory,
Direction,
SIZE_CONSANTS
} from "@/core";
@shortcut()
export class DownListItem extends BasicButton {
@ -39,7 +48,6 @@ export class DownListItem extends BasicButton {
lgap: o.textLgap,
rgap: o.textRgap,
text: o.text,
title: o.title,
value: o.value,
keyword: o.keyword,
height: o.height,

6
packages/fineui/src/widget/downlist/popup.downlist.js

@ -127,7 +127,7 @@ export class DownListPopup extends Pane {
item.trigger = "hover";
item.isNeedAdjustWidth = false;
item.el = sourceItem.el;
item.el.title = sourceItem.el.title || sourceItem.el.text;
item.el.title = sourceItem.el.title;
item.el.type = "bi.down_list_group_item";
item.el.logic = {
dynamic: true,
@ -151,7 +151,7 @@ export class DownListPopup extends Pane {
this._createChildren(item, sourceItem);
} else {
item.type = sourceItem.type || "bi.down_list_item";
item.title = sourceItem.title || sourceItem.text;
item.title = sourceItem.title;
item.textRgap = 10;
item.isNeedAdjustWidth = false;
item.logic = {
@ -202,7 +202,7 @@ export class DownListPopup extends Pane {
this.singleValues.push(item.value);
item.type = item.type || "bi.down_list_item";
item.extraCls = " child-down-list-item";
item.title = item.title || item.text;
item.title = item.title;
item.textRgap = 10;
item.isNeedAdjustWidth = false;
item.logic = {

5
packages/fineui/src/widget/multilayerdownlist/popup.downlist.js

@ -131,7 +131,7 @@ export class MultiLayerDownListPopup extends Pane {
item.trigger = "hover";
item.isNeedAdjustWidth = false;
item.el = sourceItem.el;
item.el.title = sourceItem.el.title || sourceItem.el.text;
item.el.title = sourceItem.el.title;
item.el.type = DownListGroupItem.xtype;
item.el.logic = {
dynamic: true,
@ -155,7 +155,7 @@ export class MultiLayerDownListPopup extends Pane {
self._createChildren(item, sourceItem);
} else {
item.type = sourceItem.type || DownListItem.xtype;
item.title = sourceItem.title || sourceItem.text;
item.title = sourceItem.title;
item.textRgap = 10;
item.isNeedAdjustWidth = false;
item.logic = {
@ -209,7 +209,6 @@ export class MultiLayerDownListPopup extends Pane {
self.singleValues.push(item.value);
item.type = item.type || DownListItem.xtype;
item.extraCls = " child-down-list-item";
item.title = item.title || item.text;
item.textRgap = 10;
item.isNeedAdjustWidth = false;
item.logic = {

6
packages/fineui/src/widget/multiselect/loader.js

@ -74,7 +74,7 @@ export class MultiSelectInnerLoader extends Widget {
this.next.setLoaded();
const items = this._composeItems(this.cachItems.slice(0, 100));
this.cachItems = this.cachItems.slice(100);
this.addItems(items);
this.addItems(items, true);
return;
}
@ -183,7 +183,7 @@ export class MultiSelectInnerLoader extends Widget {
]);
}
addItems(items) {
addItems(items, isFromCache = false) {
this.count += items.length;
if (isObject(this.next)) {
if (this.hasNext()) {
@ -194,7 +194,7 @@ export class MultiSelectInnerLoader extends Widget {
}
}
// cacheGroup渲染的是全量的,如果这次加载更多add的items是从cacheItems里面拿的,那不用再add了
if (this.cachItems.length > 0) {
if (isFromCache) {
this.button_group.addItems(...arguments);
return;
}

Loading…
Cancel
Save