From b065ac55d9d8680eefbb43be63305364e7b2f6cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 三月 2022 19:25:46 +0800
Subject: [PATCH] 2022-03-21
---
public/options.json | 14 +++++++-------
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 15 +++++++++++++++
src/tabviews/custom/components/table/edit-table/index.jsx | 15 ++++++++++-----
src/tabviews/custom/components/table/edit-table/index.scss | 5 +++--
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 5 ++++-
5 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/public/options.json b/public/options.json
index 792a858..f317ad5 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +1,17 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "7EFE13KIKLILIJB64C12",
- "probation": "2021-12-31",
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "licenseKey": "",
+ "probation": "",
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 81f7a38..2ee936f 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -59,11 +59,16 @@
_config.submit.style = _config.submit.style || {}
_config.submit.wrapStyle = {}
- if (_config.submit.style.marginTop) {
- _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
- }
- if (_config.submit.style.marginBottom) {
- _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ _config.submit.hasAction = _config.action.length > 0
+ if (!_config.submit.hasAction) {
+ if (_config.submit.style.marginTop) {
+ _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
+ }
+ if (_config.submit.style.marginBottom) {
+ _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ }
+ } else {
+ _config.submit.wrapStyle.paddingTop = '15px'
}
if (setting.height) {
diff --git a/src/tabviews/custom/components/table/edit-table/index.scss b/src/tabviews/custom/components/table/edit-table/index.scss
index 5031dac..686b44b 100644
--- a/src/tabviews/custom/components/table/edit-table/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/index.scss
@@ -11,8 +11,9 @@
>.button-list.toolbar-button {
padding: 0;
line-height: 45px;
- display: inline-block;
- width: 80%;
+ float: left;
+ position: relative;
+ z-index: 2;
button {
margin-right: 0px;
margin-bottom: 0px;
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 4daf315..ec4d578 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1944,8 +1944,11 @@
return (
<>
+ {submit.hasAction && pickup ? <div className="edit-custom-table-leftbtn-wrap">
+ <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button>
+ </div> : null}
<div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
- {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
+ {!submit.hasAction && pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
<Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
</div>
<div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index f9fc71d..dcfc772 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -415,4 +415,19 @@
margin-top: 0px!important;
margin-bottom: 0px!important;
}
+}
+.edit-custom-table-leftbtn-wrap {
+ float: left;
+ line-height: 45px;
+ .submit-table {
+ position: relative;
+ z-index: 2;
+ min-height: 28px;
+ height: auto;
+ color: #ffffff;
+ background-color: #1890ff;
+ border-width: 0;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0