From a7666ec39e65e56759a9b12ed7748fd349e6828f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 一月 2022 23:47:23 +0800
Subject: [PATCH] 2022-01-02
---
src/templates/modalconfig/index.jsx | 2 +-
src/templates/modalconfig/index.scss | 2 +-
src/templates/zshare/editTable/index.jsx | 2 +-
src/menu/modalconfig/index.jsx | 2 +-
src/templates/modalconfig/settingform/index.jsx | 10 +++++-----
src/templates/zshare/formconfig.jsx | 2 ++
src/tabviews/zshare/actionList/normalbutton/index.jsx | 6 +++---
src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx | 2 +-
src/tabviews/zshare/actionList/printbutton/index.jsx | 4 ++--
9 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index ad2443b..942deba 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -478,7 +478,7 @@
</div>
} style={{ width: '100%' }}>
<SettingOutlined onClick={this.changeSetting} />
- <div className="ant-modal-content" style={{width: config.setting.width + '%'}}>
+ <div className="ant-modal-content" style={{width: config.setting.width > 100 ? config.setting.width : config.setting.width + '%'}}>
<div className="ant-modal-header">
<div className="ant-modal-title">{config.setting.title}</div>
<Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button>
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index c28aaa3..af768ee 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1908,14 +1908,14 @@
if (!btnconfig || !btnconfig.setting) return null
let title = btnconfig.setting.title
- let width = btnconfig.setting.width + 'vw'
+ let width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + 'vw'
let clickouter = btnconfig.setting.clickouter === 'close'
if (btnconfig.setting.display === 'drawer') {
let height = '100vh'
if (btnconfig.setting.placement === 'top' || btnconfig.setting.placement === 'bottom') {
width = '100vw'
- height = btnconfig.setting.width + 'vh'
+ height = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + 'vh'
}
return (
<Drawer
@@ -1956,7 +1956,7 @@
(setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
(btnconfig.setting.container === 'tab' && btn.ContainerId)
) {
- width = btnconfig.setting.width + '%'
+ width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + '%'
container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
}
return (
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 0e0ceb7..f48e538 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -1557,7 +1557,7 @@
if (!this.state.visible || !btnconfig || !btnconfig.setting) return null
let title = btnconfig.setting.title
- let width = btnconfig.setting.width + 'vw'
+ let width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + 'vw'
let clickouter = false
let container = document.body
@@ -1565,7 +1565,7 @@
(setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) ||
(btnconfig.setting.container === 'tab' && btn.ContainerId)
) {
- width = btnconfig.setting.width + '%'
+ width = btnconfig.setting.width > 100 ? btnconfig.setting.width : btnconfig.setting.width + '%'
container = () => document.getElementById(this.props.ContainerId || btn.ContainerId)
}
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index 58bbf79..e0f7258 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -735,7 +735,7 @@
</div>
} style={{ width: '100%' }}>
<SettingOutlined onClick={this.changeSetting} />
- <div className="ant-modal-content" style={{width: config.setting.width + '%'}}>
+ <div className="ant-modal-content" style={{width: config.setting.width > 100 ? config.setting.width : config.setting.width + '%'}}>
<div className="ant-modal-header">
<div className="ant-modal-title">{config.setting.title}</div>
<Button className="mk-cols-change" onClick={() => this.changecols(1)}>1鍒�</Button>
diff --git a/src/templates/modalconfig/index.scss b/src/templates/modalconfig/index.scss
index 24849c9..55a0a3d 100644
--- a/src/templates/modalconfig/index.scss
+++ b/src/templates/modalconfig/index.scss
@@ -135,7 +135,7 @@
position: relative;
z-index: 10;
background: transparent;
- min-height: 50px;
+ height: 55px;
padding-right: 75px;
.ant-modal-title {
display: inline-block;
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index b908017..3b1efa7 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -96,14 +96,14 @@
})(<Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />)}
</Form.Item>
</Col>
- {appType !== 'mob' ? <Col span={12}>
+ {/* {appType !== 'mob' ? <Col span={12}>
<Form.Item label="瀹藉害锛�%锛�">
{getFieldDecorator('width', {
initialValue: config.setting.width
- })(<InputNumber min={10} max={90} precision={0} onPressEnter={this.handleSubmit}/>)}
+ })(<InputNumber min={10} max={2000} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
- </Col> : null}
- {appType === 'mob' ? <Col span={12}>
+ </Col> : null} */}
+ <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="瀹藉害灏忎簬100鏃朵负鐧惧垎鐜囷紝澶т簬100鏃朵负缁濆鍊笺��">
<QuestionCircleOutlined className="mk-form-tip" />
@@ -114,7 +114,7 @@
initialValue: config.setting.width
})(<InputNumber min={10} max={2000} precision={0} onPressEnter={this.handleSubmit}/>)}
</Form.Item>
- </Col> : null}
+ </Col>
<Col span={12}>
<Form.Item label="鍒濆鐒︾偣">
{getFieldDecorator('focus', {
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
index d050d57..bb1de82 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelout/columnform/index.jsx
@@ -84,7 +84,7 @@
{getFieldDecorator('type', {
initialValue: 'text'
})(
- <Radio.Group>
+ <Radio.Group style={{whiteSpace: 'nowrap'}}>
<Radio value="text">鏂囨湰</Radio>
<Radio value="image">鍥剧墖</Radio>
</Radio.Group>
diff --git a/src/templates/zshare/editTable/index.jsx b/src/templates/zshare/editTable/index.jsx
index 94ae9d1..347b021 100644
--- a/src/templates/zshare/editTable/index.jsx
+++ b/src/templates/zshare/editTable/index.jsx
@@ -214,7 +214,7 @@
<span style={{ color: '#1890ff', cursor: 'pointer'}} onClick={() => this.cancel(record.uuid)}>{eTDict['model.cancel']}</span>
</div>
) : (
- <div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px'}}>
+ <div className={'edit-operation-btn' + (editingKey !== '' ? ' disabled' : '')} style={{minWidth: '110px', whiteSpace: 'nowrap'}}>
{actions.includes('edit') ? <span className="primary" onClick={() => {editingKey === '' && this.edit(record.uuid)}}><EditOutlined /></span> : null}
{actions.includes('copy') ? <span className="copy" onClick={() => {editingKey === '' && this.copy(record)}}><CopyOutlined /></span> : null}
{actions.includes('del') && editingKey === '' ? <Popconfirm
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 522f79e..1d50873 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2365,6 +2365,8 @@
let initval = card.initval || ''
if (card.type === 'switch') {
initval = card.initval === true
+ } else if (card.type === 'number') {
+ initval = card.initval || 0
}
return [
--
Gitblit v1.8.0