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 |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 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 e9dd7c5..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,16 +6,31 @@
       padding-right: 3px;
     }
   }
-  .ant-form-item.text-area {
-    >.ant-form-item-control-wrapper {
-      width: 88%;
+  >.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;
+      }
     }
-    >.ant-form-item-label {
-      width: 12%;
-    }
-    .CodeMirror {
-      height: 150px;
-    }
+  }
+  .formula-icon {
+    position: absolute;
+    bottom: 5px;
+    right: 15px;
+    cursor: pointer;
+    font-size: 12px;
+    color: #1890ff;
   }
   .ant-form-extra {
     padding-top: 0px;
@@ -29,4 +44,25 @@
     cursor: pointer;
     font-size: 14px;
   }
+  .show-public-var {
+    margin-top: 20px;
+  }
+  .resource-public-var {
+    position: absolute;
+    left: 0px;
+    top: -45px;
+    right: 40px;
+    font-size: 13px;
+    color: rgba(0, 0, 0, 0.65);
+  }
 }
+.formula-fields {
+  z-index: 1200!important;
+
+  .ant-popover-inner-content {
+    div {
+      max-width: 750px;
+      word-break: normal;
+    }
+  }
+}
\ No newline at end of file

--
Gitblit v1.8.0