From d3e3e32f62955e7ac7983bde70924daaacab5dc1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 08 九月 2020 13:33:37 +0800
Subject: [PATCH] 2020-09-08
---
src/menu/datasource/verifycard/utils.jsx | 2
src/mob/datasource/verifycard/index.jsx | 4
src/mob/datasource/verifycard/settingform/index.jsx | 2
src/tabviews/verupmanage/subtabtable/index.jsx | 10 +
src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss | 0
src/templates/calendarconfig/index.jsx | 6
src/templates/comtableconfig/index.jsx | 14 ++
src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.jsx | 0
src/mob/datasource/verifycard/settingform/utils.jsx | 2
src/templates/sharecomponent/settingcalcomponent/index.scss | 0
src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx | 0
src/tabviews/calendar/index.jsx | 11 ++
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 25 ++----
/dev/null | 84 ---------------------
src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.jsx | 0
src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx | 24 ++++-
src/templates/calendarconfig/source.jsx | 2
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx | 15 ++-
src/templates/sharecomponent/settingcalcomponent/index.jsx | 0
src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.scss | 0
src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.scss | 0
src/menu/datasource/verifycard/index.jsx | 4
src/mob/datasource/verifycard/utils.jsx | 2
src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss | 0
24 files changed, 72 insertions(+), 135 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index bd5a046..6587dcd 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -418,7 +418,7 @@
if (testScripts) {
_scripts = testScripts.filter(item => item.status !== 'false')
}
- if (!change && setting.interType === 'inner' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
+ if (!change && setting.interType === 'system' && setting.execute === 'false' && _scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
@@ -428,7 +428,7 @@
return
}
- if ((setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') || _scripts.length > 0) {
+ if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let param = {
func: 's_debug_sql',
LText: SettingUtils.getDebugSql(setting, _scripts, columns, config.search)
diff --git a/src/menu/datasource/verifycard/settingform/utils.jsx b/src/menu/datasource/verifycard/settingform/utils.jsx
deleted file mode 100644
index ebd508d..0000000
--- a/src/menu/datasource/verifycard/settingform/utils.jsx
+++ /dev/null
@@ -1,84 +0,0 @@
-
-export default class SettingUtils {
- /**
- * @description 鐢熸垚椤甸潰鏌ヨ璇彞
- * @return {String} arr_field 鏄剧ず鍒楀瓧娈�
- * @return {String} search 鎼滅储鏉′欢
- * @return {Object} setting 椤甸潰璁剧疆
- * @return {Array} regoptions 鎼滅储鏉′欢姝ｅ垯鏇挎崲
- */
- static getDebugSql (setting, arr_field, regoptions, search) {
- let sql = ''
- let _dataresource = setting.dataresource
- let _customScript = setting.customScript
-
- if (setting.interType === 'inner' && !setting.innerFunc && setting.default === 'false') {
- _dataresource = ''
- }
-
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
-
- // 姝ｅ垯鏇挎崲
- let _regoptions = regoptions.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
- let _search = search
-
- if (setting.queryType === 'statistics' && _dataresource) {
- _regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, item.value)
- })
-
- _search = ''
- }
-
- if (_customScript) {
- _regoptions.push({
- reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
- })
- if (setting.laypage !== 'false') {
- _regoptions.push({
- reg: new RegExp('@pageSize@', 'ig'),
- value: 10
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
- }
- _regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, item.value)
- })
- }
-
- // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- _dataresource = `select ${setting.laypage !== 'false' ? 'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
- }
-
- if (_customScript) {
- sql = `${_customScript}
- ${_dataresource}
- aaa:
- if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
- `
- } else {
- sql = _dataresource
- }
-
- return sql
- }
-}
\ No newline at end of file
diff --git a/src/menu/datasource/verifycard/utils.jsx b/src/menu/datasource/verifycard/utils.jsx
index 8d04983..7521726 100644
--- a/src/menu/datasource/verifycard/utils.jsx
+++ b/src/menu/datasource/verifycard/utils.jsx
@@ -27,7 +27,7 @@
`
}
- if (setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') {
+ if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource
}
diff --git a/src/mob/datasource/verifycard/index.jsx b/src/mob/datasource/verifycard/index.jsx
index 60b8397..7ef4b07 100644
--- a/src/mob/datasource/verifycard/index.jsx
+++ b/src/mob/datasource/verifycard/index.jsx
@@ -413,7 +413,7 @@
if (testScripts) {
_scripts = testScripts.filter(item => item.status !== 'false')
}
- if (!change && setting.interType === 'inner' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
+ if (!change && setting.interType === 'system' && setting.execute === 'false' && _scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
@@ -423,7 +423,7 @@
return
}
- if ((setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') || _scripts.length > 0) {
+ if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let param = {
func: 's_debug_sql',
LText: SettingUtils.getDebugSql(setting, _scripts, columns, searches)
diff --git a/src/mob/datasource/verifycard/settingform/index.jsx b/src/mob/datasource/verifycard/settingform/index.jsx
index f88e485..608ca78 100644
--- a/src/mob/datasource/verifycard/settingform/index.jsx
+++ b/src/mob/datasource/verifycard/settingform/index.jsx
@@ -20,7 +20,7 @@
}
state = {
- interType: this.props.setting.interType || 'inner',
+ interType: this.props.setting.interType || 'system',
structure: this.props.setting.structure || 'array'
}
diff --git a/src/mob/datasource/verifycard/settingform/utils.jsx b/src/mob/datasource/verifycard/settingform/utils.jsx
index ebd508d..a1e29d0 100644
--- a/src/mob/datasource/verifycard/settingform/utils.jsx
+++ b/src/mob/datasource/verifycard/settingform/utils.jsx
@@ -12,7 +12,7 @@
let _dataresource = setting.dataresource
let _customScript = setting.customScript
- if (setting.interType === 'inner' && !setting.innerFunc && setting.default === 'false') {
+ if (setting.interType === 'system' && setting.default === 'false') {
_dataresource = ''
}
diff --git a/src/mob/datasource/verifycard/utils.jsx b/src/mob/datasource/verifycard/utils.jsx
index 483ccf1..8a3cf2e 100644
--- a/src/mob/datasource/verifycard/utils.jsx
+++ b/src/mob/datasource/verifycard/utils.jsx
@@ -27,7 +27,7 @@
`
}
- if (setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') {
+ if (setting.interType === 'system' && setting.execute !== 'false') {
_dataresource = setting.dataresource
}
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 320c737..6d43995 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -162,6 +162,11 @@
config.setting.customScript = _customScript
+ // 鏁版嵁婧�
+ if (config.setting.interType === 'inner' && !config.setting.innerFunc) {
+ config.setting.interType = 'system'
+ }
+
this.setState({
BID: param && param.BID ? param.BID : '',
loadingview: false,
@@ -213,10 +218,10 @@
loading: true
})
- if (setting.interType !== 'inner' || (setting.interType === 'inner' && setting.innerFunc)) {
- param = this.getCustomParam()
- } else {
+ if (setting.interType === 'system') {
param = this.getDefaultParam()
+ } else {
+ param = this.getCustomParam()
}
if (BID) {
diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index d3eb69f..298a321 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -122,6 +122,10 @@
}
})
+ if (config.setting.interType === 'inner' && !config.setting.innerFunc) {
+ config.setting.interType = 'system'
+ }
+
this.setState({
config: config,
setting: config.setting,
@@ -167,10 +171,10 @@
}
}
- if (setting.interType !== 'inner' || (setting.interType === 'inner' && setting.innerFunc)) {
- param = this.getCustomParam(_BID)
- } else {
+ if (setting.interType === 'system') {
param = this.getDefaultParam(_BID)
+ } else {
+ param = this.getCustomParam(_BID)
}
this.handleTableId()
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index 63686e9..4429f0e 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -526,7 +526,7 @@
func: 'sPC_Get_TableData',
obj_name: 'data',
arr_field: arr_field,
- custom_script: setting.customScript || '',
+ custom_script: setting.customScript,
default_sql: setting.default || 'true'
}
@@ -540,20 +540,6 @@
}
let _dataresource = setting.dataresource
-
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- if (this.props.dataManager) { // 鏁版嵁鏉冮檺
- _dataresource = _dataresource.replace(/\$@/ig, '/*')
- _dataresource = _dataresource.replace(/@\$/ig, '*/')
- param.custom_script = param.custom_script.replace(/\$@/ig, '/*')
- param.custom_script = param.custom_script.replace(/@\$/ig, '*/')
- } else {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- param.custom_script = param.custom_script.replace(/@\$|\$@/ig, '')
- }
let regoptions = null
if (setting.queryType === 'statistics' || param.custom_script) {
@@ -611,10 +597,15 @@
insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
`
}
-
- param.custom_script = Utils.formatOptions(param.custom_script)
}
+ // 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
+ if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ param.custom_script && console.log(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
+ LText && console.log(LText)
+ }
+
+ param.custom_script = Utils.formatOptions(param.custom_script)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
diff --git a/src/templates/calendarconfig/index.jsx b/src/templates/calendarconfig/index.jsx
index 436af72..6a0b83f 100644
--- a/src/templates/calendarconfig/index.jsx
+++ b/src/templates/calendarconfig/index.jsx
@@ -24,7 +24,7 @@
const { Panel } = Collapse
const { confirm } = Modal
-const SettingComponent = asyncComponent(() => import('@/templates/sharecomponent/datasourcecomponent'))
+const SettingComponent = asyncComponent(() => import('@/templates/sharecomponent/settingcalcomponent'))
const TabComponent = asyncComponent(() => import('./tabcomponent'))
const CalComponent = asyncComponent(() => import('./calcomponent'))
const TableComponent = asyncComponent(() => import('@/templates/sharecomponent/tablecomponent'))
@@ -309,7 +309,7 @@
type: 'view',
subtype: 'view',
uuid: menu.MenuID,
- intertype: _config.setting.interType || 'inner',
+ intertype: _config.setting.interType || 'system',
interface: _config.setting.interface || '',
tableName: _config.setting.tableName || '',
innerFunc: _config.setting.innerFunc || '',
@@ -682,7 +682,7 @@
calvaild = false
}
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
+ if (((config.setting.interType === 'inner' && !config.setting.innerFunc) || config.setting.interType === 'system') && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (config.columns.length === 0) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁瀛楁锛屼笉鍙惎鐢紒'
diff --git a/src/templates/calendarconfig/source.jsx b/src/templates/calendarconfig/source.jsx
index a166193..f078981 100644
--- a/src/templates/calendarconfig/source.jsx
+++ b/src/templates/calendarconfig/source.jsx
@@ -18,7 +18,7 @@
tableName: '',
primaryKey: '',
dataresource: '',
- interType: 'inner',
+ interType: 'system',
innerFunc: '',
interface: '',
outerFunc: ''
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 94192c4..2793a2e 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -175,6 +175,14 @@
}
})
}
+
+ // // 鍏煎鎺ュ彛绫诲瀷
+ // _config.action = _config.action.map(item => {
+ // if (item.intertype === 'inner' && !item.innerFunc) {
+ // item.intertype = 'system'
+ // }
+ // return item
+ // })
}
let _oriActions = []
@@ -371,7 +379,7 @@
type: 'view',
subtype: 'view',
uuid: menu.MenuID,
- intertype: _config.setting.interType || 'inner',
+ intertype: _config.setting.interType || 'system',
interface: _config.setting.interface || '',
tableName: _config.setting.tableName || '',
innerFunc: _config.setting.innerFunc || '',
@@ -381,7 +389,7 @@
_config.action.forEach(item => {
let tablename = item.OpenType === 'excelIn' ? (item.sheet || '') : (item.sql || '')
- if (item.OpenType === 'excelOut' && item.intertype === 'inner' && !item.innerFunc) {
+ if (item.OpenType === 'excelOut' && item.intertype === 'system') {
tablename = _config.setting.tableName || ''
}
@@ -1157,7 +1165,7 @@
})
- if (config.setting.interType === 'inner' && !config.setting.innerFunc && config.setting.default !== 'false' && !config.setting.dataresource) {
+ if (((config.setting.interType === 'inner' && !config.setting.innerFunc) || config.setting.interType === 'system') && config.setting.default !== 'false' && !config.setting.dataresource) {
return '鑿滃崟灏氭湭璁剧疆鏁版嵁婧愶紝涓嶅彲鍚敤锛�'
} else if (!config.setting.primaryKey) {
return '鑿滃崟灏氭湭璁剧疆涓婚敭锛屼笉鍙惎鐢紒'
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/utils.jsx b/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/utils.jsx
deleted file mode 100644
index ebd508d..0000000
--- a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/utils.jsx
+++ /dev/null
@@ -1,84 +0,0 @@
-
-export default class SettingUtils {
- /**
- * @description 鐢熸垚椤甸潰鏌ヨ璇彞
- * @return {String} arr_field 鏄剧ず鍒楀瓧娈�
- * @return {String} search 鎼滅储鏉′欢
- * @return {Object} setting 椤甸潰璁剧疆
- * @return {Array} regoptions 鎼滅储鏉′欢姝ｅ垯鏇挎崲
- */
- static getDebugSql (setting, arr_field, regoptions, search) {
- let sql = ''
- let _dataresource = setting.dataresource
- let _customScript = setting.customScript
-
- if (setting.interType === 'inner' && !setting.innerFunc && setting.default === 'false') {
- _dataresource = ''
- }
-
- if (_dataresource) {
- _dataresource = _dataresource.replace(/@\$|\$@/ig, '')
- }
- if (_customScript) {
- _customScript = _customScript.replace(/@\$|\$@/ig, '')
- }
-
- // 姝ｅ垯鏇挎崲
- let _regoptions = regoptions.map(item => {
- return {
- reg: new RegExp('@' + item.key + '@', 'ig'),
- value: `'${item.value}'`
- }
- })
- let _search = search
-
- if (setting.queryType === 'statistics' && _dataresource) {
- _regoptions.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, item.value)
- })
-
- _search = ''
- }
-
- if (_customScript) {
- _regoptions.push({
- reg: new RegExp('@orderBy@', 'ig'),
- value: setting.order
- })
- if (setting.laypage !== 'false') {
- _regoptions.push({
- reg: new RegExp('@pageSize@', 'ig'),
- value: 10
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
- }
- _regoptions.forEach(item => {
- _customScript = _customScript.replace(item.reg, item.value)
- })
- }
-
- // 鏁版嵁婧愬鐞�, 瀛樺湪鏄剧ず鍒楁椂
- if (arr_field && _dataresource) {
- if (/\s/.test(_dataresource)) {
- _dataresource = '(' + _dataresource + ') tb'
- }
-
- _dataresource = `select ${setting.laypage !== 'false' ? 'top 10' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${setting.order}) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > 0' : ''} order by tmptable.rows`
- }
-
- if (_customScript) {
- sql = `${_customScript}
- ${_dataresource}
- aaa:
- if @ErrorCode!=''
- insert into tmp_err_retmsg (ID, ErrorCode, retmsg, CreateUserID) select @time_id@,@ErrorCode, @retmsg,@UserID@
- `
- } else {
- sql = _dataresource
- }
-
- return sql
- }
-}
\ No newline at end of file
diff --git a/src/templates/sharecomponent/datasourcecomponent/index.jsx b/src/templates/sharecomponent/settingcalcomponent/index.jsx
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/index.jsx
diff --git a/src/templates/sharecomponent/datasourcecomponent/index.scss b/src/templates/sharecomponent/settingcalcomponent/index.scss
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/index.scss
rename to src/templates/sharecomponent/settingcalcomponent/index.scss
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/columnform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.jsx
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/columnform/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.jsx
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/columnform/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.scss
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/columnform/index.scss
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/columnform/index.scss
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/customscript/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.jsx
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/customscript/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.jsx
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/customscript/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.scss
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/customscript/index.scss
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/customscript/index.scss
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
similarity index 94%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
index 06d871d..69fb0fd 100644
--- a/src/templates/sharecomponent/datasourcecomponent/verifycard/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.jsx
@@ -127,9 +127,14 @@
UNSAFE_componentWillMount() {
const { config } = this.props
+ let _setting = fromJS(config.setting).toJS()
+ if (_setting.interType === 'inner' && !_setting.innerFunc) {
+ _setting.interType = 'system'
+ }
+
this.setState({
+ setting: _setting,
columns: fromJS(config.columns).toJS(),
- setting: fromJS(config.setting).toJS(),
scripts: fromJS(config.scripts).toJS()
})
@@ -414,14 +419,16 @@
sqlverify = (resolve, reject, change = false, testScripts) => {
const { searches } = this.props
- const { columns, setting, scripts } = this.state
-
- let _scripts = scripts.filter(item => item.status !== 'false')
+ const { columns, setting, scripts, activeKey } = this.state
+ let _scripts = []
if (testScripts) {
_scripts = testScripts.filter(item => item.status !== 'false')
+ } else {
+ _scripts = scripts.filter(item => item.status !== 'false')
}
- if (!change && setting.interType === 'inner' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
+
+ if (!change && setting.interType === 'system' && !setting.innerFunc && setting.execute === 'false' && _scripts.length === 0) {
notification.warning({
top: 92,
message: '涓嶆墽琛岄粯璁ql鏃讹紝璇锋坊鍔犺嚜瀹氫箟鑴氭湰锛�',
@@ -431,7 +438,12 @@
return
}
- if ((setting.interType === 'inner' && !setting.innerFunc && setting.execute !== 'false') || _scripts.length > 0) {
+ // 涓嶄娇鐢ㄩ粯璁ql鍒囨崲
+ if (change && activeKey === 'setting' && setting.interType === 'system' && setting.execute === 'false') {
+ resolve()
+ } else if (change && activeKey === 'scripts' && _scripts.length === 0) {
+ resolve()
+ } else if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let param = {
func: 's_debug_sql',
LText: SettingUtils.getDebugSql(setting, _scripts, columns, searches)
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/index.scss
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/index.scss
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
similarity index 94%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
index 705111e..ef1f4cc 100644
--- a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.jsx
@@ -20,7 +20,7 @@
}
state = {
- interType: this.props.setting.interType || 'inner',
+ interType: this.props.setting.interType || 'system',
}
handleConfirm = () => {
@@ -30,7 +30,7 @@
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
// 鏁版嵁婧愬墠绔獙璇�
- if (values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' && !values.dataresource) {
+ if (values.interType === 'system' && values.execute !== 'false' && !values.dataresource) {
notification.warning({
top: 92,
message: '璇峰～鍐欏唴閮ㄥ嚱鏁版垨鏁版嵁婧愶紒',
@@ -38,7 +38,7 @@
})
reject()
return
- } else if (values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' && values.dataresource) {
+ } else if (values.interType === 'system' && values.execute !== 'false' && values.dataresource) {
let _quot = values.dataresource.match(/'{1}/g)
let _lparen = values.dataresource.match(/\({1}/g)
let _rparen = values.dataresource.match(/\){1}/g)
@@ -88,7 +88,7 @@
// 鏁版嵁婧愪繚瀛�
if (
- values.interType === 'inner' && !values.innerFunc && values.execute !== 'false' &&
+ values.interType === 'system' && values.execute !== 'false' &&
/[^\s]+\s+[^\s]+/ig.test(values.dataresource) && setting.dataresource !== values.dataresource
) {
let param = {
@@ -181,6 +181,7 @@
]
})(
<Radio.Group onChange={(e) => {this.onRadioChange(e, 'interType')}}>
+ <Radio value="system">绯荤粺</Radio>
<Radio value="inner">鍐呴儴</Radio>
<Radio value="outer">澶栭儴</Radio>
</Radio.Group>)}
@@ -222,7 +223,7 @@
})(<Input placeholder={''} autoComplete="off" />)}
</Form.Item>
</Col> : null}
- {interType === 'inner' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
+ {interType === 'system' ? <Col span={24} className="data-source" style={{paddingLeft: '7px'}}>
<Form.Item labelCol={{xs: { span: 24 }, sm: { span: 2 }}} wrapperCol={ {xs: { span: 24 }, sm: { span: 22 }} } label={
<Tooltip placement="topLeft" title={'浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\''}>
<Icon type="question-circle" />
@@ -234,7 +235,7 @@
})(<CodeMirror />)}
</Form.Item>
</Col> : null}
- {interType === 'inner' ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label={
<Tooltip placement="topLeft" title={'鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁+@鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��'}>
<Icon type="question-circle" />
@@ -265,7 +266,7 @@
)}
</Form.Item>
</Col> */}
- {interType === 'inner' ? <Col span={8}>
+ {interType === 'system' ? <Col span={8}>
<Form.Item label="榛樿sql">
{getFieldDecorator('execute', {
initialValue: setting.execute || 'true'
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.scss b/src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/settingform/index.scss
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/settingform/index.scss
diff --git a/src/templates/sharecomponent/datasourcecomponent/verifycard/utils.jsx b/src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
similarity index 100%
rename from src/templates/sharecomponent/datasourcecomponent/verifycard/utils.jsx
rename to src/templates/sharecomponent/settingcalcomponent/verifycard/utils.jsx
--
Gitblit v1.8.0