From ae170a9d58b4f91a225eada1dc83ed4a116b8d50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 25 八月 2024 00:57:37 +0800
Subject: [PATCH] 2024-08-25
---
src/menu/debug/index.jsx | 352 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 184 insertions(+), 168 deletions(-)
diff --git a/src/menu/debug/index.jsx b/src/menu/debug/index.jsx
index 3b440ad..ab9eafd 100644
--- a/src/menu/debug/index.jsx
+++ b/src/menu/debug/index.jsx
@@ -90,18 +90,80 @@
if (process) {
regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
}
+
+ let _mainSearch = []
+
+ if (sessionStorage.getItem('appType') === 'mob') {
+ let search = []
+ let ms = null
+ config.components.forEach(item => {
+ if (item.type === 'topbar' && item.wrap.type !== 'navbar' && item.search) {
+ ms = item.search
+ } else if (item.type === 'search' && item.wrap.field) {
+ search.push({
+ type: 'text',
+ label: item.wrap.label,
+ field: item.wrap.field,
+ match: item.wrap.match,
+ required: item.wrap.required,
+ value: item.wrap.initval || ''
+ })
+ }
+ })
+
+ if (ms) {
+ if (ms.setting.type === 'search') {
+ search.push({
+ type: 'text',
+ label: '鎼滅储鏍�',
+ field: ms.setting.field,
+ match: ms.setting.match,
+ required: ms.setting.required,
+ value: ms.setting.initval || ''
+ })
+ }
+ search.push(...ms.fields)
+
+ ms.groups.forEach(group => {
+ if (group.setting.type === 'search') {
+ search.push({
+ type: 'text',
+ label: group.wrap.name,
+ field: group.setting.field,
+ match: group.setting.match,
+ required: group.setting.required,
+ value: group.setting.initval || ''
+ })
+ }
+ search.push(...group.fields)
+ })
+ }
+
+ if (search.length > 0) {
+ _mainSearch = search
+ }
+ } else {
+ config.components.forEach(component => {
+ if (component.type !== 'search') return
+
+ _mainSearch = component.search || []
+ })
+ }
if (config.interfaces && config.interfaces.length > 0) {
config.interfaces.forEach(m => {
if (m.status !== 'true' || m.setting.interType !== 'system') return false
- let sql = this.formatDataSource(m, regs)
+ m.setting.laypage = 'false'
+ m.setting.$top = true
+
+ let sql = this.formatDataSource(m, regs, _mainSearch)
this.sqlList.push({label: m.setting.name, children: [{label: '鏁版嵁婧�', sql: sql}]})
})
}
- this.filterComponent(config.components, [], regs, process)
+ this.filterComponent(config.components, _mainSearch, regs, process)
let sqls = []
let foreachSql = (list, name, tabName = '', supName = '') => {
@@ -226,72 +288,23 @@
filterComponent = (components, mainSearch, regs, process, ispop = false) => {
let appType = sessionStorage.getItem('appType')
- let _mainSearch = mainSearch || []
-
- if (appType === 'mob') {
- let search = []
- let ms = null
- components.forEach(item => {
- if (item.type === 'topbar' && item.wrap.type !== 'navbar' && item.search) {
- ms = item.search
- } else if (item.type === 'search' && item.wrap.field) {
- search.push({
- type: 'text',
- label: item.wrap.label,
- field: item.wrap.field,
- match: item.wrap.match,
- required: item.wrap.required,
- value: item.wrap.initval || ''
- })
- }
- })
-
- if (ms) {
- if (ms.setting.type === 'search') {
- search.push({
- type: 'text',
- label: '鎼滅储鏍�',
- field: ms.setting.field,
- match: ms.setting.match,
- required: ms.setting.required,
- value: ms.setting.initval || ''
- })
- }
- search.push(...ms.fields)
-
- ms.groups.forEach(group => {
- if (group.setting.type === 'search') {
- search.push({
- type: 'text',
- label: group.wrap.name,
- field: group.setting.field,
- match: group.setting.match,
- required: group.setting.required,
- value: group.setting.initval || ''
- })
- }
- search.push(...group.fields)
- })
- }
-
- if (search.length > 0) {
- _mainSearch = search
- }
- } else {
- components.forEach(component => {
- if (component.type !== 'search') return
-
- _mainSearch = component.search || []
- })
- }
components.forEach(item => {
if (item.type === 'tabs') {
item.subtabs.forEach(tab => {
+ let _mainSearch = mainSearch || []
+
+ if (appType !== 'mob') {
+ tab.components.forEach(com => {
+ if (com.type !== 'search') return
+
+ _mainSearch = com.search || []
+ })
+ }
this.filterComponent(tab.components, _mainSearch, regs, process)
})
} else if (item.type === 'group') {
- this.filterComponent(item.components, _mainSearch, regs, process)
+ this.filterComponent(item.components, mainSearch, regs, process)
} else {
let children = []
if (item.wrap && item.setting) {
@@ -309,13 +322,18 @@
}
if (item.setting && item.setting.interType === 'system') {
- let sql = this.formatDataSource(item, regs, _mainSearch)
+ if (item.format === 'object') {
+ item.setting.laypage = 'false'
+ item.setting.$top = true
+ }
+
+ let sql = this.formatDataSource(item, regs, mainSearch)
children.push({label: '鏁版嵁婧�', sql: sql})
} else if (item.setting && item.setting.useMSearch === 'true') {
let searches = item.search || []
- if (_mainSearch.length > 0) {
- searches = [...searches, ..._mainSearch]
+ if (mainSearch.length > 0) {
+ searches = [...searches, ...mainSearch]
}
item.$searches = fromJS(searches).toJS()
}
@@ -559,7 +577,31 @@
if (process) {
regs.push({ reg: /@works_flow_code@/ig, value: `'1949-10-01 15:00:00'` })
}
- this.filterComponent(cell.config.components, [], regs, process, true)
+
+ let _mainSearch = []
+
+ if (sessionStorage.getItem('appType') === 'mob') {
+ cell.config.components.forEach(item => {
+ if (item.type === 'search' && item.wrap.field) {
+ _mainSearch.push({
+ type: 'text',
+ label: item.wrap.label,
+ field: item.wrap.field,
+ match: item.wrap.match,
+ required: item.wrap.required,
+ value: item.wrap.initval || ''
+ })
+ }
+ })
+ } else {
+ cell.config.components.forEach(component => {
+ if (component.type !== 'search') return
+
+ _mainSearch = component.search || []
+ })
+ }
+
+ this.filterComponent(cell.config.components, _mainSearch, regs, process, true)
if (this.sqlPopList.length) {
sql = fromJS(this.sqlPopList).toJS()
@@ -590,7 +632,7 @@
}
})
- if (!_prev) return ''
+ if (!_prev) return _back
let tbs = []
_prev.replace(/\n|\r/g, ' ').split(/\sdeclare\s/ig).forEach(line => {
@@ -656,8 +698,29 @@
let BID = Utils.getuuid()
let verify = btn.verify || {}
let _actionType = null
- let setting = component.setting
+ let setting = component.setting || {}
let columns = component.columns || []
+
+ if (verify.invalid === 'true') {
+ if (component.wrap && (component.wrap.datatype === 'static' || component.wrap.datatype === 'public')) {
+ verify.invalid = 'false'
+ } else if (setting.maxScript && setting.maxScript >= 300) {
+ verify.invalid = 'false'
+ } else if (!setting.dataresource) {
+ verify.invalid = 'false'
+ } else if (btn.intertype !== 'system' && btn.procMode !== 'system') {
+ verify.invalid = 'false'
+ } else if (btn.sqlType === 'insert') {
+ verify.invalid = 'false'
+ } else if (btn.Ot === 'notRequired') {
+ verify.invalid = 'false'
+ }
+ }
+ if (verify.uniques && verify.uniques.length > 0 && btn.Ot === 'requiredOnce') {
+ if (component.wrap && (component.wrap.datatype === 'static' || component.wrap.datatype === 'public')) {
+ verify.uniques = []
+ }
+ }
if (verify.default !== 'false') { // 鍒ゆ柇鏄惁浣跨敤榛樿sql
_actionType = btn.sqlType
@@ -820,8 +883,8 @@
})
// 娣诲姞鏁版嵁涓瓧娈碉紝琛ㄥ崟鍊间紭鍏�(鎸夐挳涓嶉�夎鎴栧琛屾嫾鎺ユ椂璺宠繃)
- if (btn.Ot !== 'notRequired' && columns && columns.length > 0) {
- const setField = (col) => {
+ if (btn.Ot !== 'notRequired' && columns.length > 0) {
+ columns.forEach(col => {
if (!col.field) return
let _key = col.field.toLowerCase()
@@ -839,35 +902,7 @@
if (!_vars.includes(_key)) {
_vars.push(_key)
-
- if (col.datatype) {
- _declarefields.push(`@${_key} ${col.datatype}`)
- } else {
- if (col.fieldlength && col.fieldlength > 4000) {
- col.fieldlength = 'max'
- }
-
- let _type = `nvarchar(${col.fieldlength || 50})`
-
- if (col.type === 'number') {
- let _length = col.decimal ? col.decimal : 0
- _type = `decimal(18,${_length})`
- } else if (col.type === 'picture' || col.type === 'textarea') {
- _type = `nvarchar(${col.fieldlength || 512})`
- }
-
- _declarefields.push(`@${_key} ${_type}`)
- }
- }
- }
-
- columns.forEach(col => {
- if (col.type === 'colspan' || col.type === 'old_colspan') {
- col.subcols.forEach(cell => {
- setField(cell)
- })
- } else {
- setField(col)
+ _declarefields.push(`@${_key} ${col.datatype || 'nvarchar(50)'}`)
}
})
}
@@ -955,37 +990,31 @@
}
// 澶辨晥楠岃瘉锛屾坊鍔犳暟鎹椂涓嶇敤
- if (btn.sqlType !== 'insert' && btn.Ot !== 'notRequired' && verify.invalid === 'true' && setting.dataresource) {
+ if (verify.invalid === 'true') {
let datasource = setting.dataresource
let customScript = setting.customScript || ''
- let orderBy = setting.order
+
+ let regoptions = [{
+ reg: new RegExp('@userName@', 'ig'),
+ value: `'${userName}'`
+ }, {
+ reg: new RegExp('@fullName@', 'ig'),
+ value: `'${fullName}'`
+ }, {
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: setting.order || primaryKey
+ }, {
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: 1
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: 1
+ }]
- if (setting.queryType === 'statistics' || customScript) {
- let searches = formatSearch(component.$searches || [])
- let regoptions = getSearchRegs(searches)
-
- regoptions.push({
- reg: new RegExp('@userName@', 'ig'),
- value: `'${userName}'`
- }, {
- reg: new RegExp('@fullName@', 'ig'),
- value: `'${fullName}'`
- }, {
- reg: new RegExp('@orderBy@', 'ig'),
- value: orderBy
- }, {
- reg: new RegExp('@pageSize@', 'ig'),
- value: 999999
- }, {
- reg: new RegExp('@pageIndex@', 'ig'),
- value: 1
- })
-
- regoptions.forEach(item => {
- datasource = datasource.replace(item.reg, item.value)
- customScript = customScript.replace(item.reg, item.value)
- })
- }
+ regoptions.forEach(item => {
+ datasource = datasource.replace(item.reg, item.value)
+ customScript = customScript.replace(item.reg, item.value)
+ })
if (customScript) {
_sql += `
@@ -1060,7 +1089,6 @@
if (!keys.includes(_key)) return // 琛ㄥ崟涓笉鍚崟鍙风敓鎴愬瓧娈�
- let _ModularDetailCode = ''
let _lpline = ''
if (item.TypeCharOne === 'Lp') {
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
@@ -1068,33 +1096,22 @@
} else {
_lpline = `set @ModularDetailCode= 'Lp'+ right('${item.mark || btn.uuid}'+@${_linkKey},48)`
}
- _ModularDetailCode = '@ModularDetailCode'
} else if (item.TypeCharOne === 'BN') {
- let _val = ''
if (_linkKey === 'bid' && BID) { // 鏇挎崲bid
- _val = BID
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@BID@,48)`
} else {
- _val = 0
+ _lpline = `set @ModularDetailCode= 'BN'+ right(@${_linkKey},48)`
}
- _ModularDetailCode = `'${item.TypeCharOne + _val}'`
} else {
- _ModularDetailCode = `'${item.ModularDetailCode}'`
- }
-
- let _declare = ''
-
- if (!_vars.includes(_key)) {
- _declare = `Declare @${_key} nvarchar(50)`
- _vars.push(_key)
+ _lpline = `set @ModularDetailCode= right('${item.ModularDetailCode}',50)`
}
_billcodesSql += `
/* 鍗曞彿鐢熸垚 */
- ${_declare}
select @BillCode='', @${_key}='', @ModularDetailCode=''
${_lpline}
exec s_get_BillCode
- @ModularDetailCode=${_ModularDetailCode},
+ @ModularDetailCode=@ModularDetailCode,
@Type=${item.Type},
@TypeCharOne='${item.TypeCharOne}',
@TypeCharTwo ='${item.TypeCharTwo}',
@@ -1133,11 +1150,6 @@
_value.push(`${_labels[index] || ''}锛�${_val || ''}`)
})
- let _verifyType = ''
- if (item.verifyType === 'logic') {
- _verifyType = ' and deleted=0'
- }
-
if (!arr.includes(primaryKey.toLowerCase())) {
_fieldValue.push(`${primaryKey} !='${primaryId}'`)
}
@@ -1145,7 +1157,7 @@
_sql += `
/* 鍞竴鎬ч獙璇� */
select @tbid='', @ErrorCode='',@retmsg=''
- select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${_verifyType}
+ select @tbid='X' from ${btn.sql} where ${_fieldValue.join(' and ')}${item.verifyType === 'logic' ? ' and deleted=0' : ''}
If @tbid!=''
Begin
select @ErrorCode='${item.errorCode}',@retmsg='${_value.join(', ')} 宸插瓨鍦�'
@@ -1352,7 +1364,7 @@
if (columns && columns.length > 0 && btn.Ot !== 'notRequired') {
let _index = 0
columns.forEach(col => {
- if (!col.field || col.Hide === 'true' || _index >= 4) return
+ if (!col.field || col.Hide === 'true' || _index >= 4 || col.field === primaryKey) return
_msg += col.label + '=0,'
_index++
})
@@ -1437,13 +1449,7 @@
if (_backCustomScript) {
_sql += _backCustomScript
}
-
- _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
- _sql = _sql.replace(/@check_type@/ig, `'瀹℃牳'`)
- _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
- _sql = _sql.replace(/@check_userids@/ig, `''`)
- _sql = _sql.replace(/@notice_userids@/ig, `''`)
- _sql = _sql.replace(/@works_flow_sign@/ig, `''`)
+
_sql = _sql.replace(/@works_flow_code@/ig, `'mk'`)
_sql = _sql.replace(/@works_flow_name@/ig, `'mk'`)
_sql = _sql.replace(/@works_flow_param@/ig, `''`)
@@ -1452,6 +1458,18 @@
_sql = _sql.replace(/@statusname@/ig, `'${statusName}'`)
_sql = _sql.replace(/@work_group@/ig, `'mk'`)
_sql = _sql.replace(/@work_grade@/ig, `'0'`)
+
+ if (verify.flowType === 'start') {
+ _sql = _sql.replace(/@start_type@/ig, `'寮�濮�'`)
+ } else {
+ _sql = _sql.replace(/@check_type@/ig, `'瀹℃牳'`)
+ _sql = _sql.replace(/@notice_type@/ig, `'鎶勯��'`)
+
+ _sql = _sql.replace(/@check_userids@/ig, `''`)
+ _sql = _sql.replace(/@notice_userids@/ig, `''`)
+
+ _sql = _sql.replace(/@works_flow_sign@/ig, `''`)
+ }
} else if (_backCustomScript) {
_sql += _backCustomScript
}
@@ -2055,7 +2073,7 @@
formatDataSource = (item, regs, mainSearch = []) => {
if (!item.setting || item.setting.interType !== 'system') return false
-
+
let searches = item.search || []
if (item.setting.useMSearch === 'true' && mainSearch.length > 0) {
searches = [...searches, ...mainSearch]
@@ -2120,8 +2138,14 @@
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
} else if (item.setting.laypage === 'true' && item.setting.order) {
_dataresource = `/*system_query*/select top 10 ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable where rows > 0 order by tmptable.rows `
+ } else if (item.setting.$top) {
+ if (item.setting.order) {
+ _dataresource = `/*system_query*/select top 1 ${arr_field} from ${_dataresource} ${_search} order by ${item.setting.order} `
+ } else {
+ _dataresource = `/*system_query*/select top 1 ${arr_field} from ${_dataresource} ${_search} `
+ }
} else if (item.setting.order) {
- _dataresource = `/*system_query*/select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${item.setting.order}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows `
+ _dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} order by ${item.setting.order} `
} else {
_dataresource = `/*system_query*/select ${arr_field} from ${_dataresource} ${_search} `
}
@@ -2166,10 +2190,10 @@
)
if (item.hasExtend) {
- regoptions.push({reg: /@mk_time@/ig, value: '2024-04-29 17:20:00'})
+ regoptions.push({reg: /@mk_time@/ig, value: `'2024-04-29 17:20:00'`})
}
if (item.type === 'calendar') {
- regoptions.push({ reg: /@mk_year@/ig, value: '2024' })
+ regoptions.push({ reg: /@mk_year@/ig, value: `'2024'` })
}
if (window.GLOB.getLocation) {
regoptions.push(
@@ -2255,14 +2279,6 @@
destroyOnClose
>
<div className="mk-sql-wrap">
- {/* <div className="header">
- <div className="sql-item">
- <div className="sql-1">缁勪欢</div>
- <div className="sql-2">妫�楠岄」</div>
- <div className="sql-3">鍏朵粬</div>
- <div className="sql-4">鐘舵��</div>
- </div>
- </div> */}
<div className="body">
{sqlList.map(item => {
let other = ''
--
Gitblit v1.8.0