From dc2b67a33c8030fb067625d5b07ad2481bf7ebd8 Mon Sep 17 00:00:00 2001
From: Tsanie <lchen@foresightintelligence.com>
Date: Fri, 23 Feb 2024 09:54:13 +0800
Subject: [PATCH] optimized

---
 lib/ui/grid/grid.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/ui/grid/grid.js b/lib/ui/grid/grid.js
index 58ac3b3..5ff5fae 100644
--- a/lib/ui/grid/grid.js
+++ b/lib/ui/grid/grid.js
@@ -791,13 +791,6 @@ export class Grid {
      * @ignore
      */
     autoResize = true;
-    /**
-     * 列头是否允许换行
-     * @type {boolean}
-     * @default true
-     * @ignore
-     */
-    headerWrap = true;
     /**
      * 表格行高
      * @type {number}
@@ -874,6 +867,13 @@ export class Grid {
      * @ignore
      */
     headerVisible = true;
+    /**
+     * 列头是否允许换行
+     * @type {boolean}
+     * @default true
+     * @ignore
+     */
+    headerWrap = true;
     /**
      * 监听事件的窗口载体
      * @type {(Window | HTMLElement)}
@@ -1021,7 +1021,6 @@ export class Grid {
      * @property {GridLanguages} [langs] - 多语言资源对象
      * @property {number} [virtualCount=100] - 行数大于等于该值则启用虚模式
      * @property {boolean} [autoResize=true] - 未设置宽度的列自动调整列宽
-     * @property {boolean} [headerWrap=true] - 列头是否允许换行
      * @property {number} [rowHeight=36] - 表格行高
      * @property {number} [lineHeight=24] - 文本行高（多行文本列计算高度时使用）
      * @property {string} [filterIcon=ellipsis-h] - 列头未过滤时的图标
@@ -1033,6 +1032,7 @@ export class Grid {
      * @property {boolean} [fullrowClick=true] - 为 `false` 时只有点击在单元格内才会选中行
      * @property {boolean} [tooltipDisabled=false] - 单元格 tooltip 是否禁用
      * @property {boolean} [headerVisible=true] - 列头是否显示
+     * @property {boolean} [headerWrap=true] - 列头是否允许换行
      * @property {(Window | HTMLElement)} [window=global] - 监听事件的窗口载体
      * @property {number} [sortIndex=-1] - 排序列的索引
      * @property {GridColumnDirection} [sortDirection=GridColumnDirection.Ascending] - 排序方式，正数升序，负数倒序
@@ -1420,7 +1420,7 @@ export class Grid {
             return;
         }
         const body = this._var.refs.body;
-        const top = this.headerVisible === false ? 0 : this.rowHeight; // this._var.refs.header.offsetHeight;
+        const top = this.headerVisible === false ? 0 : (this._var.refs.header.offsetHeight || this.rowHeight);
 
         let height = this.height;
         if (height === 0) {
@@ -2280,7 +2280,8 @@ export class Grid {
         const dragger = createElement('div', 'dragger');
         const draggerCursor = createElement('layer', 'dragger-cursor');
         header.appendChild(
-            createElement('th', null, dragger, draggerCursor, createElement('div')));
+            createElement('th', null,
+                dragger, draggerCursor, createElement('div'), createElement('em', 'bottom-border')));
 
         sizer.replaceChildren();
         this._var.refs.header = header;
@@ -2797,7 +2798,7 @@ export class Grid {
      */
     _layoutHeaderFooter() {
         const children = this._var.refs.table.children;
-        this._var.headerHeight = this.headerWrap ? children[0].offsetHeight : this.rowHeight;
+        this._var.headerHeight = this.headerVisible === false ? 0 : (this.headerWrap ? children[0].offsetHeight : this.rowHeight);
         if (this.total != null) {
             this._var.footerHeight = children[2].offsetHeight;
             const footerOffset = this._var.refs.table.offsetHeight - this._var.el.clientHeight;