From 720c46d6d498dd0d28f5b9f51c9d0421105e9946 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 一月 2021 18:30:35 +0800
Subject: [PATCH] 2021-01-26
---
src/templates/zshare/formconfig.jsx | 2
src/menu/components/share/actioncomponent/formconfig.jsx | 2
src/templates/sharecomponent/actioncomponent/actionform/index.jsx | 16 +++-
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 6 +-
src/templates/zshare/verifycard/callbackcustomscript/index.jsx | 6 +-
src/templates/zshare/verifycard/customscript/index.jsx | 6 +-
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 12 +++
src/tabviews/zshare/actionList/printbutton/index.jsx | 12 +++
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 48 +++++++++++++--
src/views/billprint/index.scss | 3
src/menu/components/share/actioncomponent/actionform/index.jsx | 8 +-
src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx | 6 +-
src/views/menudesign/index.scss | 3
src/tabviews/zshare/actionList/normalbutton/index.jsx | 12 +++
14 files changed, 103 insertions(+), 39 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 29f3493..5da6f2a 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -146,13 +146,13 @@
}
} else if (_opentype === 'excelOut') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
} else if (_opentype === 'excelIn') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
@@ -160,7 +160,7 @@
if (_funcType === 'print') {
_options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
@@ -174,7 +174,7 @@
_options.push('innerFunc')
}
} else if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
} else {
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 3413aee..ce7f6d2 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -201,7 +201,7 @@
{
type: 'textarea',
key: 'interface',
- label: Formdict['header.form.interface'],
+ label: '娴嬭瘯鍦板潃',
initVal: card.sysInterface === 'true' ? (window.GLOB.mainSystemApi || '') : (card.interface || ''),
required: true,
readonly: card.sysInterface === 'true'
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index 0ffe673..549dd47 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -345,13 +345,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
}
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index e99d2dd..f2a67e7 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -193,13 +193,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
}
@@ -231,13 +239,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
@@ -292,13 +308,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
@@ -356,13 +380,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
param.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- param.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ param.rduri = btn.proInterface
+ } else {
+ param.rduri = btn.interface
+ }
}
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 291f92c..8e392e3 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1022,7 +1022,11 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
// 鍑芥暟 s_sDataDictb_TBBack 浜戠楠岃瘉
@@ -1035,7 +1039,11 @@
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 0b21d94..5557e08 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -465,13 +465,21 @@
if (btn.sysInterface === 'true' && options.cloudServiceApi) {
res.rduri = options.cloudServiceApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
} else {
if (btn.sysInterface === 'true' && window.GLOB.mainSystemApi) {
res.rduri = window.GLOB.mainSystemApi
} else if (btn.sysInterface !== 'true') {
- res.rduri = btn.interface
+ if (window.GLOB.systemType === 'production' && btn.proInterface) {
+ res.rduri = btn.proInterface
+ } else {
+ res.rduri = btn.interface
+ }
}
}
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 9f45bd7..6310dc9 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -189,13 +189,13 @@
}
} else if (_opentype === 'excelOut') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
} else if (_opentype === 'excelIn') { // 瀵煎叆瀵煎嚭
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
@@ -203,7 +203,7 @@
if (_funcType === 'print') {
_options.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
}
@@ -217,7 +217,7 @@
_options.push('innerFunc')
}
} else if (_intertype === 'outer') {
- _options.push('innerFunc', 'sysInterface', 'interface', 'outerFunc', 'callbackFunc')
+ _options.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
} else if (_intertype === 'inner') {
_options.push('innerFunc')
} else {
@@ -641,7 +641,13 @@
<Col span={24} key={index}>
<Form.Item label={item.label} className="textarea">
{getFieldDecorator(item.key, {
- initialValue: item.initVal
+ initialValue: item.initVal,
+ rules: [
+ {
+ required: !!item.required,
+ message: this.props.dict['form.required.input'] + item.label + '!'
+ }
+ ]
})(<TextArea rows={2} />)}
</Form.Item>
</Col>
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
index 3a5c827..3268132 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/customscript/index.jsx
@@ -259,9 +259,9 @@
{btn.sheet}
</Form.Item>
</Col> : null}
- <Col span={16}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
- ErrorCode, retmsg
+ <Col span={10}>
+ <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
</Col>
{usefulfields ? <Col span={24} className="sqlfield">
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 0358ff1..e303c63 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -310,19 +310,19 @@
</Form.Item>
</Col> : null}
{interType === 'outer' || interType === 'custom' ? <Col className="data-source" span={24}>
- <Form.Item label="鎺ュ彛鍦板潃">
+ <Form.Item label="娴嬭瘯鍦板潃">
{getFieldDecorator('interface', {
initialValue: setting.interface || '',
rules: [
{
required: true,
- message: dict['form.required.input'] + '鎺ュ彛鍦板潃!'
+ message: dict['form.required.input'] + '娴嬭瘯鍦板潃!'
},
]
})(<TextArea rows={2} />)}
</Form.Item>
</Col> : null}
- {interType === 'custom' ? <Col className="data-source" span={24}>
+ {interType === 'outer' || interType === 'custom' ? <Col className="data-source" span={24}>
<Form.Item label={
<Tooltip placement="topLeft" title="姝ｅ紡绯荤粺鎵�浣跨敤鐨勭殑鎺ュ彛鍦板潃銆�">
<Icon type="question-circle" />
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 681ea4b..60ad33a 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -855,7 +855,7 @@
{
type: 'textarea',
key: 'interface',
- label: Formdict['header.form.interface'],
+ label: '娴嬭瘯鍦板潃',
initVal: card.sysInterface === 'true' ? (window.GLOB.mainSystemApi || '') : (card.interface || ''),
required: true,
readonly: card.sysInterface === 'true'
diff --git a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
index 062947f..c6a5fc2 100644
--- a/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
+++ b/src/templates/zshare/verifycard/callbackcustomscript/index.jsx
@@ -205,9 +205,9 @@
{btn.cbTable}
</Form.Item>
</Col>
- <Col span={16}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
- ErrorCode, retmsg
+ <Col span={10}>
+ <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
</Col>
<Col span={8} style={{whiteSpace: 'nowrap'}}>
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 6a10c5d..7cd554e 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -213,9 +213,9 @@
{btn.sql}
</Form.Item>
</Col> : null}
- <Col span={16}>
- <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0}}>
- ErrorCode, retmsg
+ <Col span={10}>
+ <Form.Item label={'鎶ラ敊瀛楁'} style={{margin: 0, whiteSpace: 'nowrap'}}>
+ ErrorCode锛堝鍔犲悗缂�NT琛ㄧず鏁版嵁涓嶅洖婊氾紝濡侲NT銆丯NT銆丗NT銆丯MNT锛�, retmsg
</Form.Item>
</Col>
{usefulfields ? <Col span={24} className="sqlfield">
diff --git a/src/views/billprint/index.scss b/src/views/billprint/index.scss
index 7ab170f..2c5512e 100644
--- a/src/views/billprint/index.scss
+++ b/src/views/billprint/index.scss
@@ -35,11 +35,12 @@
table {
border-radius: 0!important;
.ant-table-column-sorter {
- display: none;
+ display: none!important;
}
}
.ant-table-thead > tr > th {
background: transparent!important;
+ border-radius: 0!important;
}
}
diff --git a/src/views/menudesign/index.scss b/src/views/menudesign/index.scss
index f677b80..65fadca 100644
--- a/src/views/menudesign/index.scss
+++ b/src/views/menudesign/index.scss
@@ -164,10 +164,11 @@
table {
border-radius: 0!important;
.ant-table-column-sorter {
- display: none;
+ display: none!important;
}
}
.ant-table-thead > tr > th {
background: transparent!important;
+ border-radius: 0!important;
}
}
\ No newline at end of file
--
Gitblit v1.8.0