From aaaf56d7ca060f7c681d6b8a67aac46aa89a4dbc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 09 五月 2020 14:50:39 +0800
Subject: [PATCH] 2020-05-09
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index 2c73e0c..7f75bcc 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -408,7 +408,23 @@
value: search.initval,
required: search.required === 'true'
}
- if (item.type === 'date') {
+ if (item.type === 'group') {
+ let copy = fromJS(item).toJS()
+ copy.key = search.datefield
+
+ item.value = search.initval && search.initval[0] ? search.initval[0] : '@$@'
+ item.match = '='
+
+ copy.type = 'daterange'
+ copy.match = 'between'
+ copy.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+
+ if (search.transfer === 'true') {
+ newsearches.push(item)
+ }
+ newsearches.push(copy)
+ return
+ } else if (item.type === 'date') {
item.value = moment().format('YYYY-MM-DD')
} else if (item.type === 'datemonth') {
item.value = moment().format('YYYY-MM')
@@ -483,7 +499,7 @@
_search = ''
}
- let LText = `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`
+ let LText = `select ${setting.laypage !== 'false' ? 'top @pageSize@' : ''} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by @orderBy@) as rows from ${_dataresource} ${_search}) tmptable ${setting.laypage !== 'false' ? 'where rows > (@pageSize@ * (@pageIndex@ - 1))' : ''} order by tmptable.rows`
let _scripts = fromJS(this.state.systemScripts).toJS()
_scripts[0].value = LText
@@ -803,6 +819,7 @@
}
render() {
+ const { config } = this.props
const { formlist, view, setting, scriptsColumns, systemScripts } = this.state
const formItemLayout = {
labelCol: {
@@ -820,8 +837,9 @@
{view ==='custom' ? <div>
<CustomScript
dict={this.props.dict}
- tableName={setting.tableName}
+ setting={setting}
customScripts={setting.scripts}
+ searches={config.search}
systemScripts={systemScripts}
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
--
Gitblit v1.8.0