合并

dist/index.html

@@ -6,7 +6,11 @@
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>IM</title>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-166ed02a.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-32ae0551.js"></script>
+>>>>>>> iteration-20240620-small
   <link rel="stylesheet" href="./assets/index-49e6d7d7.css">
 </head>
 

src/TUIKit/locales/zh_cn/TUIChat.json

@@ -27,7 +27,7 @@
   "取消": "取消",
   "确定": "确定",
   "转发给": "转发给",
-  "请输入消息": "请输入消息",
+  "请输入消息": "请输入消息，按Ctrl + ↵ 换行",
   "描述": "描述",
   "经度": "经度",
   "纬度": "纬度",

src/index.scss

@@ -434,6 +434,7 @@
   display: flex;
   flex-direction: column;
   width: 100%;
+  min-height: 100vh;
   background-size: contain;
 
   &-header {
@@ -623,7 +624,8 @@
       flex: 1;
       box-sizing: border-box;
       height: 100%;
-      min-width: 968Px;
+      // min-width: 968Px;
+      width: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
@@ -635,7 +637,8 @@
     height: 100%;
     overflow: hidden;
     box-sizing: border-box;
-    min-height: 640Px;
+    // min-height: 640Px;
+    height: 100%;
     flex: 1;
     border-radius: 12Px;
     display: flex;
@@ -728,6 +731,7 @@
     &-main {
       flex: 1;
       display: flex;
+      min-height: 100vh;
 
       .conversation {
         min-width: 300Px;

src/style.css

@@ -25,8 +25,8 @@ a:hover {
 
 body {
   margin: 0;
-  display: flex;
-  place-items: center;
+  /* display: flex;
+  place-items: center; */
   min-width: 320px;
   min-height: 100vh;
 }