From dc2cc432d3a606b62b30b4c8a641e1f5cbd408e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 22 十一月 2024 17:46:52 +0800
Subject: [PATCH] 2024-11-22

---
 src/tabviews/custom/components/table/edit-table/normalTable/index.scss |    8 ++++++++
 src/tabviews/custom/components/card/cardcellList/index.jsx             |    2 +-
 src/tabviews/custom/components/share/normalTable/index.scss            |    8 ++++++++
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 2924236..eb4b1dc 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1042,7 +1042,7 @@
         if (val !== '') {
           if (val && typeof(val) === 'string') {
             if (!card.evalchars || card.evalchars.includes('enter')) {
-              val = val.replace(/\n/ig, '<br/>')
+              val = val.replace(/\\n|\n/ig, '<br/>')
             }
             if ((!card.evalchars || card.evalchars.includes('space')) && !/<(span|div|p|a|img)\s/g.test(val)) {
               val = val.replace(/\s/ig, '&nbsp;')
diff --git a/src/tabviews/custom/components/share/normalTable/index.scss b/src/tabviews/custom/components/share/normalTable/index.scss
index b41bf8b..120fac2 100644
--- a/src/tabviews/custom/components/share/normalTable/index.scss
+++ b/src/tabviews/custom/components/share/normalTable/index.scss
@@ -170,6 +170,14 @@
   }
   .ant-table-small.ant-table-bordered {
     border-right: 1px solid #e8e8e8;
+
+    .ant-table-content {
+      border-radius: inherit;
+
+      .ant-table-scroll {
+        border-radius: inherit;
+      }
+    }
   }
 
   table, tr, th, td, .ant-table-small {
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 62322be..1573c0b 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -232,6 +232,14 @@
   }
   .ant-table-small.ant-table-bordered {
     border-right: 1px solid #e8e8e8;
+
+    .ant-table-content {
+      border-radius: inherit;
+
+      .ant-table-scroll {
+        border-radius: inherit;
+      }
+    }
   }
   table, tr, th, td, .ant-table-small {
     border-color: var(--mk-table-border-color)!important;

--
Gitblit v1.8.0