From 66bdbc1df92e8ec4a5108a4e0323e25a7b9ff8f8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:37:16 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index ddfa334..0b443d7 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -566,7 +566,8 @@
<Select.Option value="line" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛�</Select.Option>
<Select.Option value="grid">鍒锋柊缁勪欢</Select.Option>
<Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛� / 缁勪欢</Select.Option>
- <Select.Option value="mainline">涓婄骇锛堣锛�</Select.Option>
+ <Select.Option value="mainline">鍒锋柊涓婄骇缁勪欢 - 琛�</Select.Option>
+ <Select.Option value="maingrid">鍒锋柊涓婄骇缁勪欢</Select.Option>
</Select>
</Form.Item>
</Col>
@@ -577,7 +578,8 @@
<Select.Option value="line" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛�</Select.Option>
<Select.Option value="grid">鍒锋柊缁勪欢</Select.Option>
<Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛� / 缁勪欢</Select.Option>
- <Select.Option value="mainline">涓婄骇锛堣锛�</Select.Option>
+ <Select.Option value="mainline">鍒锋柊涓婄骇缁勪欢 - 琛�</Select.Option>
+ <Select.Option value="maingrid">鍒锋柊涓婄骇缁勪欢</Select.Option>
</Select>
</Form.Item>
</Col>
--
Gitblit v1.8.0