From b85a920464b9fca0c9c36e3fbd5521b82689ceda Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Wed, 29 Sep 2021 14:34:23 +0800
Subject: [PATCH] 1

---
 web/src/x.min.js               | 2 +-
 web/static/css/fixed-table.css | 2 +-
 web/static/css/style.css       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index c6cf75f..2009c23 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -8712,7 +8712,7 @@ var X = window.X || {
             console.log("table",data);
             X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
                 $("#conent-box"+data.id).html(html);
-                if(data.modeltype == 'table'){
+                if(data.modeltype == 'table' && data.modelsize != "small"){
                     var headdata = [];
                     for(let i in data.titledata){
                         var arr =  {
diff --git a/web/static/css/fixed-table.css b/web/static/css/fixed-table.css
index d01bef2..bfe1a08 100644
--- a/web/static/css/fixed-table.css
+++ b/web/static/css/fixed-table.css
@@ -87,7 +87,7 @@ body{
     text-overflow: ellipsis;
     overflow: hidden;
     word-break: break-all;
-
+    width: 150px;
 }
 /* 表头 start */
 .fixed-table-box>.fixed-table_header-wraper{
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 4492870..d6872b9 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -169,8 +169,8 @@
 .control { height: 21px; display: block; }
 .tool-show .control { display: block; }
 
-.table-box { margin: 10px 24px 0 24px; height: 290px; overflow-x: auto; overflow-y: hidden; }
-.table-tbody-box { height: 290px; overflow-x: auto; overflow-y: hidden; }
+.table-box { margin: 10px 24px 0 24px; height: 300px; overflow-x: auto; overflow-y: hidden; }
+.table-tbody-box { height: 300px; overflow-x: auto; overflow-y: auto; }
 .table-thead { } 
 
 .layui-table-body { height: 242px; overflow: auto; }
@@ -612,7 +612,7 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 .w-300{width: 300px;}
 .w-100{width: 100px;}
 .ws-100 { width: 100px; }
-.ws-150 { width: 150px; }
+.ws-150 { width: 150px; white-space: nowrap; text-overflow: ellipsis;  overflow: hidden;  word-break: break-all;}
 .btns{text-align: center;}
 .btns button{padding: 10px 20px;}