From ea06034e06a30d3e97838c7885ae7694273a8ca1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 十二月 2024 20:03:51 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/share/actioncomponent/formconfig.jsx |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index c9f2c24..3b1815b 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -842,6 +842,10 @@
         value: 'never',
         text: '涓嶅埛鏂�'
       }, {
+        value: 'line',
+        text: '鍒锋柊琛�',
+        $disabled: !['table_normaltable', 'table_editable', 'table_basetable', 'card_datacard', 'card_dualdatacard'].includes(alltype)
+      }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
       }, {
@@ -2315,6 +2319,9 @@
         value: 'never',
         text: '涓嶅埛鏂�'
       }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
+      }, {
         value: 'grid',
         text: '鍒锋柊褰撳墠缁勪欢'
       }, {

--
Gitblit v1.8.0