From bc00d800cf4178e0c20e956b50944d177c6d50a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 一月 2023 14:58:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/editcomponent/index.jsx | 3 +++
src/templates/modalconfig/index.jsx | 2 +-
src/menu/modalconfig/index.jsx | 2 +-
src/tabviews/custom/components/table/normal-table/index.scss | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 8f2e1b0..e205f50 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -499,7 +499,7 @@
<Card title="琛ㄥ崟閰嶇疆" bordered={false} extra={
<div>
<Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
- <EditComponent options={['form']} config={this.state.config} plusFields={this.plusFields}/>
+ <EditComponent options={['form']} type="formboard" config={this.state.config} plusFields={this.plusFields}/>
<Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>杩斿洖</Button>
</div>
diff --git a/src/tabviews/custom/components/table/normal-table/index.scss b/src/tabviews/custom/components/table/normal-table/index.scss
index 22eb16b..84e78f6 100644
--- a/src/tabviews/custom/components/table/normal-table/index.scss
+++ b/src/tabviews/custom/components/table/normal-table/index.scss
@@ -12,6 +12,7 @@
>.button-list.toolbar-button {
min-height: 60px;
padding-right: 60px;
+ line-height: 40px;
button {
margin-right: 0px;
margin-bottom: 0px;
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 3adf6d8..7ec9759 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -783,7 +783,7 @@
<Button type="danger" onClick={this.clearConfig}>娓呯┖</Button>
<Versions MenuId={editAction.uuid} open_edition={openEdition} updateConfig={this.refreshConfig}/>
<ReplaceField type="form" config={config} updateConfig={this.updateconfig}/>
- <EditComponent options={['form']} config={this.state.config} plusFields={this.plusFields}/>
+ <EditComponent options={['form']} type="formboard" config={this.state.config} plusFields={this.plusFields}/>
<Button type="primary" id="save-config" onClick={this.submitConfig} loading={this.state.menuloading}>淇濆瓨</Button>
<Button onClick={this.cancelConfig}>杩斿洖</Button>
</div>
diff --git a/src/templates/zshare/editcomponent/index.jsx b/src/templates/zshare/editcomponent/index.jsx
index 59ef92f..b5672d0 100644
--- a/src/templates/zshare/editcomponent/index.jsx
+++ b/src/templates/zshare/editcomponent/index.jsx
@@ -119,6 +119,9 @@
let _config = fromJS(this.props.config).toJS()
this.pasteFormRef.handleConfirm().then(res => {
+ if (type === 'formboard' && res.copyType === 'search' && ['text', 'select', 'multiselect', 'link', 'checkcard', 'date', 'datemonth'].includes(res.type)) {
+ res.copyType = 'form'
+ }
if (!options.includes(res.copyType)) {
notification.warning({
top: 92,
--
Gitblit v1.8.0