Merge pull request #279890 in DEC/fineui from final/11.0 to persist/11.0

* commit 'd3ab2af3fdeb6322659178f22ff9c8a318f223bd':
  BI-148103 fix: 6.0.18过滤组件下拉框异常变小
  BI-138636 fix: 文本、动态时间支持按钮组
  无JIRA 节点的宽度要随内容撑起来
  REPORT-119215 fix: 统一使用clientWidth和clientHeight,父页面代理掉子应用的body的clientHeight和clientWidth到父应用的body上
  REPORT-119215 fix: 统一使用clientWidth和clientHeight,父页面代理掉子应用的body的clientHeight和clientWidth到父应用的body上
  REPORT-119215 fix: 统一获取宽高的方法

packages/fineui/src/base/layer/layer.popover.js

@@ -198,11 +198,11 @@ export class Popover extends Widget {
     mounted() {
         this.startX = 0;
         this.startY = 0;
-        const bodyDom = getOuterBody();
         this.tracker = new MouseMoveTracker(
             (deltaX, deltaY) => {
-                const W = Widget._renderEngine.createElement(bodyDom).width();
-                const H = Widget._renderEngine.createElement(bodyDom).height();
+                const el = Widget._renderEngine.createElement(getOuterBody())[0];
+                const W = el.clientWidth;
+                const H = el.clientHeight;
                 this.startX += deltaX;
                 this.startY += deltaY;
                 this.element.css({
@@ -246,7 +246,7 @@ export class Popover extends Widget {
     }
 
     _getSuitableWidth(width) {
-        return clamp(width, 0, Widget._renderEngine.createElement(getOuterBody()).width());
+        return clamp(width, 0, Widget._renderEngine.createElement(getOuterBody())[0].clientWidth);
     }
 
     _calculateSize() {

packages/fineui/src/case/button/treeitem/item.icon.treeleaf.js

@@ -1,6 +1,9 @@
 import { CenterAdaptLayout, shortcut, extend, createWidget, LogicFactory, Direction } from "@/core";
 import { Icon, Label, BasicButton } from "@/base";
 
+/**
+ * @deprecated
+ */
 @shortcut()
 export class IconTreeLeafItem extends BasicButton {
     static xtype = "bi.icon_tree_leaf_item";

packages/fineui/src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@@ -1,9 +1,14 @@
-import { IconTreeLeafItem } from "./item.icon.treeleaf";
-import { Layout, HorizontalAdaptLayout, shortcut, extend, createWidget, Controller, makeArray, count, Events } from "@/core";
-import { BasicButton } from "@/base";
-
+import {
+    shortcut,
+    extend,
+} from "@/core";
+import { BasicTreeItem } from "./treeitem";
+
+/**
+ * @deprecated
+ */
 @shortcut()
-export class MultiLayerIconTreeLeafItem extends BasicButton {
+export class MultiLayerIconTreeLeafItem extends BasicTreeItem {
     static xtype = "bi.multilayer_icon_tree_leaf_item";
 
     _defaultConfig() {
@@ -14,89 +19,8 @@ export class MultiLayerIconTreeLeafItem extends BasicButton {
             iconCls: "",
             iconHeight: 16,
             iconWidth: 16,
+            showLine: false,
+            indentWidth: 0
         });
     }
-
-    _init() {
-        super._init(...arguments);
-        const o = this.options;
-        this.item = createWidget({
-            type: IconTreeLeafItem.xtype,
-            cls: "bi-list-item-none",
-            iconCls: o.iconCls,
-            id: o.id,
-            pId: o.pId,
-            isFront: true,
-            height: o.height,
-            hgap: o.hgap,
-            text: o.text,
-            value: o.value,
-            py: o.py,
-            keyword: o.keyword,
-            iconWidth: o.iconWidth,
-            iconHeight: o.iconHeight,
-        });
-        this.item.on(Controller.EVENT_CHANGE, (...args) => {
-            const [type] = args;
-            if (type === Events.CLICK) {
-                // 本身实现click功能
-                return;
-            }
-            this.fireEvent(Controller.EVENT_CHANGE, ...args);
-        });
-
-        const items = [];
-        count(0, o.layer, () => {
-            items.push({
-                type: Layout.xtype,
-                width: 15,
-                height: o.height,
-            });
-        });
-        items.push(this.item);
-        createWidget({
-            type: HorizontalAdaptLayout.xtype,
-            element: this,
-            columnSize: makeArray(o.layer, 15),
-            items,
-        });
-    }
-
-    doRedMark() {
-        this.item.doRedMark(...arguments);
-    }
-
-    unRedMark() {
-        this.item.unRedMark(...arguments);
-    }
-
-    doHighLight() {
-        this.item.doHighLight(...arguments);
-    }
-
-    unHighLight() {
-        this.item.unHighLight(...arguments);
-    }
-
-    getId() {
-        return this.options.id;
-    }
-
-    getPId() {
-        return this.options.pId;
-    }
-
-    doClick() {
-        super.doClick(...arguments);
-        this.item.setSelected(this.isSelected());
-    }
-
-    setSelected(v) {
-        super.setSelected(...arguments);
-        this.item.setSelected(v);
-    }
-
-    getValue() {
-        return this.options.value;
-    }
 }

packages/fineui/src/case/button/treeitem/treeitem.js

@@ -20,6 +20,8 @@ export class BasicTreeItem extends NodeButton {
             iconWidth: null,
             iconHeight: null,
             iconCls: "",
+            showLine: true,
+            indentWidth: null,
         });
     }
 
@@ -37,14 +39,16 @@ export class BasicTreeItem extends NodeButton {
             py,
             keyword,
             iconCls,
+            showLine,
+            indentWidth
         } = this.options;
 
         const indent = {
             el: {
                 type: Layout.xtype,
                 height,
-                width: height,
-                cls: this.getLineCls(),
+                width: indentWidth ?? height,
+                cls: showLine ? this.getLineCls() : "",
             },
             lgap: layer * SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, //  偏移公式为每一层的偏移量为节点高度的一半
             width: "",

packages/fineui/src/core/controller/controller.popover.js

@@ -38,7 +38,7 @@ export class PopoverController extends Controller {
             type: "bi.popover",
         }, context);
         this.add(name, popover, options, context);
-        
+
         return this;
     }
 
@@ -58,8 +58,8 @@ export class PopoverController extends Controller {
             const popover = this.get(name);
             popover.show && popover.show();
             const render = this.getRender();
-            const W = Widget._renderEngine.createElement(render).width(),
-                H = Widget._renderEngine.createElement(render).height();
+            const el = Widget._renderEngine.createElement(render)[0];
+            const W = el.clientWidth, H = el.clientHeight;
             const w = popover.element.width(), h = popover.element.height();
             let left = (W - w) / 2, top = (H - h) / 2;
             if (left < 0) {
@@ -74,7 +74,7 @@ export class PopoverController extends Controller {
                 top: `${top}px`,
             });
         }
-        
+
         return this;
     }
 
@@ -87,7 +87,7 @@ export class PopoverController extends Controller {
             this.floatContainer[name].invisible();
             this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]);
         }
-        
+
         return this;
     }
 
@@ -135,7 +135,7 @@ export class PopoverController extends Controller {
                 bottom: 0,
             }],
         });
-        
+
         return this;
     }
 
@@ -167,7 +167,7 @@ export class PopoverController extends Controller {
         delete this.zindexMap[name];
         delete this.floatContainer[name];
         delete this.floatOpened[name];
-        
+
         return this;
     }
 
@@ -181,7 +181,7 @@ export class PopoverController extends Controller {
         this.floatContainer = {};
         this.floatOpened = {};
         this.zindexMap = {};
-        
+
         return this;
     }
 

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

@@ -744,10 +744,11 @@ export function getComboPosition(combo, popup, extraWidth, extraHeight, needAdap
     if (needAdaptHeight === true && popup.resetHeight) {
         const comboRect = combo.element[0].getBoundingClientRect();
         const relativeOffset = positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0;
-        if (position.top < comboRect.top) {
-            popup.resetHeight(Math.min(viewportBounds.height - position.top - relativeOffset, comboRect.top, maxHeight));
-        } else if (position.top >= comboRect.bottom) {
-            popup.resetHeight(Math.min(viewportBounds.height - position.top - relativeOffset, viewportBounds.height - comboRect.bottom, maxHeight));
+        const positionTop = position.top + relativeOffset;
+        if (positionTop < comboRect.top) {
+            popup.resetHeight(Math.min(viewportBounds.height - positionTop, comboRect.top, maxHeight));
+        } else if (positionTop >= comboRect.bottom) {
+            popup.resetHeight(Math.min(viewportBounds.height - positionTop, viewportBounds.height - comboRect.bottom, maxHeight));
         }
     }
 

packages/fineui/webpack/webpack.dev.js

@@ -6,7 +6,7 @@ const dirs = require("./dirs");
 module.exports = merge(common, {
     mode: "development",
 
-    devtool: "inline-source-map",
+    devtool: "eval-source-map",
 
     output: {
         path: dirs.DEST,
@@ -14,14 +14,14 @@ module.exports = merge(common, {
     },
 
     devServer: {
+        headers: {
+            "Access-Control-Allow-Origin": "*",
+        },
         port: 9001,
         // liveReload: true,
         client: {
             logging: 'error',
-            overlay: {
-                errors: true,
-                warnings: false,
-            },
+            overlay: false,
         },
     }
 });