Commit 54d149d3 authored by 涂伟's avatar 涂伟

fix: '1.表单设计按钮样式优化2.表字段设置按钮操作逻辑优化'

parent 188ff0f1
Pipeline #68642 passed with stages
......@@ -500,6 +500,7 @@ const AddModal = props => {
type="primary"
// icon={<PlusSquareOutlined />}
onClick={() => formRef.current.preview()}
style={{ marginLeft: '30px' }}
>
预览
</Button>
......
......@@ -367,6 +367,25 @@ const TableManager = props => {
return <div dangerouslySetInnerHTML={{ __html: n }} />;
};
const pushFieldConfig = record => {
history.push({
pathname: `/biz/account/fieldConfig`,
state: {
id: record.tableName,
template: record,
tableScroll: document.querySelector('.ant-table-body').scrollTop,
groupArr: groupArr,
pickIndex: pickIndex,
searchValue: searchValue,
select: select,
keepValue: keepValue,
keepTreeSelect: keepTreeSelect,
keepTreeFirst: keepTreeFirst,
keepData: keepData,
},
});
};
const columns = [
{
title: '名称',
......@@ -485,14 +504,18 @@ const TableManager = props => {
onClick={() => changeDesc(record)}
style={{ fontSize: '20px', color: '#1890FF' }}
/> */}
<a href="#">
<img
src={formDesign}
alt=""
onClick={() => changeDesc(record)}
style={{ width: '20px', color: '#1890FF' }}
/>
</a>
<img
className={styles.btnImg}
src={formDesign}
alt=""
// onClick={() => changeDesc(record)}
onClick={() => {
setType('tableEdit');
setVisible(true);
setFormObj(record);
}}
style={{ width: '20px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="表单设计">
{/* <MenuOutlined
......@@ -503,18 +526,21 @@ const TableManager = props => {
}}
style={{ fontSize: '20px', color: '#1890FF' }}
/> */}
<a href="#">
<img
src={tableDesign}
alt=""
onClick={() => {
setType('tableEdit');
setVisible(true);
setFormObj(record);
}}
style={{ width: '20px', color: '#1890FF' }}
/>
</a>
<img
className={styles.btnImg}
src={tableDesign}
alt=""
// onClick={() => {
// setType('tableEdit');
// setVisible(true);
// setFormObj(record);
// }}
onClick={e => {
e.stopPropagation();
pushFieldConfig(record);
}}
style={{ width: '20px', color: '#1890FF' }}
/>
</Tooltip>
{/* <Tooltip title="字段配置">
<FontColorsOutlined
......@@ -723,22 +749,23 @@ const TableManager = props => {
onRow={record => ({
onDoubleClick: event => {
event.stopPropagation();
history.push({
pathname: `/biz/account/fieldConfig`,
state: {
id: record.tableName,
template: record,
tableScroll: document.querySelector('.ant-table-body').scrollTop,
groupArr: groupArr,
pickIndex: pickIndex,
searchValue: searchValue,
select: select,
keepValue: keepValue,
keepTreeSelect: keepTreeSelect,
keepTreeFirst: keepTreeFirst,
keepData: keepData,
},
});
// history.push({
// pathname: `/biz/account/fieldConfig`,
// state: {
// id: record.tableName,
// template: record,
// tableScroll: document.querySelector('.ant-table-body').scrollTop,
// groupArr: groupArr,
// pickIndex: pickIndex,
// searchValue: searchValue,
// select: select,
// keepValue: keepValue,
// keepTreeSelect: keepTreeSelect,
// keepTreeFirst: keepTreeFirst,
// keepData: keepData,
// },
// });
pushFieldConfig(record);
},
onClick: event => {
event.stopPropagation();
......
......@@ -143,4 +143,8 @@
.orgContainerHide {
width: 26px;
}
.btnImg:hover {
cursor: pointer;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment