From 6edb96e64b2e1e46da607973501d2fb7d6b5e17c Mon Sep 17 00:00:00 2001
From: zhujiamin <1147570162@qq.com>
Date: Wed, 12 Jul 2023 18:36:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=89=E4=BF=AE=E6=94=B9=E3=80=81=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E7=AD=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/control/grid/grid/grid.scss      | 10 ++++--
 src/control/grid/grid/grid.tsx       | 53 ++++++++++++++++------------
 src/editor/text-box/input/input.scss |  8 +++++
 3 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/src/control/grid/grid/grid.scss b/src/control/grid/grid/grid.scss
index 5403ae1b..a4244ba7 100644
--- a/src/control/grid/grid/grid.scss
+++ b/src/control/grid/grid/grid.scss
@@ -21,7 +21,7 @@ $control-grid-content: (
 $control-grid-page: (
   'text-color': getCssVar('control-grid', 'text-color'),
   'height': 50px,
-  'padding': calc(getCssVar('padding') / 2) 0,
+  'padding': 6px,
 );
 
 @include b(control-grid) {
@@ -103,10 +103,14 @@ $control-grid-page: (
     }
   }
 
-  @include b(control-grid-page) {
+  @include b(grid-page) {
+    box-sizing: border-box;
     height: getCssVar('control-grid-page', 'height');
+    padding: getCssVar('control-grid-page', 'padding');
     @include flex(row, flex-end);
 
-    padding: getCssVar('control-grid-page', 'padding');
+    .el-pagination {
+      overflow: auto;
+    }
   }
 }
diff --git a/src/control/grid/grid/grid.tsx b/src/control/grid/grid/grid.tsx
index 31d72610..50add6c8 100644
--- a/src/control/grid/grid/grid.tsx
+++ b/src/control/grid/grid/grid.tsx
@@ -69,6 +69,7 @@ export const GridControl = defineComponent({
     const { hideHeader, enablePagingBar, minorSortAppDEFieldId, minorSortDir } =
       this.c.model;
 
+    // 绘制除分组列之外的表格列
     const renderColumn = (model: IDEGridColumn, index: number) => {
       const { codeName: columnName, width } = model;
       const columnC = this.c.columns[columnName!];
@@ -107,6 +108,34 @@ export const GridControl = defineComponent({
         </el-table-column>
       );
     };
+
+    // 绘制表格列
+    const renderChildColumn = (model: IDEGridColumn, index: number) => {
+      if (model.columnType === 'GROUPGRIDCOLUMN') {
+        const childColumns =
+          (model as IDEGridGroupColumn).degridColumns?.filter(
+            item => !item.hideDefault,
+          ) || [];
+        const { width } = model;
+        return (
+          <el-table-column
+            label={model.caption}
+            min-width={width}
+            align={model.align?.toLowerCase() || 'center'}
+          >
+            {{
+              default: () => {
+                return childColumns.map((column, index2) => {
+                  return renderChildColumn(column, index2);
+                });
+              },
+            }}
+          </el-table-column>
+        );
+      }
+      return renderColumn(model, index);
+    };
+
     return (
       <iBizControlBase
         class={[
@@ -140,29 +169,7 @@ export const GridControl = defineComponent({
           )}
           {state.isCreated &&
             this.renderColumns.map((model, index) => {
-              if (model.columnType === 'GROUPGRIDCOLUMN') {
-                const childColumns =
-                  (model as IDEGridGroupColumn).degridColumns?.filter(
-                    item => !item.hideDefault,
-                  ) || [];
-                const { width } = model;
-                return (
-                  <el-table-column
-                    label={model.caption}
-                    min-width={width}
-                    align={model.align?.toLowerCase() || 'center'}
-                  >
-                    {{
-                      default: () => {
-                        return childColumns.map((column, index2) => {
-                          return renderColumn(column, index2);
-                        });
-                      },
-                    }}
-                  </el-table-column>
-                );
-              }
-              return renderColumn(model, index);
+              return renderChildColumn(model, index);
             })}
         </el-table>
         {enablePagingBar && (
diff --git a/src/editor/text-box/input/input.scss b/src/editor/text-box/input/input.scss
index 21131111..12c9c076 100644
--- a/src/editor/text-box/input/input.scss
+++ b/src/editor/text-box/input/input.scss
@@ -1,5 +1,8 @@
 @include b('input') {
+  height: 100%;
+
   .el-input .el-input__inner {
+    height: 100%;
     font-size: getCssVar('form-item', 'font-size');
     color: getCssVar('form-item', 'text-color');
     border-color: getCssVar('form-item', 'border-color');
@@ -16,6 +19,7 @@
   }
 
   .el-textarea .el-textarea__inner {
+    height: 100%;
     font-size: getCssVar('form-item', 'font-size');
     color: getCssVar('form-item', 'text-color');
     border-color: getCssVar('form-item', 'border-color');
@@ -32,6 +36,10 @@
     @include overflow-wrap;
   }
 
+  @include b(input-input) {
+    height: 100%;
+  }
+
   @include m(readonly) {
     color: getCssVar('form-item', 'readonly-color');
   }
-- 
Gitee