From a8d8d2fdb83f21e76f90cb13ea91ad6e9bf98a9b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 24 三月 2025 10:53:52 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardsimplecomponent/node-wrap/menus/index.jsx | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardsimplecomponent/node-wrap/menus/index.jsx b/src/menu/components/card/cardsimplecomponent/node-wrap/menus/index.jsx
index 13230b0..72bd04f 100644
--- a/src/menu/components/card/cardsimplecomponent/node-wrap/menus/index.jsx
+++ b/src/menu/components/card/cardsimplecomponent/node-wrap/menus/index.jsx
@@ -27,7 +27,7 @@
editable: true,
unique: true,
required: false,
- width: '35%'
+ width: '20%'
},
{
title: '棰滆壊',
@@ -35,7 +35,8 @@
inputType: 'color',
editable: true,
required: true,
- width: '35%'
+ width: '20%',
+ render: (text, record) => <span style={{display: 'inline-block', width: '40px', height: '25px', background: text}}></span>
},
{
title: '鍥炬爣',
@@ -43,8 +44,26 @@
inputType: 'icon',
editable: true,
required: false,
- width: '35%',
- render: (text, record) => record.icon ? <MkIcon type={record.icon}/> : ''
+ width: '20%',
+ render: (text, record) => record.icon ? <MkIcon style={{fontSize: '24px'}} type={record.icon}/> : ''
+ },
+ {
+ title: '杩炴帴绾�',
+ dataIndex: 'linecolor',
+ inputType: 'color',
+ editable: true,
+ required: false,
+ allowClear: true,
+ width: '20%',
+ render: (text, record) => text ? <span style={{display: 'inline-block', width: '40px', height: '25px', background: text}}></span> : null
+ },
+ {
+ title: '澶囨敞',
+ dataIndex: 'remark',
+ inputType: 'input',
+ editable: true,
+ required: false,
+ width: '20%'
}
]
}
@@ -77,6 +96,7 @@
return (
<div style={{minHeight: '250px'}}>
<ColumnForm menus={menus} columnChange={this.columnChange}/>
+ <p style={{position: 'absolute', fontSize: '12px', transform: 'translate(0px, -20px)'}}>杩炴帴绾垮湪妯悜鏃堕棿杞翠腑鏈夋晥</p>
<EditTable actions={['edit', 'move', 'copy', 'del']} type={'timenodes'} data={menus} columns={columns} onChange={this.changeColumns}/>
</div>
)
--
Gitblit v1.8.0