Pull request #274906: 无jira任务：feature/x 合并 Final/11.0

Merge in DEC/fineui from ~ZOEY.CHEN/fineui_:final/11.0 to final/11.0

* commit '877e71adfc927d1e6ca27453e550cb198b3fad73':
  BI-138679 feat: 更新图标
  BI-147341 fix：contentFormat未考虑时区问题
  BI-142937 fix: 更新字体文件
  FDL-10490 fix:demo平台权限管理api列表显示空白
  无JIRA super调用修复
  BI-143992 fix: 【6.0.17集成】FDL生成的ETL表，右键鼠标悬浮在灰化的来源、原始名上，提示不对
  无JIRA fix: pane的内存泄漏
  BI-146095 fix：文本下拉加载最后一次缓存时cachegroup新增了
  KERNEL-17875 fix: fineui Dep不能回收问题

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

@@ -111,11 +111,11 @@ export class Pane extends Widget {
             }
         ];
         isNotEmptyString(o.loadingText) &&
-            loadingTipItems.push({
+        loadingTipItems.push({
-                type: Text.xtype,
+            type: Text.xtype,
-                text: o.loadingText,
+            text: o.loadingText,
-                tgap: this._getSize(10),
+            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();
+    }
 }

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 {

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)) {

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,

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 = {

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 = {

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