diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot
index 30d5644ca..1869759e5 100644
Binary files a/packages/fineui/dist/font/iconfont.eot 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
index 0aa415779..cc9ca8397 100644
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@@ -14,6 +14,50 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -610,7 +654,7 @@
-
+
@@ -1382,7 +1426,7 @@
-
+
@@ -1436,7 +1480,7 @@
-
+
@@ -1448,7 +1492,7 @@
-
+
@@ -1546,13 +1590,13 @@
-
+
-
+
@@ -1998,13 +2042,13 @@
-
+
-
+
diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf
index 243165efe..9fd8ae7ef 100644
Binary files a/packages/fineui/dist/font/iconfont.ttf 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
index e8fb8e441..a442eb7d8 100644
Binary files a/packages/fineui/dist/font/iconfont.woff 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
index 2229cff55..ba94e1622 100644
Binary files a/packages/fineui/dist/font/iconfont.woff2 and b/packages/fineui/dist/font/iconfont.woff2 differ
diff --git a/packages/fineui/src/base/1.pane.js b/packages/fineui/src/base/1.pane.js
index e36f2bd81..ddb731dc8 100644
--- a/packages/fineui/src/base/1.pane.js
+++ b/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();
+ }
}
diff --git a/packages/fineui/src/base/tree/customtree.js b/packages/fineui/src/base/tree/customtree.js
index 349ae0912..eb774edfc 100644
--- a/packages/fineui/src/base/tree/customtree.js
+++ b/packages/fineui/src/base/tree/customtree.js
@@ -16,7 +16,8 @@ import {
isNull,
createWidget,
Controller,
- Events
+ Events,
+ omit,
} from "@/core";
/**
@@ -104,7 +105,7 @@ export class CustomTree extends Widget {
return itemsCreator.apply(this, args);
};
- isNull(item.popup.el) && (item.popup.el = deepClone(this.options.el));
+ isNull(item.popup.el) && (item.popup.el = deepClone(omit(this.options.el, "node")));
item.popup.el.node = item.el;
items.push(item);
} else {
diff --git a/packages/fineui/src/core/func/alias.js b/packages/fineui/src/core/func/alias.js
index fc0eaa772..94f12a814 100644
--- a/packages/fineui/src/core/func/alias.js
+++ b/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)) {
diff --git a/packages/fineui/src/widget/downlist/item.downlist.js b/packages/fineui/src/widget/downlist/item.downlist.js
index 6e27674ec..a83de5eb6 100644
--- a/packages/fineui/src/widget/downlist/item.downlist.js
+++ b/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,
diff --git a/packages/fineui/src/widget/downlist/popup.downlist.js b/packages/fineui/src/widget/downlist/popup.downlist.js
index ebb1e48ce..e85e05819 100644
--- a/packages/fineui/src/widget/downlist/popup.downlist.js
+++ b/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 = {
diff --git a/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js b/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js
index a55504ec0..512ca7a0f 100644
--- a/packages/fineui/src/widget/multilayerdownlist/popup.downlist.js
+++ b/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 = {
diff --git a/packages/fineui/src/widget/multiselect/loader.js b/packages/fineui/src/widget/multiselect/loader.js
index 933c96e43..589b205e7 100644
--- a/packages/fineui/src/widget/multiselect/loader.js
+++ b/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;
}