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/normal-table/columns/editColumn/index.scss |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.scss b/src/menu/components/table/normal-table/columns/editColumn/index.scss
index e450762..d0a30f3 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.scss
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.scss
@@ -1,15 +1,5 @@
 .commontable-column-form {
   min-height: 190px;
-  .ant-form-item {
-    .ant-input-number {
-      width: 100%;
-    }
-  }
-  .anticon-question-circle {
-    color: #c49f47;
-    position: relative;
-    left: -3px;
-  }
   .ant-cascader-menus {
     padding: 5px 0px;
     .ant-cascader-menu:last-child {
@@ -24,4 +14,27 @@
       width: 88%;
     }
   }
+  .formula-icon {
+    position: absolute;
+    bottom: 5px;
+    right: 15px;
+    cursor: pointer;
+    font-size: 12px;
+    color: #1890ff;
+  }
+  >.ant-row >.ant-col {
+    display: inline-block;
+    vertical-align: top;
+    float: none;
+  }
+}
+.formula-fields {
+  z-index: 1200!important;
+
+  .ant-popover-inner-content {
+    div {
+      max-width: 750px;
+      word-break: normal;
+    }
+  }
 }

--
Gitblit v1.8.0