From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/table/edit-table/columns/editColumn/index.scss |   41 ++++++++++++++++++++++++-----------------
 1 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.scss b/src/menu/components/table/edit-table/columns/editColumn/index.scss
index 05b0e19..35a64a8 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.scss
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.scss
@@ -6,15 +6,22 @@
       padding-right: 3px;
     }
   }
-  .ant-form-item.text-area {
-    >.ant-form-item-control-wrapper {
-      width: 88%;
-    }
-    >.ant-form-item-label {
-      width: 12%;
-    }
-    .CodeMirror {
-      height: 150px;
+  >.ant-row >.ant-col {
+    display: inline-block;
+    vertical-align: top;
+    float: none;
+  }
+  .ant-col-24 {
+    >.ant-form-item {
+      >.ant-form-item-label {
+        width: 12%;
+      }
+      >.ant-form-item-control-wrapper {
+        width: 88%;
+      }
+      .CodeMirror {
+        height: 150px;
+      }
     }
   }
   .formula-icon {
@@ -37,16 +44,16 @@
     cursor: pointer;
     font-size: 14px;
   }
+  .show-public-var {
+    margin-top: 20px;
+  }
   .resource-public-var {
     position: absolute;
     left: 0px;
-    top: -25px;
-    font-size: 14px;
-  }
-  >.ant-row >.ant-col {
-    display: inline-block;
-    vertical-align: top;
-    float: none;
+    top: -45px;
+    right: 40px;
+    font-size: 13px;
+    color: rgba(0, 0, 0, 0.65);
   }
 }
 .formula-fields {
@@ -55,7 +62,7 @@
   .ant-popover-inner-content {
     div {
       max-width: 750px;
-      word-break: break-all;
+      word-break: normal;
     }
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0