From 9a5a807c84fe0f9672ce01601fe9869c4954011b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 三月 2022 20:10:45 +0800
Subject: [PATCH] 2022-03-24
---
src/templates/modalconfig/index.jsx | 2 +-
src/menu/modalconfig/index.jsx | 3 ++-
src/mob/components/tabs/antv-tabs/index.jsx | 1 +
src/templates/zshare/modalform/datatable/index.scss | 5 ++++-
src/mob/modalconfig/index.jsx | 3 ++-
src/templates/zshare/modalform/datatable/index.jsx | 2 +-
src/menu/components/form/tab-form/index.jsx | 3 ++-
src/tabviews/custom/components/tabs/antv-tabs/index.jsx | 16 ++++++++++++----
src/templates/formtabconfig/index.jsx | 2 +-
src/templates/zshare/modalform/modaleditable/index.jsx | 2 +-
src/menu/components/form/normal-form/index.jsx | 3 ++-
src/templates/zshare/modalform/modaleditable/index.scss | 9 ++++-----
12 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/form/normal-form/index.jsx b/src/menu/components/form/normal-form/index.jsx
index bb2c0c6..997483f 100644
--- a/src/menu/components/form/normal-form/index.jsx
+++ b/src/menu/components/form/normal-form/index.jsx
@@ -721,7 +721,8 @@
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
- width={850}
+ width={950}
+ maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 1493f64..8cd970e 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -729,7 +729,8 @@
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
- width={850}
+ width={950}
+ maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index 2d63246..a200e5b 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -518,7 +518,8 @@
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
- width={850}
+ width={950}
+ maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
diff --git a/src/mob/components/tabs/antv-tabs/index.jsx b/src/mob/components/tabs/antv-tabs/index.jsx
index be8f331..108b32a 100644
--- a/src/mob/components/tabs/antv-tabs/index.jsx
+++ b/src/mob/components/tabs/antv-tabs/index.jsx
@@ -340,6 +340,7 @@
// editab.hasSearch = res.hasSearch || ''
editab.hide = res.hide || 'false'
editab.backgroundColor = res.backgroundColor
+ editab.controlVal = res.controlVal || ''
editab.blacklist = res.blacklist
if (editab.uuid) {
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 1dc5a07..5c4aceb 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -465,7 +465,8 @@
<Modal
title={this.state.dict['model.edit']}
visible={this.state.visible}
- width={850}
+ width={950}
+ maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
diff --git a/src/tabviews/custom/components/tabs/antv-tabs/index.jsx b/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
index 6e685ca..e098179 100644
--- a/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
+++ b/src/tabviews/custom/components/tabs/antv-tabs/index.jsx
@@ -30,8 +30,14 @@
UNSAFE_componentWillMount () {
const { config, bids } = this.props
+ let _tabs = fromJS(config).toJS()
+
+ if (_tabs.setting.supModule) {
+ _tabs.subtabs = []
+ }
+
this.setState({
- tabs: fromJS(config).toJS(),
+ tabs: _tabs,
parentIds: config.parentIds || [],
bids: bids ? bids : {}
})
@@ -71,12 +77,12 @@
}
if (tabs.setting.supModule === MenuID) {
- if (!data || data[tabs.setting.controlField] === undefined) {
+ if (!data) {
this.setState({
- tabs: {...tabs, subtabs: this.props.config.subtabs}
+ tabs: {...tabs, subtabs: []}
})
} else {
- let val = data[tabs.setting.controlField] + ''
+ let val = data[tabs.setting.controlField] === undefined ? '' : data[tabs.setting.controlField] + ''
this.setState({
tabs: {...tabs, subtabs: this.props.config.subtabs.filter(tab => {
if (tab.controlVal === val) {
@@ -119,6 +125,8 @@
const { mainSearch, BID } = this.props
const { tabs, bids } = this.state
+ if (!tabs.subtabs.length) return null
+
return (
<div className={'menu-antv-tabs-wrap ' + tabs.setting.tabLabel} style={tabs.style}>
<Tabs defaultActiveKey="1" tabBarStyle={{background: tabs.setting.backgroundColor || 'transparent'}} tabPosition={tabs.setting.position} type={tabs.setting.tabStyle}>
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 4752fbd..317f850 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -1942,7 +1942,7 @@
<Modal
title={this.state.card && this.state.card.iscopy ? '琛ㄥ崟-澶嶅埗' : '琛ㄥ崟-缂栬緫'}
visible={modaltype === 'search'}
- width={700}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
confirmLoading={this.state.sqlVerifing}
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 6b01727..13a2d12 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -805,7 +805,7 @@
<Modal
title={dict['model.edit']}
visible={this.state.visible}
- width={850}
+ width={950}
maskClosable={false}
onCancel={this.editModalCancel}
onOk={this.handleSubmit}
diff --git a/src/templates/zshare/modalform/datatable/index.jsx b/src/templates/zshare/modalform/datatable/index.jsx
index c6c3887..99e2320 100644
--- a/src/templates/zshare/modalform/datatable/index.jsx
+++ b/src/templates/zshare/modalform/datatable/index.jsx
@@ -118,7 +118,7 @@
return (
<td {...restProps}>
{editing ? (
- <Form.Item style={{ margin: 0 }}>
+ <Form.Item style={{ margin: '0 -5px 0 -5px' }}>
{getFieldDecorator(dataIndex, {
rules: [
{
diff --git a/src/templates/zshare/modalform/datatable/index.scss b/src/templates/zshare/modalform/datatable/index.scss
index 12f24f4..fbd1e54 100644
--- a/src/templates/zshare/modalform/datatable/index.scss
+++ b/src/templates/zshare/modalform/datatable/index.scss
@@ -18,7 +18,7 @@
line-height: 1;
}
> td {
- padding: 16px 10px;
+ padding: 13px 10px;
}
.fileupload-form-container .ant-upload-list-picture-card .ant-upload-list-item {
margin: 0;
@@ -27,6 +27,9 @@
height: 100%;
}
}
+ .ant-input {
+ padding: 0 5px;
+ }
}
.editable-row.hide {
td:not(:last-child) {
diff --git a/src/templates/zshare/modalform/modaleditable/index.jsx b/src/templates/zshare/modalform/modaleditable/index.jsx
index 0967940..3e076af 100644
--- a/src/templates/zshare/modalform/modaleditable/index.jsx
+++ b/src/templates/zshare/modalform/modaleditable/index.jsx
@@ -67,7 +67,7 @@
}
return editing ? (
- <Form.Item style={{ margin: 0 }}>
+ <Form.Item style={{ margin: '0 -5px 0 -5px' }}>
{form.getFieldDecorator(dataIndex, {
rules: [
{
diff --git a/src/templates/zshare/modalform/modaleditable/index.scss b/src/templates/zshare/modalform/modaleditable/index.scss
index 2597391..ab53b8e 100644
--- a/src/templates/zshare/modalform/modaleditable/index.scss
+++ b/src/templates/zshare/modalform/modaleditable/index.scss
@@ -19,7 +19,7 @@
padding: 10px 16px;
}
.ant-table-tbody > tr > td {
- padding: 5px 16px;
+ padding: 5px 10px;
}
.editable-cell-value-wrap {
cursor: pointer;
@@ -29,10 +29,9 @@
vertical-align: middle;
word-wrap: break-word;
word-break: break-word;
- .ant-input {
- height: 30px;
- padding: 0 11px;
- }
+ }
+ .ant-input {
+ padding: 0 5px;
}
.ant-form-item-control-wrapper {
width: 100%;
--
Gitblit v1.8.0