合并

@@ -59,9 +59,13 @@ class NotebookItemState extends State<NoteBookItem> {
               children: <Widget>[
                 Container(
                   width: ScreenUtil().setWidth(171),
+                  padding: EdgeInsets.symmetric(
+                      horizontal: ScreenUtil().setWidth(24)),
                   alignment: Alignment.center,
                   child: Text(
                     notebook.tableinfoStr?.trim(),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
                     style: TextStyle(
                         color: textColor,
                         // fontWeight: FontWeight.bold,
@@ -81,6 +85,9 @@ class NotebookItemState extends State<NoteBookItem> {
                     children: <Widget>[
                       Text(
                         notebook.rnameStr,
+                        // 'nnnnnnnnnnnnnn',
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
                         style: TextStyle(
                             color: textColor,
                             // fontWeight: FontWeight.bold,
@@ -89,6 +96,8 @@ class NotebookItemState extends State<NoteBookItem> {
                       VEmptyView(10),
                       Text(
                         notebook.phoneStr,
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
                         style: TextStyle(
                             color: textColor,
                             // fontWeight: FontWeight.bold,

@@ -429,7 +429,7 @@ class NoteBookPageState extends State<NoteBookPage> {
                           (BuildContext context, int index) {
                         return NoteBookItem(model.notebooks[index], index);
                       }, childCount: model.notebooks.length),
-                      itemExtent: ScreenUtil().setHeight(112),
+                      itemExtent: ScreenUtil().setWidth(112),
                     )
                   ],
                   onRefresh: () async {

@@ -107,13 +107,12 @@ class NewTableItemState extends State<NewTableItem> {
                                   fontWeight: FontWeight.normal),
                               overflow: TextOverflow.ellipsis,
                               strutStyle: StrutStyle(
-                                  forceStrutHeight: true,
-                                  height: 1,
-                                  leading: 0.2),
+                                forceStrutHeight: true,
+                                height: ScreenUtil().setWidth(2),
+                                // leading: ScreenUtil().setWidth(0.4)
+                              ),
                             ),
-                          )
-                        
-                          ),
+                          )),
                       // Text(
                       //   table.name,
                       //   maxLines: 2,

@@ -144,8 +144,9 @@ class TableItemState extends State<TableItem> {
                               overflow: TextOverflow.ellipsis,
                               strutStyle: StrutStyle(
                                   forceStrutHeight: true,
-                                  height: 1,
-                                  leading: 0.2),
+                                  height: ScreenUtil().setWidth(2),
+                                  // leading: ScreenUtil().setWidth(0.4)
+                                  ),
                             ),
                           )
                           // Text(