From d43108eb04e7ad80cb10d5d8b58af611379fd00f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 04 四月 2022 21:24:54 +0800
Subject: [PATCH] 2022-04-04
---
public/options.json | 15 +++++++--------
src/menu/components/card/balcony/index.scss | 7 +++++++
src/tabviews/custom/components/card/cardcellList/index.jsx | 6 +++---
src/templates/modalconfig/settingform/index.jsx | 4 ++--
src/templates/modalconfig/checkCard/index.scss | 3 +++
5 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/public/options.json b/public/options.json
index fa76f1c..792a858 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,18 +1,17 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202108312122504607B107A83F55B40C98CCF",
+ "appkey": "20210831212235413F287EC3BF489424496C8",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mk",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "keepPassword": "true",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKLILIJB64C12",
+ "probation": "2021-12-31",
+ "host": "http://demo.mk9h.cn",
+ "service": "erp_new/"
}
\ No newline at end of file
diff --git a/src/menu/components/card/balcony/index.scss b/src/menu/components/card/balcony/index.scss
index 8359299..97c2b34 100644
--- a/src/menu/components/card/balcony/index.scss
+++ b/src/menu/components/card/balcony/index.scss
@@ -85,3 +85,10 @@
z-index: 1;
box-shadow: 0px 0px 4px #1890ff;
}
+.mk-mob-view {
+ .check-all {
+ .ant-checkbox-inner {
+ border-radius: 10px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ee7e234..8dde166 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -601,7 +601,7 @@
}
}
- if (!val) return
+ // if (!val) return
val += _val
})
@@ -671,10 +671,10 @@
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
- } else if (data.$$empty) {
- _data = []
} else if (card.$sync) {
_data = this.props.syncData
+ } else if (data.$$empty) {
+ _data = []
}
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
diff --git a/src/templates/modalconfig/checkCard/index.scss b/src/templates/modalconfig/checkCard/index.scss
index 8a6d3aa..230aa8d 100644
--- a/src/templates/modalconfig/checkCard/index.scss
+++ b/src/templates/modalconfig/checkCard/index.scss
@@ -1,5 +1,8 @@
.check-card-edit-box {
line-height: 1.5;
+ .ant-col {
+ float: left;
+ }
.card-cell {
position: relative;
border: 1px solid #bcbcbc;
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 3b1efa7..f9abc14 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -182,7 +182,7 @@
)}
</Form.Item>
</Col>
- {appType !== 'mob' ? <Col span={12}>
+ <Col span={12}>
<Form.Item label="鐐瑰嚮钂欏眰">
{getFieldDecorator('clickouter', {
initialValue: config.setting.clickouter || 'unclose'
@@ -193,7 +193,7 @@
</Radio.Group>
)}
</Form.Item>
- </Col> : null}
+ </Col>
<Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="闇�瑕侀�氳繃鏁版嵁婧愭煡璇㈢殑閫夐」锛屾槸鍚︿娇鐢ㄧ紦瀛樸��">
--
Gitblit v1.8.0