From 4f8ffec8fc4aa9918264a3b3b4952421d896f5eb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 四月 2020 17:48:36 +0800
Subject: [PATCH] 2020-04-17
---
src/templates/zshare/modalform/index.jsx | 6
src/tabviews/formtab/index.jsx | 18
src/tabviews/formtab/actionList/index.jsx | 8
src/tabviews/verupmanage/actionList/index.jsx | 12
src/templates/zshare/verifycard/customscript/index.jsx | 22
src/tabviews/managetable/secretKeyTable/index.jsx | 4
src/locales/en-US/main.js | 1
src/tabviews/subtabtable/index.jsx | 8
src/tabviews/commontable/index.jsx | 18
src/templates/subtableconfig/actionform/index.jsx | 6
src/templates/formtabconfig/settingform/index.jsx | 4
src/tabviews/zshare/excelin/index.jsx | 2
src/templates/zshare/pasteform/index.jsx | 2
src/components/header/editmenu/index.jsx | 18
src/templates/subtableconfig/index.jsx | 72 ++--
src/tabviews/zshare/mutilform/index.jsx | 2
src/templates/zshare/verifycardexcelin/columnform/index.jsx | 10
src/templates/zshare/createinterface/index.jsx | 12
src/tabviews/verupmanage/index.jsx | 4
src/tabviews/zshare/verifycard/tabcard/index.jsx | 6
src/tabviews/managetable/secretKeyTable/actionList/index.jsx | 16
src/templates/zshare/verifycardexcelout/columnform/index.jsx | 11
src/views/printTemplate/index.jsx | 14
src/components/header/index.jsx | 12
src/tabviews/formtab/formgroup/index.jsx | 2
src/templates/zshare/verifycardexcelout/index.jsx | 10
src/components/sidemenu/editsecmenu/index.jsx | 16
src/tabviews/verupmanage/subtabtable/index.jsx | 2
src/tabviews/zshare/topSearch/index.jsx | 2
src/templates/formtabconfig/index.jsx | 58 +-
src/tabviews/zshare/verifycard/tabcard/printtypeform/index.jsx | 4
src/templates/comtableconfig/index.jsx | 80 ++--
src/templates/zshare/verifycardexcelin/index.jsx | 18
src/templates/zshare/verifycard/customform/index.jsx | 8
src/tabviews/zshare/actionList/index.jsx | 6
src/tabviews/datamanage/index.jsx | 6
src/tabviews/subtable/index.jsx | 24
src/tabviews/zshare/verifycard/tabcard/printform/index.jsx | 4
src/templates/subtableconfig/settingform/index.jsx | 4
src/tabviews/zshare/verifycard/tabcard/columnform/index.jsx | 4
src/utils/utils.js | 259 +++++---------
src/templates/zshare/searchform/index.jsx | 4
src/tabviews/zshare/verifycard/tabcard/actionform/index.jsx | 4
src/templates/comtableconfig/actionform/index.jsx | 6
src/templates/zshare/createfunc/index.jsx | 10
src/locales/zh-CN/main.js | 1
src/tabviews/scriptmanage/actionList/index.jsx | 10
src/tabviews/rolemanage/index.jsx | 8
src/templates/zshare/dragelement/index.jsx | 6
src/tabviews/datamanage/search/index.jsx | 3
src/templates/zshare/verifycard/index.jsx | 37 +
src/tabviews/managetable/index.jsx | 10
src/components/sidemenu/editthdmenu/index.jsx | 34
src/templates/formtabconfig/actionform/index.jsx | 4
src/templates/zshare/columnform/index.jsx | 2
src/templates/comtableconfig/settingform/index.jsx | 4
src/templates/zshare/verifycardexcelin/customscript/index.jsx | 20
src/tabviews/zshare/verifycard/index.jsx | 5
src/tabviews/datamanage/action/index.jsx | 22
src/templates/zshare/verifycardprint/index.jsx | 16
src/tabviews/tabform/index.jsx | 2
src/tabviews/tabmanage/index.jsx | 20
src/tabviews/scriptmanage/index.jsx | 2
src/components/sidemenu/index.jsx | 2
src/components/sidemenu/config.js | 4
65 files changed, 495 insertions(+), 536 deletions(-)
diff --git a/src/components/header/editmenu/index.jsx b/src/components/header/editmenu/index.jsx
index e80ad88..23b404a 100644
--- a/src/components/header/editmenu/index.jsx
+++ b/src/components/header/editmenu/index.jsx
@@ -46,7 +46,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -78,7 +78,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -116,7 +116,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -154,7 +154,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -168,7 +168,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.thawmenu.select'],
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -194,7 +194,7 @@
notification.error({
top: 92,
message: msg,
- duration: 15
+ duration: 10
})
} else {
this.setState({
@@ -223,7 +223,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
} else if (type === 'add') {
this.setState({
@@ -256,7 +256,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -285,7 +285,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
diff --git a/src/components/header/index.jsx b/src/components/header/index.jsx
index ed21820..e6147dd 100644
--- a/src/components/header/index.jsx
+++ b/src/components/header/index.jsx
@@ -107,7 +107,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
this.setState({
confirmLoading: false
@@ -200,7 +200,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
@@ -226,7 +226,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
@@ -274,7 +274,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
@@ -451,7 +451,7 @@
notification.error({
top: 92,
message: res.message,
- duration: 15
+ duration: 10
})
}
})
@@ -606,7 +606,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
})
diff --git a/src/components/sidemenu/config.js b/src/components/sidemenu/config.js
index ecf0cab..a50ef0f 100644
--- a/src/components/sidemenu/config.js
+++ b/src/components/sidemenu/config.js
@@ -77,8 +77,8 @@
type: 'ScriptTable',
MenuID: '1587005717541lov40vg61q7l1rbveon',
MenuNo: 's_custom_scriptM',
- MenuName: '鑷畾涔夎剼鏈�',
- text: '鑷畾涔夎剼鏈�'
+ MenuName: '鑷畾涔夊嚱鏁�',
+ text: '鑷畾涔夊嚱鏁�'
}]
}, {
MenuID: 'systemManageViewInterface',
diff --git a/src/components/sidemenu/editsecmenu/index.jsx b/src/components/sidemenu/editsecmenu/index.jsx
index b260152..1a91036 100644
--- a/src/components/sidemenu/editsecmenu/index.jsx
+++ b/src/components/sidemenu/editsecmenu/index.jsx
@@ -51,7 +51,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
} else if (menu.type === 'close') {
confirm({
@@ -71,7 +71,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -182,7 +182,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -214,7 +214,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -259,7 +259,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -292,7 +292,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -314,7 +314,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.thawmenu.select'],
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -340,7 +340,7 @@
notification.error({
top: 92,
message: msg,
- duration: 15
+ duration: 10
})
} else {
this.setState({
diff --git a/src/components/sidemenu/editthdmenu/index.jsx b/src/components/sidemenu/editthdmenu/index.jsx
index 8226e8f..23f44fb 100644
--- a/src/components/sidemenu/editthdmenu/index.jsx
+++ b/src/components/sidemenu/editthdmenu/index.jsx
@@ -95,7 +95,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
} else if (menu.type === 'close') {
confirm({
@@ -115,7 +115,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -136,7 +136,7 @@
notification.warning({
top: 92,
message: '鑿滃崟鍔犺浇涓紝璇风◢鍚庨噸璇曪紒',
- duration: 10
+ duration: 5
})
return
}
@@ -190,7 +190,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.template.empty'],
- duration: 10
+ duration: 5
})
this.setState({
@@ -226,7 +226,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -240,7 +240,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
return
}
@@ -249,7 +249,7 @@
notification.warning({
top: 92,
message: '鑿滃崟鍔犺浇涓紝璇风◢鍚庨噸璇曪紒',
- duration: 10
+ duration: 5
})
return
}
@@ -278,7 +278,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.presave'],
- duration: 10
+ duration: 5
})
return
}
@@ -303,7 +303,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -335,7 +335,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -356,7 +356,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.thawmenu.select'],
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -382,7 +382,7 @@
notification.error({
top: 92,
message: msg,
- duration: 15
+ duration: 10
})
} else {
this.setState({
@@ -431,7 +431,7 @@
notification.warning({
top: 92,
message: '鑿滃崟鍔犺浇涓紝璇风◢鍚庨噸璇曪紒',
- duration: 10
+ duration: 5
})
return
}
@@ -474,7 +474,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -496,7 +496,7 @@
notification.warning({
top: 92,
message: '妯℃澘淇℃伅鑾峰彇澶辫触锛�',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -648,7 +648,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
}
})
@@ -722,7 +722,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
})
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index 6ed5a98..b4c157b 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -167,7 +167,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
diff --git a/src/locales/en-US/main.js b/src/locales/en-US/main.js
index e41f3b6..4bd4ba7 100644
--- a/src/locales/en-US/main.js
+++ b/src/locales/en-US/main.js
@@ -2,6 +2,7 @@
'main.search': 'Search',
'main.reset': 'Reset',
'main.confirm': 'OK',
+ 'main.submit': 'Submit',
'main.return': 'Cancel',
'main.close': '鍏抽棴',
'main.all': 'All',
diff --git a/src/locales/zh-CN/main.js b/src/locales/zh-CN/main.js
index 9b3649d..6ad372b 100644
--- a/src/locales/zh-CN/main.js
+++ b/src/locales/zh-CN/main.js
@@ -2,6 +2,7 @@
'main.search': '鎼滅储',
'main.reset': '閲嶇疆',
'main.confirm': '纭畾',
+ 'main.submit': '鎻愪氦',
'main.return': '杩斿洖',
'main.close': '鍏抽棴',
'main.all': '鍏ㄩ儴',
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index ac411d8..6ead87e 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -321,7 +321,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -464,7 +464,7 @@
notification.warning({
top: 92,
message: item.label + ': ' + this.state.dict['main.datasource.settingerror'],
- duration: 10
+ duration: 5
})
}
})
@@ -499,7 +499,7 @@
notification.warning({
top: 92,
message: res.search.label + ':' + res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -564,7 +564,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
@@ -611,7 +611,7 @@
notification.warning({
top: 92,
message: '鏈缃樉绀哄垪锛�',
- duration: 10
+ duration: 5
})
return null
}
@@ -1079,7 +1079,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
return
}
@@ -1103,7 +1103,7 @@
notification.warning({
top: 92,
message: '缂栬瘧閿欒',
- duration: 10
+ duration: 5
})
return
}
@@ -1129,7 +1129,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
return
}
@@ -1343,7 +1343,7 @@
footer={[
<Button key="revert" type="danger" loading={this.state.revertLoading} onClick={this.settingRevert}>{this.state.dict['main.revert.default']}</Button>,
<Button key="cancel" onClick={() => { this.setState({ settingVisible: false }) }}>{this.state.dict['main.cancel']}</Button>,
- <Button key="confirm" type="primary" loading={this.state.confirmLoading} onClick={this.settingSubmit}>{this.state.dict['main.confirm']}</Button>
+ <Button key="confirm" type="primary" loading={this.state.confirmLoading} onClick={this.settingSubmit}>{this.state.dict['main.submit']}</Button>
]}
destroyOnClose
>
diff --git a/src/tabviews/datamanage/action/index.jsx b/src/tabviews/datamanage/action/index.jsx
index e01c3e6..f276410 100644
--- a/src/tabviews/datamanage/action/index.jsx
+++ b/src/tabviews/datamanage/action/index.jsx
@@ -124,7 +124,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectline'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot === 'requiredSgl' && datalist.length > 1) {
@@ -132,7 +132,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectSingleLine'],
- duration: 10
+ duration: 5
})
return
}
@@ -153,14 +153,14 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.primarykey.required'],
- duration: 10
+ duration: 5
})
return
} else if (ID.length > 1) {
notification.warning({
top: 92,
message: this.props.dict['main.action.primarykey.repetition'],
- duration: 10
+ duration: 5
})
return
}
@@ -169,7 +169,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.primarykey.repetitionbid'],
- duration: 10
+ duration: 5
})
return
}
@@ -190,7 +190,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
iserror = true
}
@@ -217,7 +217,7 @@
notification.error({
top: 92,
message: res.message,
- duration: 15
+ duration: 10
})
}
}
@@ -235,7 +235,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
iserror = true
}
@@ -262,7 +262,7 @@
notification.error({
top: 92,
message: res.message,
- duration: 15
+ duration: 10
})
}
}
@@ -346,7 +346,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.settingerror'],
- duration: 10
+ duration: 5
})
}
}
@@ -430,7 +430,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
})
diff --git a/src/tabviews/datamanage/index.jsx b/src/tabviews/datamanage/index.jsx
index c745ea1..7fe3090 100644
--- a/src/tabviews/datamanage/index.jsx
+++ b/src/tabviews/datamanage/index.jsx
@@ -66,7 +66,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -99,7 +99,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
this.setState({
searchparam: searches,
@@ -236,7 +236,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
this.setState({
confirmloading: false
diff --git a/src/tabviews/datamanage/search/index.jsx b/src/tabviews/datamanage/search/index.jsx
index cc2d8de..65ffeab 100644
--- a/src/tabviews/datamanage/search/index.jsx
+++ b/src/tabviews/datamanage/search/index.jsx
@@ -179,7 +179,8 @@
valid = false
notification.warning({
top: 92,
- message: this.props.dict['form.required.input'] + item.label
+ message: this.props.dict['form.required.input'] + item.label,
+ duration: 5
})
}
})
diff --git a/src/tabviews/formtab/actionList/index.jsx b/src/tabviews/formtab/actionList/index.jsx
index d1c55ad..8f6d8ed 100644
--- a/src/tabviews/formtab/actionList/index.jsx
+++ b/src/tabviews/formtab/actionList/index.jsx
@@ -83,7 +83,7 @@
notification.warning({
top: 92,
message: '浣跨敤鍒涘缓鍑瘉鍑芥暟锛岄渶瑕侀�夋嫨琛岋紒',
- duration: 10
+ duration: 5
})
return
}
@@ -286,14 +286,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.errorTime || 15
+ duration: btn.errorTime || 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.errorTime || 15
+ duration: btn.errorTime || 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
@@ -309,7 +309,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.settingerror'],
- duration: 10
+ duration: 5
})
}
diff --git a/src/tabviews/formtab/formgroup/index.jsx b/src/tabviews/formtab/formgroup/index.jsx
index ffb1df7..5153f62 100644
--- a/src/tabviews/formtab/formgroup/index.jsx
+++ b/src/tabviews/formtab/formgroup/index.jsx
@@ -168,7 +168,7 @@
notification.warning({
top: 92,
message: '鏈煡璇㈠埌琛ㄥ崟銆�' + item.label + '銆嬪叧鑱斿瓧娈碉紒',
- duration: 10
+ duration: 5
})
} else {
item.options = item.oriOptions.filter(option => option.parentId === supItem.initval)
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 09b5271..5c8f0e0 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -143,7 +143,7 @@
notification.warning({
top: 92,
message: '鏈幏鍙栧埌涓昏〃鏁版嵁锛�',
- duration: 10
+ duration: 5
})
}
})
@@ -155,7 +155,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -203,7 +203,7 @@
notification.warning({
top: 92,
message: item.label + ': ' + this.state.dict['main.datasource.settingerror'],
- duration: 10
+ duration: 5
})
}
@@ -246,7 +246,7 @@
notification.warning({
top: 92,
message: res.search.label + ':' + res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -281,7 +281,7 @@
notification.warning({
top: 92,
message: '鏈缃暟鎹煡璇㈤厤缃紒',
- duration: 10
+ duration: 5
})
return
}
@@ -307,7 +307,7 @@
notification.warning({
top: 92,
message: '鏈煡璇㈠埌鏁版嵁淇℃伅锛�',
- duration: 10
+ duration: 5
})
}
@@ -341,7 +341,7 @@
notification.warning({
top: 92,
message: '鏈煡璇㈠埌' + emptys.join(', ') + '瀛楁淇℃伅锛�',
- duration: 10
+ duration: 5
})
}
}
@@ -349,7 +349,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
@@ -364,7 +364,7 @@
notification.warning({
top: 92,
message: '鏈缃〃鍗曞瓧娈碉紒',
- duration: 10
+ duration: 5
})
return null
}
diff --git a/src/tabviews/managetable/index.jsx b/src/tabviews/managetable/index.jsx
index b4fcc90..b93ad85 100644
--- a/src/tabviews/managetable/index.jsx
+++ b/src/tabviews/managetable/index.jsx
@@ -199,7 +199,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -246,7 +246,7 @@
notification.warning({
top: 92,
message: item.label + ': ' + this.state.dict['main.datasource.settingerror'],
- duration: 10
+ duration: 5
})
}
})
@@ -281,7 +281,7 @@
notification.warning({
top: 92,
message: res.search.label + ':' + res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -334,7 +334,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
@@ -381,7 +381,7 @@
notification.warning({
top: 92,
message: '鏈缃樉绀哄垪锛�',
- duration: 10
+ duration: 5
})
return null
}
diff --git a/src/tabviews/managetable/secretKeyTable/actionList/index.jsx b/src/tabviews/managetable/secretKeyTable/actionList/index.jsx
index 67f2847..bb45944 100644
--- a/src/tabviews/managetable/secretKeyTable/actionList/index.jsx
+++ b/src/tabviews/managetable/secretKeyTable/actionList/index.jsx
@@ -50,7 +50,7 @@
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
- duration: 10
+ duration: 5
})
return
}
@@ -63,7 +63,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectline'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot === 'requiredSgl' && data.length !== 1) {
@@ -71,7 +71,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectSingleLine'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot !== 'notRequired' && !setting.primaryKey) {
@@ -79,7 +79,7 @@
notification.warning({
top: 92,
message: '鏈缃富閿紒',
- duration: 10
+ duration: 5
})
return
}
@@ -90,7 +90,7 @@
notification.warning({
top: 92,
message: '绯荤粺瀵嗛挜涓嶅彲鍒犻櫎锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -100,7 +100,7 @@
notification.warning({
top: 92,
message: '鏁版嵁涓㈠け鎴栭敊璇紝璇锋仮澶嶉粯璁よ缃紒',
- duration: 10
+ duration: 5
})
return
}
@@ -243,14 +243,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 15
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
diff --git a/src/tabviews/managetable/secretKeyTable/index.jsx b/src/tabviews/managetable/secretKeyTable/index.jsx
index 018f90e..28dbeb4 100644
--- a/src/tabviews/managetable/secretKeyTable/index.jsx
+++ b/src/tabviews/managetable/secretKeyTable/index.jsx
@@ -174,7 +174,7 @@
notification.error({
top: 92,
message: '瀵嗛挜缁勬暟鎹涪澶辨垨鏍煎紡閿欒锛岃鎭㈠榛樿璁剧疆锛岄噸鏂版坊鍔狅紒',
- duration: 15
+ duration: 10
})
return
}
@@ -196,7 +196,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index b2c8d93..d09ffbe 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -57,7 +57,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -85,7 +85,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -154,7 +154,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -378,7 +378,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
this.setState({
submitloading: false
diff --git a/src/tabviews/scriptmanage/actionList/index.jsx b/src/tabviews/scriptmanage/actionList/index.jsx
index 83f24ac..c91c5e1 100644
--- a/src/tabviews/scriptmanage/actionList/index.jsx
+++ b/src/tabviews/scriptmanage/actionList/index.jsx
@@ -57,7 +57,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectline'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot === 'requiredSgl' && data.length !== 1) {
@@ -65,7 +65,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectSingleLine'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot !== 'notRequired' && !setting.primaryKey) {
@@ -73,7 +73,7 @@
notification.warning({
top: 92,
message: '鏈缃富閿紒',
- duration: 10
+ duration: 5
})
return
}
@@ -199,14 +199,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 15
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
diff --git a/src/tabviews/scriptmanage/index.jsx b/src/tabviews/scriptmanage/index.jsx
index 5ff47b4..6314fd0 100644
--- a/src/tabviews/scriptmanage/index.jsx
+++ b/src/tabviews/scriptmanage/index.jsx
@@ -144,7 +144,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 2ee84a9..11b05d8 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -298,10 +298,12 @@
loadingview: false,
viewlost: true
})
+ let prex = Tab && Tab.label ? Tab.label + ': ' : ''
+
notification.warning({
top: 92,
- message: result.message,
- duration: 10
+ message: prex + result.message,
+ duration: 5
})
}
}
@@ -349,10 +351,12 @@
})
deffers.push(defer)
} else if (item.resourceType === '1' && !item.dataSource) {
+ let prex = this.props.Tab && this.props.Tab.label ? this.props.Tab.label + '-' : ''
+
notification.warning({
top: 92,
- message: item.label + ': ' + this.state.dict['main.datasource.settingerror'],
- duration: 10
+ message: prex + item.label + ': ' + this.state.dict['main.datasource.settingerror'],
+ duration: 5
})
}
})
@@ -384,10 +388,12 @@
return item
})
} else {
+ let prex = this.props.Tab && this.props.Tab.label ? this.props.Tab.label + '-' : ''
+
notification.warning({
top: 92,
- message: res.search.label + ':' + res.message,
- duration: 10
+ message: prex + res.search.label + ':' + res.message,
+ duration: 5
})
}
})
@@ -454,10 +460,12 @@
this.setState({
loading: false
})
+ let prex = this.props.Tab && this.props.Tab.label ? this.props.Tab.label + ': ' : ''
+
notification.error({
top: 92,
- message: result.message,
- duration: 15
+ message: prex + result.message,
+ duration: 10
})
}
}
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 10f7670..b096258 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -229,7 +229,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
}
@@ -280,7 +280,7 @@
notification.warning({
top: 92,
message: item.label + ': ' + this.state.dict['main.datasource.settingerror'],
- duration: 10
+ duration: 5
})
}
})
@@ -308,7 +308,7 @@
notification.warning({
top: 92,
message: res.search.label + ':' + res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -361,7 +361,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
diff --git a/src/tabviews/tabform/index.jsx b/src/tabviews/tabform/index.jsx
index 85c495a..9384e7b 100644
--- a/src/tabviews/tabform/index.jsx
+++ b/src/tabviews/tabform/index.jsx
@@ -69,7 +69,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
this.setState({
loading: false
diff --git a/src/tabviews/tabmanage/index.jsx b/src/tabviews/tabmanage/index.jsx
index 9dd64ec..1f58a50 100644
--- a/src/tabviews/tabmanage/index.jsx
+++ b/src/tabviews/tabmanage/index.jsx
@@ -62,7 +62,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -116,7 +116,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
} else {
notification.success({
@@ -166,7 +166,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return
}
@@ -281,7 +281,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -303,7 +303,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
return false
}
@@ -322,7 +322,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else if (response.status && response.LongParam) {
@@ -341,7 +341,7 @@
notification.warning({
top: 92,
message: resp.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -417,7 +417,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -428,7 +428,7 @@
notification.warning({
top: 92,
message: '璇烽�夋嫨瑕佽В闄ゅ喕缁撶殑鏍囩锛�',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -454,7 +454,7 @@
notification.error({
top: 92,
message: msg,
- duration: 15
+ duration: 10
})
this.setState({
submitloading: false
diff --git a/src/tabviews/verupmanage/actionList/index.jsx b/src/tabviews/verupmanage/actionList/index.jsx
index 6a61df4..7746b01 100644
--- a/src/tabviews/verupmanage/actionList/index.jsx
+++ b/src/tabviews/verupmanage/actionList/index.jsx
@@ -51,7 +51,7 @@
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
- duration: 10
+ duration: 5
})
return
}
@@ -68,7 +68,7 @@
notification.warning({
top: 92,
message: this.props.dict['main.action.confirm.selectline'],
- duration: 10
+ duration: 5
})
return
} else if (item.Ot === 'requiredSgl' && data.length !== 1) {
@@ -84,7 +84,7 @@
notification.warning({
top: 92,
message: '鏈缃富閿紒',
- duration: 10
+ duration: 5
})
return
}
@@ -127,7 +127,7 @@
notification.warning({
top: 92,
message: '灏氫笉鏀寔姝ゅ姛鑳姐�傘�傘��',
- duration: 10
+ duration: 5
})
}
}
@@ -582,14 +582,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 15
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
diff --git a/src/tabviews/verupmanage/index.jsx b/src/tabviews/verupmanage/index.jsx
index 82861ff..5fa4ffa 100644
--- a/src/tabviews/verupmanage/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -163,7 +163,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
@@ -210,7 +210,7 @@
notification.warning({
top: 92,
message: '鏈缃樉绀哄垪锛�',
- duration: 10
+ duration: 5
})
return null
}
diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index 5d8915f..65310e5 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -185,7 +185,7 @@
notification.error({
top: 92,
message: result.message,
- duration: 15
+ duration: 10
})
}
}
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 494a553..2f65609 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -1058,7 +1058,7 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
}
})
@@ -1550,14 +1550,14 @@
notification.error({
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 15
+ duration: btn.verify && btn.verify.ntime ? btn.verify.ntime : 10
})
} else if (res.ErrCode === 'F') {
notification.error({
className: 'notification-custom-error',
top: 92,
message: res.message || res.ErrMesg,
- duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 15
+ duration: btn.verify && btn.verify.ftime ? btn.verify.ftime : 10
})
} else if (res.ErrCode === 'NM') {
message.error(res.message || res.ErrMesg)
diff --git a/src/tabviews/zshare/excelin/index.jsx b/src/tabviews/zshare/excelin/index.jsx
index 4d015b2..937043a 100644
--- a/src/tabviews/zshare/excelin/index.jsx
+++ b/src/tabviews/zshare/excelin/index.jsx
@@ -96,7 +96,7 @@
notification.warning({
top: 92,
message: '鏂囦欢瑙ｆ瀽閿欒锛岃妫�鏌ユ枃浠舵牸寮忥紒',
- duration: 10
+ duration: 5
})
}
}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index ea13978..f125224 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -141,7 +141,7 @@
notification.warning({
top: 92,
message: '鏈煡璇㈠埌琛ㄥ崟銆�' + item.label + '銆嬪叧鑱斿瓧娈碉紒',
- duration: 10
+ duration: 5
})
} else {
item.options = item.oriOptions.filter(option => option.parentId === supItem.initval)
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 8c1adb4..30e5a57 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -57,7 +57,7 @@
notification.warning({
top: 92,
message: '鏈煡璇㈠埌鎼滅储鏉′欢銆�' + item.label + '銆嬪叧鑱斿瓧娈碉紒',
- duration: 10
+ duration: 5
})
} else {
item.options = item.oriOptions.filter(option => option.parentId === supItem.initval)
diff --git a/src/tabviews/zshare/verifycard/index.jsx b/src/tabviews/zshare/verifycard/index.jsx
index 7d23bec..23bdd7b 100644
--- a/src/tabviews/zshare/verifycard/index.jsx
+++ b/src/tabviews/zshare/verifycard/index.jsx
@@ -2,7 +2,6 @@
import PropTypes from 'prop-types'
import { Form, Tabs, notification, Spin, Icon } from 'antd'
-// import Utils from '@/utils/utils.js'
import Api from '@/api'
import TabCard from './tabcard'
@@ -96,7 +95,7 @@
notification.warning({
top: 92,
message: errors[0].message,
- duration: 10
+ duration: 5
})
this.setState({
loading: false
@@ -264,7 +263,7 @@
notification.warning({
top: 92,
message: errors[0],
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/tabviews/zshare/verifycard/tabcard/actionform/index.jsx b/src/tabviews/zshare/verifycard/tabcard/actionform/index.jsx
index 4599334..389ab38 100644
--- a/src/tabviews/zshare/verifycard/tabcard/actionform/index.jsx
+++ b/src/tabviews/zshare/verifycard/tabcard/actionform/index.jsx
@@ -143,8 +143,8 @@
</Form.Item>
</Col>
<Col span={4} className="add">
- <Button onClick={this.handleConfirm} type="primary" className="add-row">
- 纭畾
+ <Button onClick={this.handleConfirm} className="mk-green">
+ 淇濆瓨
</Button>
</Col>
</Row> : null}
diff --git a/src/tabviews/zshare/verifycard/tabcard/columnform/index.jsx b/src/tabviews/zshare/verifycard/tabcard/columnform/index.jsx
index e92f497..7e86317 100644
--- a/src/tabviews/zshare/verifycard/tabcard/columnform/index.jsx
+++ b/src/tabviews/zshare/verifycard/tabcard/columnform/index.jsx
@@ -137,8 +137,8 @@
</Form.Item>
</Col>
<Col span={4} className="add">
- <Button onClick={this.handleConfirm} type="primary" className="add-row">
- 纭畾
+ <Button onClick={this.handleConfirm} className="mk-green">
+ 淇濆瓨
</Button>
</Col>
<Col span={10}>
diff --git a/src/tabviews/zshare/verifycard/tabcard/index.jsx b/src/tabviews/zshare/verifycard/tabcard/index.jsx
index 2e3c712..e560fe3 100644
--- a/src/tabviews/zshare/verifycard/tabcard/index.jsx
+++ b/src/tabviews/zshare/verifycard/tabcard/index.jsx
@@ -211,7 +211,7 @@
notification.warning({
top: 92,
message: '鎸夐挳銆�' + item.label + '銆嬭缃敊璇�!',
- duration: 10
+ duration: 5
})
} else {
let socket = null
@@ -264,7 +264,7 @@
notification.warning({
top: 92,
message: data.message,
- duration: 10
+ duration: 5
})
}
}
@@ -273,7 +273,7 @@
notification.warning({
top: 92,
message: '鏃犳硶杩炴帴鍒�:' + item.verify.linkUrl,
- duration: 10
+ duration: 5
})
}
}
diff --git a/src/tabviews/zshare/verifycard/tabcard/printform/index.jsx b/src/tabviews/zshare/verifycard/tabcard/printform/index.jsx
index 7b23241..8d0410b 100644
--- a/src/tabviews/zshare/verifycard/tabcard/printform/index.jsx
+++ b/src/tabviews/zshare/verifycard/tabcard/printform/index.jsx
@@ -101,8 +101,8 @@
</Form.Item>
</Col>
<Col span={4} className="add">
- <Button onClick={this.handleConfirm} type="primary" className="add-row">
- 纭畾
+ <Button onClick={this.handleConfirm} className="mk-green">
+ 淇濆瓨
</Button>
</Col>
</Row> : null}
diff --git a/src/tabviews/zshare/verifycard/tabcard/printtypeform/index.jsx b/src/tabviews/zshare/verifycard/tabcard/printtypeform/index.jsx
index 538fe47..3cb39e2 100644
--- a/src/tabviews/zshare/verifycard/tabcard/printtypeform/index.jsx
+++ b/src/tabviews/zshare/verifycard/tabcard/printtypeform/index.jsx
@@ -92,8 +92,8 @@
</Form.Item>
</Col>
<Col span={4} className="add">
- <Button onClick={this.handleConfirm} type="primary" className="add-row">
- 纭畾
+ <Button onClick={this.handleConfirm} className="mk-green">
+ 淇濆瓨
</Button>
</Col>
</Row> : null}
diff --git a/src/templates/comtableconfig/actionform/index.jsx b/src/templates/comtableconfig/actionform/index.jsx
index 1cdc807..0af7ce9 100644
--- a/src/templates/comtableconfig/actionform/index.jsx
+++ b/src/templates/comtableconfig/actionform/index.jsx
@@ -596,7 +596,7 @@
notification.warning({
top: 92,
message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒',
- duration: 10
+ duration: 5
})
return
}
@@ -617,13 +617,13 @@
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.tablename'],
- duration: 10
+ duration: 5
})
} else if (values.innerFunc === '' && values.sql !== '' && values.sqlType === '') {
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.sqlType'],
- duration: 10
+ duration: 5
})
} else {
resolve(values)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 2784eb8..aa5d11e 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -266,7 +266,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -328,7 +328,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -355,7 +355,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -404,7 +404,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -528,7 +528,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
@@ -738,14 +738,14 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
message: '鍚嶇О宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
}
@@ -853,7 +853,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -928,7 +928,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -990,14 +990,14 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
message: '鍚嶇О宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1089,7 +1089,7 @@
notification.warning({
top: 92,
message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1135,7 +1135,7 @@
notification.warning({
top: 92,
message: '寮圭獥锛堣〃鍗曪級鎸夐挳锛岃鍏堥厤缃〃鍗曚俊鎭紒',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -1153,7 +1153,7 @@
notification.warning({
top: 92,
message: '璇峰畬鍠勫鍏xcel楠岃瘉淇℃伅锛�',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -1232,7 +1232,7 @@
notification.warning({
top: 92,
message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖瀛樺湪鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1264,7 +1264,7 @@
notification.warning({
top: 92,
message: '鎵撳紑鏂瑰紡涓� 寮圭獥锛堣〃鍗曪級銆佹彁绀烘鎴栫洿鎺ユ墽琛岋紝涓斾娇鐢ㄧ郴缁熷嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1294,7 +1294,7 @@
notification.warning({
top: 92,
message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖涓嶅瓨鍦ㄥ唴閮ㄥ嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1385,7 +1385,7 @@
notification.warning({
top: 92,
message: '姝ゆ寜閽棤瀛愰厤缃」锛�',
- duration: 10
+ duration: 5
})
}
}
@@ -1476,7 +1476,7 @@
notification.warning({
top: 92,
message: '鎸夐挳鍚嶇О涓嶅彲鐩稿悓锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1495,7 +1495,7 @@
notification.warning({
top: 92,
message: '鏍囩鍚嶇О涓嶅彲鐩稿悓锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1664,7 +1664,7 @@
notification.warning({
top: 92,
message: '缂栬瘧閿欒',
- duration: 10
+ duration: 5
})
this.setState({
menucloseloading: false,
@@ -1806,7 +1806,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -1850,7 +1850,7 @@
notification.warning({
top: 92,
message: msg,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -1904,7 +1904,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1914,7 +1914,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.basemsg'],
- duration: 10
+ duration: 5
})
})
}
@@ -1966,7 +1966,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -2144,7 +2144,7 @@
notification.warning({
top: 92,
message: '璇烽�夋嫨琛ㄥ悕锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -2223,7 +2223,7 @@
notification.warning({
top: 92,
message: '璇烽�夋嫨娣诲姞瀛楁',
- duration: 10
+ duration: 5
})
return
}
@@ -2390,7 +2390,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -2524,7 +2524,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.config.notsave'],
- duration: 10
+ duration: 5
})
} else {
this.menuformRef.handleConfirm().then(res => {
@@ -2544,7 +2544,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.config.update'],
- duration: 10
+ duration: 5
})
return
}
@@ -2625,7 +2625,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -2633,7 +2633,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.config.update'],
- duration: 10
+ duration: 5
})
})
}
@@ -2658,19 +2658,19 @@
notification.warning({
top: 92,
message: '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
- duration: 10
+ duration: 5
})
} else if (!config.setting.primaryKey) {
notification.warning({
top: 92,
message: '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒',
- duration: 10
+ duration: 5
})
} else if (!tabinvalid) {
notification.warning({
top: 92,
message: '鑿滃崟鏍囩椤佃缃敊璇紙澶氳鏍囩鍐咃紝琛屾爣绛句笉鍙负绌猴級锛屼笉鍙惎鐢紒',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -2808,7 +2808,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -2824,7 +2824,7 @@
notification.warning({
top: 92,
message: this.state.dict['form.required.select'] + this.state.dict['header.form.thawbutton'],
- duration: 10
+ duration: 5
})
} else {
@@ -2912,7 +2912,7 @@
notification.warning({
top: 92,
message: '鏄剧ず鍒楀凡瀛樺湪锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -2925,7 +2925,7 @@
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�',
- duration: 10
+ duration: 5
})
}
})
diff --git a/src/templates/comtableconfig/settingform/index.jsx b/src/templates/comtableconfig/settingform/index.jsx
index 5ab62c9..ef66b1f 100644
--- a/src/templates/comtableconfig/settingform/index.jsx
+++ b/src/templates/comtableconfig/settingform/index.jsx
@@ -60,7 +60,7 @@
notification.warning({
top: 92,
message: '璇疯嚜瀹氫箟鍑芥暟鎴栧～鍐欐暟鎹簮锛�',
- duration: 10
+ duration: 5
})
} else {
@@ -70,7 +70,7 @@
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx
index e3c8123..ffa92c8 100644
--- a/src/templates/formtabconfig/actionform/index.jsx
+++ b/src/templates/formtabconfig/actionform/index.jsx
@@ -409,13 +409,13 @@
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.tablename'],
- duration: 10
+ duration: 5
})
} else if (values.innerFunc === '' && values.sql !== '' && values.sqlType === '') {
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.sqlType'],
- duration: 10
+ duration: 5
})
} else {
resolve(values)
diff --git a/src/templates/formtabconfig/index.jsx b/src/templates/formtabconfig/index.jsx
index 9a0ab1f..dcc9b60 100644
--- a/src/templates/formtabconfig/index.jsx
+++ b/src/templates/formtabconfig/index.jsx
@@ -180,7 +180,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -242,7 +242,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -269,7 +269,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -318,7 +318,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -649,7 +649,7 @@
notification.warning({
top: 92,
message: '琛ㄥ崟涓瓧娈靛悕涓嶅彲涓庝富閿噸澶嶏紒',
- duration: 10
+ duration: 5
})
return
}
@@ -721,14 +721,14 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
} else if (labelrepeat) {
notification.warning({
top: 92,
message: '鍚嶇О宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
}
@@ -859,7 +859,7 @@
notification.warning({
top: 92,
message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
- duration: 10
+ duration: 5
})
return
}
@@ -916,7 +916,7 @@
notification.warning({
top: 92,
message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖瀛樺湪鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1052,7 +1052,7 @@
notification.warning({
top: 92,
message: '鎸夐挳鍚嶇О涓嶅彲鐩稿悓锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1071,7 +1071,7 @@
notification.warning({
top: 92,
message: '鏍囩鍚嶇О涓嶅彲鐩稿悓锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1218,7 +1218,7 @@
notification.warning({
top: 92,
message: '缂栬瘧閿欒',
- duration: 10
+ duration: 5
})
this.setState({
@@ -1312,7 +1312,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -1344,7 +1344,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1354,7 +1354,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.basemsg'],
- duration: 10
+ duration: 5
})
})
}
@@ -1399,7 +1399,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -1466,7 +1466,7 @@
notification.warning({
top: 92,
message: '璇烽�夋嫨琛ㄥ悕锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1612,7 +1612,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1707,7 +1707,7 @@
notification.warning({
top: 92,
message: '鑿滃崟灏氭湭淇濆瓨锛岃淇濆瓨鑿滃崟閰嶇疆锛�',
- duration: 10
+ duration: 5
})
} else {
this.menuformRef.handleConfirm().then(res => {
@@ -1717,7 +1717,7 @@
notification.warning({
top: 92,
message: '鑿滃崟閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -1771,7 +1771,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1780,7 +1780,7 @@
notification.warning({
top: 92,
message: '鑿滃崟鍩烘湰淇℃伅宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
- duration: 10
+ duration: 5
})
})
}
@@ -1821,31 +1821,31 @@
notification.warning({
top: 92,
message: '灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
- duration: 10
+ duration: 5
})
} else if (config.setting.datatype === 'query' && !config.setting.primaryKey) {
notification.warning({
top: 92,
message: '灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒',
- duration: 10
+ duration: 5
})
} else if (!tabinvalid) {
notification.warning({
top: 92,
message: '瀛樺湪澶氫綑鏍囩缁勶紝涓嶅彲鍚敤锛�',
- duration: 10
+ duration: 5
})
} else if (!forminvalid) {
notification.warning({
top: 92,
message: '瀛樺湪澶氫綑绌鸿〃鍗曠粍锛屼笉鍙惎鐢紒',
- duration: 10
+ duration: 5
})
} else if (primaryrepeat) {
notification.warning({
top: 92,
message: '琛ㄥ崟瀛楁涓庝富閿噸澶嶏紝涓嶅彲鍚敤锛�',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -1999,7 +1999,7 @@
notification.warning({
top: 92,
message: '涓嶆敮鎸佹琛ㄥ崟绫诲瀷锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -2014,7 +2014,7 @@
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�',
- duration: 10
+ duration: 5
})
}
})
diff --git a/src/templates/formtabconfig/settingform/index.jsx b/src/templates/formtabconfig/settingform/index.jsx
index 1a7a7b8..1eac7a4 100644
--- a/src/templates/formtabconfig/settingform/index.jsx
+++ b/src/templates/formtabconfig/settingform/index.jsx
@@ -47,7 +47,7 @@
notification.warning({
top: 92,
message: '鑿滃崟淇℃伅閿欒锛�',
- duration: 10
+ duration: 5
})
}
@@ -71,7 +71,7 @@
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/subtableconfig/actionform/index.jsx b/src/templates/subtableconfig/actionform/index.jsx
index 4438d4f..84a1cbf 100644
--- a/src/templates/subtableconfig/actionform/index.jsx
+++ b/src/templates/subtableconfig/actionform/index.jsx
@@ -632,7 +632,7 @@
notification.warning({
top: 92,
message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒',
- duration: 10
+ duration: 5
})
return
}
@@ -652,13 +652,13 @@
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.tablename'],
- duration: 10
+ duration: 5
})
} else if (values.innerFunc === '' && values.sql !== '' && values.sqlType === '') {
notification.warning({
top: 92,
message: this.props.dict['header.form.actionhelp.sqlType'],
- duration: 10
+ duration: 5
})
} else {
resolve(values)
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index e81e1d6..2930bf1 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -207,7 +207,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -269,7 +269,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -296,7 +296,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -336,7 +336,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -502,7 +502,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
}
@@ -585,14 +585,14 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
message: '鍚嶇О宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
}
@@ -700,7 +700,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -762,14 +762,14 @@
notification.warning({
top: 92,
message: '瀛楁宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
} else if (labelrepet) {
notification.warning({
top: 92,
message: '鍚嶇О宸插瓨鍦紒',
- duration: 10
+ duration: 5
})
return
}
@@ -841,7 +841,7 @@
notification.warning({
top: 92,
message: '璇峰～鍐欏唴閮ㄥ嚱鏁帮紒',
- duration: 10
+ duration: 5
})
return
}
@@ -887,7 +887,7 @@
notification.warning({
top: 92,
message: '寮圭獥锛堣〃鍗曪級鎸夐挳锛岃鍏堥厤缃〃鍗曚俊鎭紒',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -905,7 +905,7 @@
notification.warning({
top: 92,
message: '璇峰畬鍠勫鍏xcel楠岃瘉淇℃伅锛�',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -983,7 +983,7 @@
notification.warning({
top: 92,
message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖瀛樺湪鍐呴儴鍑芥暟鏃讹紝鎵嶅彲浠ュ垱寤哄瓨鍌ㄨ繃绋嬶紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1056,7 +1056,7 @@
notification.warning({
top: 92,
message: '姝ゆ寜閽棤瀛愰厤缃」锛�',
- duration: 10
+ duration: 5
})
}
}
@@ -1113,7 +1113,7 @@
notification.warning({
top: 92,
message: '鎸夐挳鍚嶇О涓嶅彲鐩稿悓锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1235,7 +1235,7 @@
notification.warning({
top: 92,
message: '缂栬瘧閿欒',
- duration: 10
+ duration: 5
})
this.setState({
@@ -1337,7 +1337,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -1381,7 +1381,7 @@
notification.warning({
top: 92,
message: msg,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -1413,7 +1413,7 @@
notification.warning({
top: 92,
message: response.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1423,7 +1423,7 @@
notification.warning({
top: 92,
message: this.state.dict['header.menu.basemsg'],
- duration: 10
+ duration: 5
})
})
}
@@ -1475,7 +1475,7 @@
notification.warning({
top: 92,
message: error.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -1599,7 +1599,7 @@
notification.warning({
top: 92,
message: '璇烽�夋嫨琛ㄥ悕锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -1835,7 +1835,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1957,7 +1957,7 @@
notification.warning({
top: 92,
message: '鑿滃崟灏氭湭淇濆瓨锛岃淇濆瓨鑿滃崟閰嶇疆锛�',
- duration: 10
+ duration: 5
})
} else {
this.menuformRef.handleConfirm().then(res => {
@@ -1967,7 +1967,7 @@
notification.warning({
top: 92,
message: '鑿滃崟閰嶇疆宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -2037,7 +2037,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -2046,7 +2046,7 @@
notification.warning({
top: 92,
message: '鑿滃崟鍩烘湰淇℃伅宸蹭慨鏀癸紝璇蜂繚瀛橈紒',
- duration: 10
+ duration: 5
})
})
}
@@ -2059,13 +2059,13 @@
notification.warning({
top: 92,
message: '灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�',
- duration: 10
+ duration: 5
})
} else if (!config.setting.primaryKey) {
notification.warning({
top: 92,
message: '灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒',
- duration: 10
+ duration: 5
})
} else {
this.setState({
@@ -2151,7 +2151,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -2167,7 +2167,7 @@
notification.warning({
top: 92,
message: this.state.dict['form.required.select'] + this.state.dict['header.form.thawbutton'],
- duration: 10
+ duration: 5
})
} else {
@@ -2197,7 +2197,7 @@
notification.warning({
top: 92,
message: '鎵撳紑鏂瑰紡涓� 寮圭獥锛堣〃鍗曪級銆佹彁绀烘鎴栫洿鎺ユ墽琛岋紝涓斾娇鐢ㄧ郴缁熷嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -2226,7 +2226,7 @@
notification.warning({
top: 92,
message: '鎺ュ彛绫诲瀷涓�-鍐呴儴锛屼笖涓嶅瓨鍦ㄥ唴閮ㄥ嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -2250,14 +2250,14 @@
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�',
- duration: 10
+ duration: 5
})
return
} else if (!['pop', 'prompt', 'exec', 'excelIn', 'excelOut', 'popview'].includes(res.OpenType)) {
notification.warning({
top: 92,
message: '涓嶆敮鎸佹鎵撳紑鏂瑰紡锛�',
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/subtableconfig/settingform/index.jsx b/src/templates/subtableconfig/settingform/index.jsx
index a84ca75..84b34e4 100644
--- a/src/templates/subtableconfig/settingform/index.jsx
+++ b/src/templates/subtableconfig/settingform/index.jsx
@@ -59,7 +59,7 @@
notification.warning({
top: 92,
message: '璇疯嚜瀹氫箟鍑芥暟鎴栧～鍐欐暟鎹簮锛�',
- duration: 10
+ duration: 5
})
} else {
let error = Utils.verifySql(values.dataresource)
@@ -68,7 +68,7 @@
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/zshare/columnform/index.jsx b/src/templates/zshare/columnform/index.jsx
index 09f9db8..e8674c3 100644
--- a/src/templates/zshare/columnform/index.jsx
+++ b/src/templates/zshare/columnform/index.jsx
@@ -312,7 +312,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
targetOption.loading = false
}
diff --git a/src/templates/zshare/createfunc/index.jsx b/src/templates/zshare/createfunc/index.jsx
index bb867db..a53d62a 100644
--- a/src/templates/zshare/createfunc/index.jsx
+++ b/src/templates/zshare/createfunc/index.jsx
@@ -42,7 +42,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -70,7 +70,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -123,7 +123,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else if (isExist) {
@@ -153,7 +153,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -180,7 +180,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else {
diff --git a/src/templates/zshare/createinterface/index.jsx b/src/templates/zshare/createinterface/index.jsx
index 31e61c9..1b3d1e2 100644
--- a/src/templates/zshare/createinterface/index.jsx
+++ b/src/templates/zshare/createinterface/index.jsx
@@ -238,7 +238,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
@@ -261,7 +261,7 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -424,14 +424,14 @@
notification.warning({
top: 92,
message: result.message,
- duration: 10
+ duration: 5
})
resolve(false)
} else {
notification.warning({
top: 92,
message: '璇峰畬鍠勮〃鍗曚俊鎭紒',
- duration: 10
+ duration: 5
})
resolve(false)
}
@@ -509,7 +509,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else {
@@ -531,7 +531,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
return false
} else {
diff --git a/src/templates/zshare/dragelement/index.jsx b/src/templates/zshare/dragelement/index.jsx
index f0f9b40..86a6fd7 100644
--- a/src/templates/zshare/dragelement/index.jsx
+++ b/src/templates/zshare/dragelement/index.jsx
@@ -61,7 +61,11 @@
copycard.focus = true
copycard.originCard = card
-
+
+ if (copycard.OpenType === 'popview') { // 寰呭畬鍠�
+ copycard.linkTab = ''
+ }
+
let _val = JSON.parse(JSON.stringify(copycard))
try {
diff --git a/src/templates/zshare/modalform/index.jsx b/src/templates/zshare/modalform/index.jsx
index 954cad9..e42c447 100644
--- a/src/templates/zshare/modalform/index.jsx
+++ b/src/templates/zshare/modalform/index.jsx
@@ -516,7 +516,7 @@
notification.warning({
top: 92,
message: this.props.dict['header.form.selectItem.error'],
- duration: 10
+ duration: 5
})
}
} else if ((values.type === 'multiselect' || values.type === 'select' || values.type === 'link') && values.resourceType === '1') {
@@ -529,7 +529,7 @@
notification.warning({
top: 92,
message: '鏈�灏忓�间笉鍙ぇ浜庢渶澶у�硷紒',
- duration: 10
+ duration: 5
})
}
} else if (values.type === 'linkMain') {
@@ -548,7 +548,7 @@
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/zshare/pasteform/index.jsx b/src/templates/zshare/pasteform/index.jsx
index e6ef04d..fcb82db 100644
--- a/src/templates/zshare/pasteform/index.jsx
+++ b/src/templates/zshare/pasteform/index.jsx
@@ -34,7 +34,7 @@
notification.warning({
top: 92,
message: '瑙ｆ瀽閿欒',
- duration: 10
+ duration: 5
})
_config = ''
}
diff --git a/src/templates/zshare/searchform/index.jsx b/src/templates/zshare/searchform/index.jsx
index b256a22..e7941ec 100644
--- a/src/templates/zshare/searchform/index.jsx
+++ b/src/templates/zshare/searchform/index.jsx
@@ -433,7 +433,7 @@
notification.warning({
top: 92,
message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error,
- duration: 10
+ duration: 5
})
return
}
@@ -443,7 +443,7 @@
notification.warning({
top: 92,
message: this.props.dict['header.form.selectItem.error'],
- duration: 10
+ duration: 5
})
}
} else {
diff --git a/src/templates/zshare/verifycard/customform/index.jsx b/src/templates/zshare/verifycard/customform/index.jsx
index ab71d0e..eec4967 100644
--- a/src/templates/zshare/verifycard/customform/index.jsx
+++ b/src/templates/zshare/verifycard/customform/index.jsx
@@ -55,21 +55,21 @@
notification.warning({
top: 92,
message: 'sql涓璡'蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (_lparen !== _rparen) {
notification.warning({
top: 92,
message: 'sql涓�()蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (/--/ig.test(values.sql)) {
notification.warning({
top: 92,
message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
- duration: 10
+ duration: 5
})
return
}
@@ -80,7 +80,7 @@
notification.warning({
top: 92,
message: 'sql涓笉鍙娇鐢�' + error,
- duration: 10
+ duration: 5
})
return
}
diff --git a/src/templates/zshare/verifycard/customscript/index.jsx b/src/templates/zshare/verifycard/customscript/index.jsx
index 8430f6e..6a3508c 100644
--- a/src/templates/zshare/verifycard/customscript/index.jsx
+++ b/src/templates/zshare/verifycard/customscript/index.jsx
@@ -15,6 +15,7 @@
usefulfields: PropTypes.string, // 鍙敤瀛楁
initsql: PropTypes.string, // sql鍓嶇紑
systemScripts: PropTypes.array, // 绯荤粺鑴氭湰
+ customScripts: PropTypes.array, // 鑷畾涔夎剼鏈�
scriptsChange: PropTypes.func // 琛ㄥ崟
}
@@ -52,21 +53,21 @@
notification.warning({
top: 92,
message: 'sql涓璡'蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (_lparen !== _rparen) {
notification.warning({
top: 92,
message: 'sql涓�()蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (/--/ig.test(values.sql)) {
notification.warning({
top: 92,
message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
- duration: 10
+ duration: 5
})
return
}
@@ -77,7 +78,7 @@
notification.warning({
top: 92,
message: 'sql涓笉鍙娇鐢�' + error,
- duration: 10
+ duration: 5
})
return
}
@@ -86,9 +87,19 @@
aaa:
`
+ let _initsql = ''
+ this.props.customScripts.forEach(script => {
+ if (this.state.editItem && this.state.editItem.uuid === script.uuid) return
+ if (script.status === 'false' || script.position !== 'init') return
+
+ _initsql += `
+ ${script.sql}
+ `
+ })
+
let param = {
func: 's_debug_sql',
- LText: this.props.initsql + values.sql + tail
+ LText: this.props.initsql + _initsql + values.sql + tail
}
param.LText = Utils.formatOptions(param.LText)
@@ -173,6 +184,7 @@
<Radio.Group>
<Radio value="front">sql鍓�</Radio>
<Radio value="back">sql鍚�</Radio>
+ <Radio value="init">鍒濆鍖�</Radio>
</Radio.Group>
)}
</Form.Item>
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 2909e0b..4bb5edf 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -231,7 +231,15 @@
title: '鎵ц浣嶇疆',
dataIndex: 'position',
width: '10%',
- render: (text, record) => record.position !== 'front' ? 'sql鍚�' : 'sql鍓�'
+ render: (text, record) => {
+ if (record.position === 'init') {
+ return '鍒濆鍖�'
+ } else if (record.position === 'front') {
+ return 'sql鍓�'
+ } else {
+ return 'sql鍚�'
+ }
+ }
},
{
title: '鐘舵��',
@@ -603,7 +611,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -674,7 +682,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -702,7 +710,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -737,7 +745,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -765,7 +773,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -806,7 +814,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -1147,13 +1155,13 @@
className: 'notification-custom-error',
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'N') {
notification.error({
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'E') {
Modal.error({
@@ -1181,7 +1189,7 @@
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝蹇呴』璁剧疆鑷畾涔夎剼鏈紒',
- duration: 10
+ duration: 5
})
return
}
@@ -1371,6 +1379,7 @@
usefulfields={this.state.usefulfields}
initsql={this.state.initsql}
dict={this.props.dict}
+ customScripts={verify.scripts}
systemScripts={this.state.systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
@@ -1422,7 +1431,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ntime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
+ <InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
@@ -1437,7 +1446,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ftime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
+ <InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
@@ -1511,7 +1520,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ntime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
+ <InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
@@ -1526,7 +1535,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ftime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
+ <InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
diff --git a/src/templates/zshare/verifycardexcelin/columnform/index.jsx b/src/templates/zshare/verifycardexcelin/columnform/index.jsx
index 3bf5fc0..b1e6c8f 100644
--- a/src/templates/zshare/verifycardexcelin/columnform/index.jsx
+++ b/src/templates/zshare/verifycardexcelin/columnform/index.jsx
@@ -82,16 +82,6 @@
values.limit = ''
}
- // let _col = columns.filter(col => col.uuid !== values.uuid && col.Column === values.Column)
- // if (_col.length > 0) {
- // notification.warning({
- // top: 92,
- // message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
- // duration: 10
- // })
- // return
- // }
-
this.props.columnChange(values)
this.setState({
editItem: null,
diff --git a/src/templates/zshare/verifycardexcelin/customscript/index.jsx b/src/templates/zshare/verifycardexcelin/customscript/index.jsx
index 8c4d235..ba33bfe 100644
--- a/src/templates/zshare/verifycardexcelin/customscript/index.jsx
+++ b/src/templates/zshare/verifycardexcelin/customscript/index.jsx
@@ -105,21 +105,21 @@
notification.warning({
top: 92,
message: 'sql涓璡'蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (_lparen !== _rparen) {
notification.warning({
top: 92,
message: 'sql涓�()蹇呴』鎴愬鍑虹幇',
- duration: 10
+ duration: 5
})
return
} else if (/--/ig.test(values.sql)) {
notification.warning({
top: 92,
message: '鑷畾涔塻ql璇彞涓紝涓嶅彲鍑虹幇瀛楃 -- 锛屾敞閲婅鐢� /*鍐呭*/',
- duration: 10
+ duration: 5
})
return
}
@@ -130,7 +130,7 @@
notification.warning({
top: 92,
message: 'sql涓笉鍙娇鐢�' + error,
- duration: 10
+ duration: 5
})
return
}
@@ -139,9 +139,19 @@
aaa:
`
+ let _initsql = ''
+ this.props.scripts.forEach(script => {
+ if (this.state.editItem && this.state.editItem.uuid === script.uuid) return
+ if (script.status === 'false' || script.position !== 'init') return
+
+ _initsql += `
+ ${script.sql}
+ `
+ })
+
let param = {
func: 's_debug_sql',
- LText: this.state.verifySql + values.sql + tail
+ LText: this.state.verifySql + _initsql + values.sql + tail
}
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
diff --git a/src/templates/zshare/verifycardexcelin/index.jsx b/src/templates/zshare/verifycardexcelin/index.jsx
index 12b2b5d..5a81e00 100644
--- a/src/templates/zshare/verifycardexcelin/index.jsx
+++ b/src/templates/zshare/verifycardexcelin/index.jsx
@@ -256,7 +256,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -514,14 +514,14 @@
notification.warning({
top: 92,
message: '璇疯缃瓻xcel鍒楀瓧娈�!',
- duration: 10
+ duration: 5
})
return
} else if (_verify.columns.length > cols.length) {
notification.warning({
top: 92,
message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
- duration: 10
+ duration: 5
})
return
} else if (_verify.range === 1) {
@@ -530,7 +530,7 @@
notification.warning({
top: 92,
message: '蹇界暐棣栬鏃讹紝浼氫娇鐢═ext鍊兼牎楠孍xcel棣栬鍐呭锛孴ext鍊间笌Excel琛ㄩ琛屽唴瀹圭浉鍚岋紝涓斿潎涓嶅彲涓虹┖锛�',
- duration: 10
+ duration: 5
})
return
}
@@ -566,7 +566,7 @@
notification.warning({
top: 92,
message: '璇疯缃瓻xcel琛ㄥ悕!',
- duration: 10
+ duration: 5
})
}
})
@@ -598,13 +598,13 @@
className: 'notification-custom-error',
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'N') {
notification.error({
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'E') {
Modal.error({
@@ -768,7 +768,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ntime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
+ <InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
@@ -783,7 +783,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ftime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
+ <InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
diff --git a/src/templates/zshare/verifycardexcelout/columnform/index.jsx b/src/templates/zshare/verifycardexcelout/columnform/index.jsx
index e863a61..049e657 100644
--- a/src/templates/zshare/verifycardexcelout/columnform/index.jsx
+++ b/src/templates/zshare/verifycardexcelout/columnform/index.jsx
@@ -28,21 +28,10 @@
handleConfirm = () => {
- // const { columns } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
values.uuid = this.state.editItem ? this.state.editItem.uuid : ''
-
- // let _col = columns.filter(col => col.uuid !== values.uuid && col.Column === values.Column)
- // if (_col.length > 0) {
- // notification.warning({
- // top: 92,
- // message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
- // duration: 10
- // })
- // return
- // }
this.props.columnChange(values)
this.setState({
diff --git a/src/templates/zshare/verifycardexcelout/index.jsx b/src/templates/zshare/verifycardexcelout/index.jsx
index 8eda501..8a660c3 100644
--- a/src/templates/zshare/verifycardexcelout/index.jsx
+++ b/src/templates/zshare/verifycardexcelout/index.jsx
@@ -165,13 +165,13 @@
className: 'notification-custom-error',
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'N') {
notification.error({
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'E') {
Modal.error({
@@ -202,7 +202,7 @@
notification.warning({
top: 92,
message: 'Excel鍒楀瓧娈靛悕锛屼笉鍙噸澶�!',
- duration: 10
+ duration: 5
})
return
@@ -281,7 +281,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ntime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
+ <InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
@@ -296,7 +296,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ftime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
+ <InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
diff --git a/src/templates/zshare/verifycardprint/index.jsx b/src/templates/zshare/verifycardprint/index.jsx
index 24242c7..452d7ed 100644
--- a/src/templates/zshare/verifycardprint/index.jsx
+++ b/src/templates/zshare/verifycardprint/index.jsx
@@ -105,7 +105,7 @@
notification.warning({
top: 92,
message: res.message,
- duration: 10
+ duration: 5
})
}
})
@@ -127,13 +127,13 @@
className: 'notification-custom-error',
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'N') {
notification.error({
top: 92,
message: '鎵ц澶辫触锛�',
- duration: 15
+ duration: 10
})
} else if (errorType === 'E') {
Modal.error({
@@ -189,14 +189,14 @@
notification.warning({
top: 92,
message: '鎵撳嵃绫诲瀷琛ㄦ牸涓璙alue銆乀ext瀛楁涓嶅彲涓虹┖!',
- duration: 10
+ duration: 5
})
return
} else if (!isvalid) {
notification.warning({
top: 92,
message: '鎵撳嵃绫诲瀷琛ㄦ牸涓璙alue瀛楁涓嶅彲閲嶅!',
- duration: 10
+ duration: 5
})
return
}
@@ -209,7 +209,7 @@
notification.warning({
top: 92,
message: '閾炬帴鍦板潃涓庢墦鍗版ā鏉夸笉鍙负绌�!',
- duration: 10
+ duration: 5
})
}
})
@@ -403,7 +403,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ntime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
+ <InputNumber defaultValue={verify.ntime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
@@ -418,7 +418,7 @@
</Col>
<Col span={8}>
<Form.Item label={'鍋滅暀鏃堕棿'}>
- <InputNumber defaultValue={verify.ftime || 15} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
+ <InputNumber defaultValue={verify.ftime || 10} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
diff --git a/src/utils/utils.js b/src/utils/utils.js
index f93eb25..a3f9b02 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -96,103 +96,40 @@
let salt = 'minKe' // 鐩愬��
// 鍏抽敭瀛楄浆鎹㈣鍒�
- let format = [{
- key: 'select',
- value: ' msltk '
- }, {
- key: 'from',
- value: ' mfrmk '
- }, {
- key: 'where',
- value: ' mwhrk '
- }, {
- key: 'order by',
- value: ' modbk '
- }, {
- key: 'asc',
- value: ' modack '
- }, {
- key: 'desc',
- value: ' moddesk '
- }, {
- key: 'top',
- value: ' mtpk '
- }, {
- key: 'like',
- value: ' mlkk '
- }, {
- key: 'not like',
- value: ' mnlkk '
- }, {
- key: 'between',
- value: ' mbtnk '
- }, {
- key: 'and',
- value: ' madk '
- }, {
- key: 'insert',
- value: ' mistk '
- }, {
- key: 'into',
- value: ' mitk '
- }, {
- key: 'update',
- value: ' muptk '
- }, {
- key: 'delete',
- value: ' mdelk '
- }, {
- key: 'begin',
- value: ' mbgink '
- }, {
- key: 'end',
- value: ' medk '
- }, {
- key: 'if',
- value: ' mefk '
- }, {
- key: 'while',
- value: ' mwilk '
- }, {
- key: 'create',
- value: ' mcrtk '
- }, {
- key: 'alter',
- value: ' matek '
- }, {
- key: 'len',
- value: ' mlnk '
- }, {
- key: 'left',
- value: ' mlftk '
- }, {
- key: 'right',
- value: ' mritk '
- }, {
- key: 'union',
- value: ' munok '
- }, {
- key: 'varchar',
- value: ' mvcrk '
- }, {
- key: 'getdate',
- value: ' mgtdtk '
- }, {
- key: 'TRY',
- value: ' mtryonek '
- }, {
- key: 'TRAN',
- value: ' mtrnk '
- }, {
- key: 'goto',
- value: ' mgtk '
- }, {
- key: 'set',
- value: ' mstk '
- }, {
- key: 'ROLLBACK',
- value: ' mrlbkk '
- }]
+ let format = [
+ { key: 'select', value: ' msltk ' },
+ { key: 'from', value: ' mfrmk ' },
+ { key: 'where', value: ' mwhrk ' },
+ { key: 'order by', value: ' modbk ' },
+ { key: 'asc', value: ' modack ' },
+ { key: 'desc', value: ' moddesk ' },
+ { key: 'top', value: ' mtpk ' },
+ { key: 'like', value: ' mlkk ' },
+ { key: 'not like', value: ' mnlkk ' },
+ { key: 'between', value: ' mbtnk ' },
+ { key: 'and', value: ' madk ' },
+ { key: 'insert', value: ' mistk ' },
+ { key: 'into', value: ' mitk ' },
+ { key: 'update', value: ' muptk ' },
+ { key: 'delete', value: ' mdelk ' },
+ { key: 'begin', value: ' mbgink ' },
+ { key: 'end', value: ' medk ' },
+ { key: 'if', value: ' mefk ' },
+ { key: 'while', value: ' mwilk ' },
+ { key: 'create', value: ' mcrtk ' },
+ { key: 'alter', value: ' matek ' },
+ { key: 'len', value: ' mlnk ' },
+ { key: 'left', value: ' mlftk ' },
+ { key: 'right', value: ' mritk ' },
+ { key: 'union', value: ' munok ' },
+ { key: 'varchar', value: ' mvcrk ' },
+ { key: 'getdate', value: ' mgtdtk ' },
+ { key: 'TRY', value: ' mtryonek ' },
+ { key: 'TRAN', value: ' mtrnk ' },
+ { key: 'goto', value: ' mgtk ' },
+ { key: 'set', value: ' mstk ' },
+ { key: 'ROLLBACK', value: ' mrlbkk ' }
+ ]
if (!isUnFormat) { // 鍔犲瘑
value = value.replace(/\n/ig, ' \n ')
@@ -536,8 +473,28 @@
let _topline = btn.range || 0
let upId = this.getuuid()
- if (btn.scripts && btn.scripts.length > 0) {
- btn.scripts = btn.scripts.filter(item => item.status !== 'false')
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ if (btn.scripts) {
+ btn.scripts.forEach(script => {
+ if (script.status === 'false') return
+
+ if (script.position === 'init') {
+ _initCustomScript += `
+ ${script.sql}
+ `
+ } else if (script.position === 'front') {
+ _prevCustomScript += `
+ ${script.sql}
+ `
+ } else {
+ _backCustomScript += `
+ ${script.sql}
+ `
+ }
+ })
}
let _Ltext = data.map((item, lindex) => {
@@ -682,31 +639,19 @@
let _insert = ''
- if (btn.scripts && btn.scripts.length > 0) {
- btn.scripts.forEach(script => {
- if (script.position !== 'front') return
-
- _insert += `
- ${script.sql}
- `
- })
+ if (_prevCustomScript) {
+ _insert += _prevCustomScript
}
if (btn.default !== 'false') {
- _insert = `
+ _insert += `
Insert into ${item.sheet} (${fields},createuserid,createuser,createstaff,bid)
Select ${fields},@userid@,@username,@fullname,@BID@ From @${item.sheet}
`
}
- if (btn.scripts && btn.scripts.length > 0) {
- btn.scripts.forEach(script => {
- if (script.position === 'front') return
-
- _insert += `
- ${script.sql}
- `
- })
+ if (_backCustomScript) {
+ _insert += _backCustomScript
}
_sql = `declare @${item.sheet} table (${declarefields.join(',')},jskey nvarchar(50) )
@@ -715,7 +660,7 @@
Select @ErrorCode='', @retmsg=''
select @UserName=UserName,@FullName=FullName from SUsers where UID=@UserID@
-
+ ${_initCustomScript}
Insert into @${item.sheet} (${fields},jskey)
${_Ltext}
${_uniquesql}
@@ -749,6 +694,30 @@
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
+ }
+
+ let _initCustomScript = '' // 鍒濆鍖栬剼鏈�
+ let _prevCustomScript = '' // 榛樿sql鍓嶆墽琛岃剼鏈�
+ let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
+
+ if (verify.scripts) {
+ verify.scripts.forEach(item => {
+ if (item.status === 'false') return
+
+ if (item.position === 'init') {
+ _initCustomScript += `
+ ${item.sql}
+ `
+ } else if (item.position === 'front') {
+ _prevCustomScript += `
+ ${item.sql}
+ `
+ } else {
+ _backCustomScript += `
+ ${item.sql}
+ `
+ }
+ })
}
// 闇�瑕佸０鏄庣殑鍙橀噺闆�
@@ -872,9 +841,6 @@
if (verify.billcodes) {
verify.billcodes = verify.billcodes.filter(item => item.status !== 'false')
}
- if (verify.scripts) {
- verify.scripts = verify.scripts.filter(item => item.status !== 'false')
- }
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
@@ -887,6 +853,10 @@
// 鍒濆鍖栧嚟璇佸強鐢ㄦ埛淇℃伅瀛楁
_sql += `select @BVoucher='',@FIBVoucherDate='',@FiYear='',@ErrorCode='',@retmsg='',@UserName='${userName}', @FullName='${fullName}'
`
+
+ if (_initCustomScript) {
+ _sql += _initCustomScript
+ }
// 鍚敤璐︽湡楠岃瘉
if (verify.accountdate === 'true') {
@@ -1077,16 +1047,8 @@
let values = []
formdata.forEach(item => {
- if (item.type === 'funcvar') {
- keys.push(item.key.toLowerCase())
- values.push('@' + item.key)
- } else if (item.type === 'number') {
- keys.push(item.key.toLowerCase())
- values.push(item.value)
- } else {
- keys.push(item.key.toLowerCase())
- values.push('\'' + item.value + '\'')
- }
+ keys.push(item.key.toLowerCase())
+ values.push('@' + item.key)
})
if (!keys.includes(primaryKey.toLowerCase())) {
@@ -1129,18 +1091,7 @@
formdata.forEach(item => {
_arr.push(item.key.toLowerCase())
-
- if (item.type === 'funcvar') {
- if (_actionType === 'update') {
- _form.push(item.key + '=@' + item.key)
- } else if (_actionType === 'insertOrUpdate') { // 娣诲姞鎴栦慨鏀规椂锛屽嚱鏁板彉閲忔坊鍔犺〃鍗曟暟鍊�
- _form.push(item.key + '=\'' + item.value + '\'')
- }
- } else if (item.type === 'number') {
- _form.push(item.key + '=' + item.value)
- } else {
- _form.push(item.key + '=\'' + item.value + '\'')
- }
+ _form.push(item.key + '=@' + item.key)
})
if (!_arr.includes('modifydate')) {
@@ -1164,16 +1115,8 @@
_updatesql = `update ${btn.sql} set ${_form} where ${primaryKey}=@${primaryKeyName};`
}
- // 鎷兼帴鑷畾涔夎剼鏈�
- if (verify.scripts && verify.scripts.length > 0) {
- let _scripts = ''
- verify.scripts.forEach(item => {
- if (item.position !== 'front') return
-
- _scripts += `
- ${item.sql}`
- })
- _sql += `${_scripts}`
+ if (_prevCustomScript) {
+ _sql += _prevCustomScript
}
// 娣诲姞銆佷慨鏀广�侀�昏緫鍒犻櫎銆佺墿鐞嗗垹闄�
@@ -1211,16 +1154,8 @@
`
}
- // 鎷兼帴鑷畾涔夎剼鏈�
- if (verify.scripts && verify.scripts.length > 0) {
- let _scripts = ''
- verify.scripts.forEach(item => {
- if (item.position === 'front') return
-
- _scripts += `
- ${item.sql}`
- })
- _sql += `${_scripts}`
+ if (_backCustomScript) {
+ _sql += _backCustomScript
}
_sql += `
diff --git a/src/views/printTemplate/index.jsx b/src/views/printTemplate/index.jsx
index d7d3718..93246c9 100644
--- a/src/views/printTemplate/index.jsx
+++ b/src/views/printTemplate/index.jsx
@@ -365,7 +365,7 @@
notification.warning({
top: 92,
message: '閰嶇疆淇℃伅瑙ｆ瀽閿欒锛�',
- duration: 10
+ duration: 5
})
_config = ''
}
@@ -408,7 +408,7 @@
notification.warning({
top: 92,
message: result.ErrMesg,
- duration: 10
+ duration: 5
})
}
}
@@ -484,7 +484,7 @@
notification.warning({
top: 92,
message: error.ErrMesg,
- duration: 10
+ duration: 5
})
return
}
@@ -695,7 +695,7 @@
notification.warning({
top: 92,
message: '绾稿紶绾垫í姣斾笉鍙秴杩�10!',
- duration: 10
+ duration: 5
})
return
}
@@ -712,7 +712,7 @@
notification.warning({
top: 92,
message: '缂栬瘧閿欒!',
- duration: 10
+ duration: 5
})
return
}
@@ -736,7 +736,7 @@
notification.warning({
top: 92,
message: result.ErrMesg,
- duration: 10
+ duration: 5
})
this.setState({
saveloading: false
@@ -763,7 +763,7 @@
notification.warning({
top: 92,
message: res.ErrMesg,
- duration: 10
+ duration: 5
})
}
this.setState({
--
Gitblit v1.8.0