From fe4dda47cf7404c5e19b0196745f4b2578f3d992 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 11 七月 2022 14:41:56 +0800
Subject: [PATCH] 2022-07-11
---
src/tabviews/zshare/mutilform/index.jsx | 6 ++
src/templates/modalconfig/index.scss | 2
src/menu/modalconfig/index.scss | 3 -
src/templates/modalconfig/dragelement/index.jsx | 2
src/tabviews/zshare/mutilform/index.scss | 12 +++++
src/templates/modalconfig/settingform/index.jsx | 18 +++++++++
src/menu/components/form/dragtitle/options.jsx | 14 +++++++
src/menu/components/form/tab-form/index.scss | 1
src/menu/components/form/normal-form/index.scss | 1
src/templates/modalconfig/dragelement/index.scss | 17 ++++++++
10 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/form/dragtitle/options.jsx b/src/menu/components/form/dragtitle/options.jsx
index 39849e5..55cd85d 100644
--- a/src/menu/components/form/dragtitle/options.jsx
+++ b/src/menu/components/form/dragtitle/options.jsx
@@ -58,6 +58,20 @@
},
{
type: 'radio',
+ field: 'verticalSpace',
+ label: '绔栧悜闂撮殭',
+ initval: group.setting.verticalSpace || 'normal',
+ tooltip: '姝ｅ父闂撮殭浼氶鐣欏嚭鎶ラ敊淇℃伅鐨勪綅缃紝闃叉琛ㄥ崟浣嶇疆鍙戠敓鍙樺寲銆�',
+ required: false,
+ options: [
+ {value: 'normal', label: '姝ｅ父'},
+ {value: 'middle', label: '涓�'},
+ {value: 'small', label: '灏�'},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'radio',
field: 'prevEnable',
label: '涓婁竴姝�',
initval: group.prevButton ? group.prevButton.enable || 'false' : 'false',
diff --git a/src/menu/components/form/normal-form/index.scss b/src/menu/components/form/normal-form/index.scss
index ff50139..60df5e6 100644
--- a/src/menu/components/form/normal-form/index.scss
+++ b/src/menu/components/form/normal-form/index.scss
@@ -32,7 +32,6 @@
position: relative;
background: #ffffff;
border-radius: 2px;
- margin-bottom: 15px;
}
.form-area {
position: relative;
diff --git a/src/menu/components/form/tab-form/index.scss b/src/menu/components/form/tab-form/index.scss
index ff50139..60df5e6 100644
--- a/src/menu/components/form/tab-form/index.scss
+++ b/src/menu/components/form/tab-form/index.scss
@@ -32,7 +32,6 @@
position: relative;
background: #ffffff;
border-radius: 2px;
- margin-bottom: 15px;
}
.form-area {
position: relative;
diff --git a/src/menu/modalconfig/index.scss b/src/menu/modalconfig/index.scss
index c810ac4..814f0fc 100644
--- a/src/menu/modalconfig/index.scss
+++ b/src/menu/modalconfig/index.scss
@@ -135,7 +135,7 @@
width: 100%!important;
text-align: left;
height: 24px;
- line-height: 24px;
+ line-height: 28px;
}
.ant-form-item-control-wrapper {
width: 100%!important;
@@ -214,7 +214,6 @@
position: relative;
background: #ffffff;
border-radius: 2px;
- margin-bottom: 15px;
.ant-form-item {
cursor: move;
display: flex;
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 4dc2b82..e828865 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -960,9 +960,13 @@
if (action.setting && action.setting.align) {
_align = action.setting.align
}
+ let space = ' space-normal'
+ if (action.setting && action.setting.verticalSpace) {
+ space = ' space-' + action.setting.verticalSpace
+ }
return (
- <Form className={'main-form-field ' + _align}>
+ <Form className={'main-form-field ' + _align + space}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/tabviews/zshare/mutilform/index.scss b/src/tabviews/zshare/mutilform/index.scss
index 6c2d766..baebc0a 100644
--- a/src/tabviews/zshare/mutilform/index.scss
+++ b/src/tabviews/zshare/mutilform/index.scss
@@ -138,10 +138,20 @@
width: 100%!important;
text-align: left;
height: 24px;
- line-height: 24px;
+ line-height: 28px;
}
.ant-form-item-control-wrapper {
width: 100%!important;
}
}
+}
+.main-form-field.space-middle {
+ .ant-form-item:not(.ant-form-item-with-help) {
+ margin-bottom: 15px;
+ }
+}
+.main-form-field.space-small {
+ .ant-form-item:not(.ant-form-item-with-help) {
+ margin-bottom: 5px;
+ }
}
\ No newline at end of file
diff --git a/src/templates/modalconfig/dragelement/index.jsx b/src/templates/modalconfig/dragelement/index.jsx
index e0dc731..a0f19a3 100644
--- a/src/templates/modalconfig/dragelement/index.jsx
+++ b/src/templates/modalconfig/dragelement/index.jsx
@@ -116,7 +116,7 @@
})
return (
- <div ref={drop} className={'ant-row modal-fields-row ' + (setting.align || 'left_right')} >
+ <div ref={drop} className={'ant-row modal-fields-row ' + (setting.align || 'left_right') + ' space-' + (setting.verticalSpace || 'normal')} >
{cards.map(card => {
return <Col key={card.uuid} span={card.type === 'split' ? 24 : (card.span || 24)}>
<Card
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index 6c5daf7..a221984 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -132,7 +132,7 @@
width: 100%!important;
text-align: left;
height: 24px;
- line-height: 24px;
+ line-height: 28px;
}
.ant-form-item-control-wrapper {
width: 100%!important;
@@ -143,4 +143,19 @@
display: none;
}
}
+}
+.modal-fields-row.space-normal {
+ .page-card {
+ margin-bottom: 24px;
+ }
+}
+.modal-fields-row.space-middle {
+ .page-card {
+ margin-bottom: 15px;
+ }
+}
+.modal-fields-row.space-small {
+ .page-card {
+ margin-bottom: 5px;
+ }
}
\ No newline at end of file
diff --git a/src/templates/modalconfig/index.scss b/src/templates/modalconfig/index.scss
index 55a0a3d..5186cff 100644
--- a/src/templates/modalconfig/index.scss
+++ b/src/templates/modalconfig/index.scss
@@ -193,7 +193,7 @@
position: relative;
background: #ffffff;
border-radius: 2px;
- margin-bottom: 15px;
+ // margin-bottom: 15px;
}
.ant-calendar-picker {
min-width: 100px!important;
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index b29bbd6..db471a4 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -285,6 +285,24 @@
)}
</Form.Item>
</Col> : null}
+ {appType !== 'mob' && (display === 'drawer' || display === 'modal') ? <Col span={12}>
+ <Form.Item label={
+ <Tooltip placement="topLeft" title="姝ｅ父闂撮殭浼氶鐣欏嚭鎶ラ敊淇℃伅鐨勪綅缃紝闃叉琛ㄥ崟浣嶇疆鍙戠敓鍙樺寲銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 绔栧悜闂撮殭
+ </Tooltip>
+ }>
+ {getFieldDecorator('verticalSpace', {
+ initialValue: config.setting.verticalSpace || 'normal'
+ })(
+ <Radio.Group>
+ <Radio value="normal">姝ｅ父</Radio>
+ <Radio value="middle">涓�</Radio>
+ <Radio value="small">灏�</Radio>
+ </Radio.Group>
+ )}
+ </Form.Item>
+ </Col> : null}
{display === 'drawer' && appType !== 'mob' ? <Col span={12}>
<Form.Item label="琛ㄥ崟绫诲瀷">
{getFieldDecorator('formType', {
--
Gitblit v1.8.0