From e44c622efee02beafab30da2a91561e8892e26ef Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 14 五月 2022 14:11:39 +0800
Subject: [PATCH] 2022-05-14
---
public/options.json | 10 ++--
src/menu/components/chart/antv-bar/chartcompile/index.jsx | 4 +-
src/views/billprint/index.scss | 7 +++
src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx | 29 +++++++-------
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 9 +++-
src/tabviews/custom/components/share/normalTable/index.jsx | 4 +-
src/menu/components/chart/antv-bar/chartcompile/index.scss | 3 +
src/assets/css/main.scss | 4 +-
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 8 ++--
9 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/public/options.json b/public/options.json
index fa76f1c..59b1cc1 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,9 +1,9 @@
{
- "appId": "201912040924165801464FF1788654BC5AC73",
- "appkey": "20191106103859640976D6E924E464D029CF0",
+ "appId": "202109161556242376DEC38C96FFF414E8DEF",
+ "appkey": "20210916155606327FB54C811DE824AFEB22C",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
- "externalDatabase": "false",
+ "externalDatabase": "",
"lineColor": "",
"filter": "false",
"defaultApp": "mk",
@@ -13,6 +13,6 @@
"licenseKey": "",
"probation": "",
"keepPassword": "true",
- "host": "http://qingqiumarket.cn",
- "service": "MKWMS/"
+ "host": "http://demo.mk9h.cn",
+ "service": "kalai_mes/"
}
\ No newline at end of file
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index cdc3720..f7c2e2b 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -442,10 +442,10 @@
}
}
.ant-table.ant-table-mini .ant-table-thead > tr > th {
- padding: 8px 8px;
+ padding: 8px 8px!important;
}
.ant-table.ant-table-mini .ant-table-tbody > tr > td {
- padding: 2px 8px;
+ padding: 2px 8px!important;
line-height: 1.5;
}
.mk-date-picker.minute {
diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index e88e500..18a7d8c 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -125,23 +125,23 @@
if (card.chartType === 'line') {
shapes = [
- { field: 'smooth', label: 'smooth' },
- { field: 'line', label: 'line' },
- { field: 'dot', label: 'dot' },
- { field: 'dash', label: 'dash' },
- { field: 'hv', label: 'hv' },
- { field: 'vh', label: 'vh' },
- { field: 'hvh', label: 'hvh' },
- { field: 'vhv', label: 'vhv' }
+ { field: 'smooth', label: 'smooth锛堝钩婊戠嚎锛�' },
+ { field: 'line', label: 'line锛堢洿绾匡級' },
+ { field: 'dot', label: 'dot锛堢偣鐘剁嚎锛�' },
+ { field: 'dash', label: 'dash锛堣櫄绾匡級' },
+ { field: 'hv', label: 'hv锛堟按骞�-鍨傜洿绾匡級' },
+ { field: 'vh', label: 'vh锛堝瀭鐩�-姘村钩绾匡級' },
+ { field: 'hvh', label: 'hvh锛堟按骞�-鍨傜洿-姘村钩绾匡級' },
+ { field: 'vhv', label: 'vhv锛堝瀭鐩�-姘村钩-鍨傜洿绾匡級' }
]
} else if (card.chartType === 'bar') {
shapes = [
- { field: 'rect', label: 'rect' },
- { field: 'hollow-rect', label: 'hollow-rect' },
- { field: 'line', label: 'line' },
- { field: 'tick', label: 'tick' },
- { field: 'funnel', label: 'funnel' },
- { field: 'pyramid', label: 'pyramid' }
+ { field: 'rect', label: 'rect锛堢煩褰級' },
+ { field: 'hollow-rect', label: 'hollow-rect锛堢┖蹇冪煩褰級' },
+ { field: 'line', label: 'line锛堢嚎鏉★級' },
+ { field: 'tick', label: 'tick锛堟尝鍔級' },
+ // { field: 'funnel', label: 'funnel' },
+ { field: 'pyramid', label: 'pyramid锛堣閿ワ級' }
]
}
@@ -288,6 +288,7 @@
key: 'show',
label: '鏄剧ず',
initVal: card.show || 'value',
+ tooltip: '褰撲娇鐢ㄨ嚜瀹氫箟璁剧疆鏃讹紝鍙湪鏄剧ず锛堝��/%锛夊鍗曠嫭璁剧疆鏄剧ず绫诲瀷銆傛敞锛氳嚜瀹氫箟涓虹┖鏃朵娇鐢ㄦ澶勮缃��',
required: false,
options: [{
value: 'value',
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.jsx b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
index 942c0cf..6cccecd 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.jsx
@@ -218,7 +218,7 @@
}
},
{
- title: '鏄剧ず',
+ title: '鏄剧ず锛堝��/%锛�',
dataIndex: 'show',
inputType: 'select',
editable: true,
@@ -638,7 +638,7 @@
wrapClassName="popview-modal menu-chart-edit-modal"
title={config.type === 'bar' ? '鏌辩姸鍥剧紪杈�' : '鎶樼嚎鍥剧紪杈�'}
visible={visible}
- width={950}
+ width={1000}
maskClosable={false}
onOk={this.onSubmit}
onCancel={() => { this.setState({ visible: false }) }}
diff --git a/src/menu/components/chart/antv-bar/chartcompile/index.scss b/src/menu/components/chart/antv-bar/chartcompile/index.scss
index 2c9ad88..6334288 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/index.scss
+++ b/src/menu/components/chart/antv-bar/chartcompile/index.scss
@@ -29,6 +29,9 @@
position: relative;
z-index: 1;
}
+ .ant-table-column-title {
+ white-space: nowrap;
+ }
}
}
}
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 5da0967..e2e00e8 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -296,8 +296,12 @@
marker: { symbol: item.chartType === 'bar' ? 'square' : 'hyphen', style: { stroke: item.color,fill: item.color, r: 5, lineWidth: 2 } }
})
- if ((!_config.plot.Bar_axis || item.chartType !== 'bar') && item.show) { // 鎶樼嚎鍥炬垨閲嶅彔涓嬬殑鏌辩姸鍥惧彲鍗曠嫭璁剧疆鏄剧ず绫诲瀷
- vFieldsShow[item.type] = item.show
+ if (!_config.plot.Bar_axis || item.chartType !== 'bar') { // 鎶樼嚎鍥炬垨閲嶅彔涓嬬殑鏌辩姸鍥惧彲鍗曠嫭璁剧疆鏄剧ず绫诲瀷
+ if (item.show) {
+ vFieldsShow[item.type] = item.show
+ } else {
+ item.show = _config.plot.show
+ }
}
})
_config.plot.customs = fields
@@ -309,6 +313,7 @@
}
})
}
+ console.log(vFields)
this.setState({
config: _config,
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 4d753fc..c058330 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -185,7 +185,7 @@
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -259,7 +259,7 @@
}
if (content) {
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.blur) {
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 f2a2cec..a628ea3 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -395,7 +395,7 @@
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -435,7 +435,7 @@
}
if (content) {
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
children = (
@@ -769,7 +769,7 @@
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -794,7 +794,7 @@
}
if (content) {
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
children = (
diff --git a/src/views/billprint/index.scss b/src/views/billprint/index.scss
index 29dd0ba..9c88608 100644
--- a/src/views/billprint/index.scss
+++ b/src/views/billprint/index.scss
@@ -51,6 +51,13 @@
background: transparent!important;
border-radius: 0!important;
}
+ .ant-table.ant-table-mini .ant-table-thead > tr > th {
+ padding: 8px 8px!important;
+ }
+ .ant-table.ant-table-mini .ant-table-tbody > tr > td {
+ padding: 2px 8px!important;
+ line-height: 1.5;
+ }
}
.print-page.auto:last-child {
height: auto!important;
--
Gitblit v1.8.0