From 72497a1eab6608ec949b3fa5ecea5f5a8559386d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 一月 2022 22:30:59 +0800
Subject: [PATCH] 2-22-01-12
---
public/options.json | 14 +++++++-------
src/menu/components/card/cardcellcomponent/index.jsx | 2 +-
src/menu/stylecontroller/index.jsx | 11 +++++++++++
src/tabviews/custom/components/card/cardcellList/index.scss | 2 ++
src/menu/components/card/cardcellcomponent/index.scss | 2 ++
5 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/public/options.json b/public/options.json
index 2e37e81..0f5b891 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,17 +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": "",
+ "defaultApp": "mkindustry",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "",
- "probation": "",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "licenseKey": "7EFE13KIKKILIJ7C8CFC",
+ "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/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 0b6e36c..db7b2ed 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -148,7 +148,7 @@
if (element.OpenType === 'form') {
options = ['margin', 'float']
} else {
- options.push('width', 'float')
+ options.push('width', 'minHeight', 'float')
}
if (element.wrapStyle) {
_style.float = element.wrapStyle.textAlign || 'left'
diff --git a/src/menu/components/card/cardcellcomponent/index.scss b/src/menu/components/card/cardcellcomponent/index.scss
index e394fe5..df43e0a 100644
--- a/src/menu/components/card/cardcellcomponent/index.scss
+++ b/src/menu/components/card/cardcellcomponent/index.scss
@@ -14,6 +14,8 @@
min-height: 28px;
text-align: center;
border-width: 0;
+ padding: 0;
+ overflow: hidden;
span {
font-style: inherit;
text-decoration: inherit;
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index 35a78aa..a6143e6 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -795,6 +795,17 @@
</Form.Item>
</Col>
</Panel> : null}
+ {options.includes('minHeight') ? <Panel header="鏈�灏忛珮搴�" key="minHeight">
+ <Col span={24}>
+ <Form.Item
+ colon={false}
+ label={<ColumnHeightOutlined title="鏈�灏忛珮搴�"/>}
+ labelCol={{xs: { span: 24 }, sm: { span: 4 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 20 }} }
+ >
+ <StyleInput defaultValue={card.minHeight || '28px'} options={['px']} onChange={(val) => this.changeNormalStyle(val, 'minHeight')}/>
+ </Form.Item>
+ </Col>
+ </Panel> : null}
</Collapse> : null}
</Form>
<div style={{textAlign: 'right'}}>
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index 5ca1d4a..f48154a 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -64,6 +64,8 @@
max-width: 100%;
height: auto;
min-height: 28px;
+ padding: 0;
+ overflow: hidden;
}
.ant-checkbox-inner, .ant-checkbox-checked::after {
border-radius: 15px;
--
Gitblit v1.8.0