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/tabviews/subtable/index.jsx | 44 ++++-
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 24 ++
src/tabviews/subtabtable/index.jsx | 44 ++++-
src/tabviews/zshare/dategroup/index.jsx | 72 +++++++-
src/tabviews/zshare/topSearch/index.jsx | 39 ++++
src/templates/zshare/formconfig.jsx | 2
src/tabviews/commontable/index.jsx | 44 ++++-
src/tabviews/managetable/index.jsx | 46 ++++
src/tabviews/zshare/dategroup/index.scss | 27 ++
src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx | 64 +++++++
src/utils/utils.js | 16 +-
src/templates/sharecomponent/searchcomponent/searchform/index.jsx | 4
12 files changed, 353 insertions(+), 73 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index a8ef6bd..08490e9 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -567,12 +567,15 @@
async loadmaindata () {
const { setting, BIDs, search } = this.state
let param = ''
- let requireFields = search.filter(item => item.required && !item.value)
+ let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
if (requireFields.length > 0) {
+ let labels = requireFields.map(item => item.label)
+ labels = Array.from(new Set(labels))
+
notification.warning({
top: 92,
- message: this.state.dict['form.required.input'] + requireFields.map(item => item.label).join('銆�') + ' !',
+ message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
duration: 3
})
return
@@ -690,20 +693,22 @@
_dataresource = '(' + _dataresource + ') tb'
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ let regoptions = null
+ if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
- let options = allSearch.map(item => {
+ regoptions = allSearch.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: item.value
+ value: `'${item.value}'`
}
})
+ }
- options.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
})
-
_search = ''
}
@@ -715,7 +720,28 @@
DateCount = ''
}
- param.custom_script = Utils.formatOptions(param.custom_script)
+ if (param.custom_script) {
+ regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: _orderBy
+ })
+ if (setting.laypage !== 'false') {
+ regoptions.push({
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: pageSize
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: pageIndex
+ })
+ }
+
+ regoptions.forEach(item => {
+ param.custom_script = param.custom_script.replace(item.reg, item.value)
+ })
+
+ 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/tabviews/managetable/index.jsx b/src/tabviews/managetable/index.jsx
index 9016520..a36a849 100644
--- a/src/tabviews/managetable/index.jsx
+++ b/src/tabviews/managetable/index.jsx
@@ -410,7 +410,9 @@
let param = {
func: 'sPC_Get_TableData',
obj_name: 'data',
- arr_field: arr_field
+ arr_field: arr_field,
+ custom_script: setting.customScript || '',
+ default_sql: setting.default || 'true'
}
let _orderBy = orderBy || setting.order
@@ -420,25 +422,55 @@
_dataresource = '(' + _dataresource + ') tb'
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ let regoptions = null
+ if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
- let options = allSearch.map(item => {
+
+ regoptions = allSearch.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: item.value
+ value: `'${item.value}'`
}
})
+ }
- options.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
})
-
_search = ''
}
let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${_orderBy}) as rows from ${_dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
let DateCount = `select count(1) as total from ${_dataresource} ${_search}`
+ if (setting.laypage === 'false') {
+ LText = `select ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${_orderBy}) as rows from ${_dataresource} ${_search}) tmptable order by tmptable.rows`
+ DateCount = ''
+ }
+
+ if (param.custom_script) {
+ regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: _orderBy
+ })
+ if (setting.laypage !== 'false') {
+ regoptions.push({
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: pageSize
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: pageIndex
+ })
+ }
+
+ regoptions.forEach(item => {
+ param.custom_script = param.custom_script.replace(item.reg, item.value)
+ })
+
+ 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/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index d8d8dad..d19ff41 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -451,12 +451,15 @@
let param = ''
let _BID = this.props.BID
- let requireFields = search.filter(item => item.required && !item.value)
+ let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
if (requireFields.length > 0) {
+ let labels = requireFields.map(item => item.label)
+ labels = Array.from(new Set(labels))
+
notification.warning({
top: 92,
- message: this.state.dict['form.required.input'] + requireFields.map(item => item.label).join('銆�') + ' !',
+ message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
duration: 3
})
return
@@ -593,20 +596,22 @@
_dataresource = '(' + _dataresource + ') tb'
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ let regoptions = null
+ if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
- let options = allSearch.map(item => {
+ regoptions = allSearch.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: item.value
+ value: `'${item.value}'`
}
})
+ }
- options.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
})
-
_search = ''
}
@@ -618,7 +623,28 @@
DateCount = ''
}
- param.custom_script = Utils.formatOptions(param.custom_script)
+ if (param.custom_script) {
+ regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: _orderBy
+ })
+ if (setting.laypage !== 'false') {
+ regoptions.push({
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: pageSize
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: pageIndex
+ })
+ }
+
+ regoptions.forEach(item => {
+ param.custom_script = param.custom_script.replace(item.reg, item.value)
+ })
+
+ 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/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index d426bec..0ad2d51 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -358,12 +358,15 @@
const { setting, search } = this.state
let param = ''
- let requireFields = search.filter(item => item.required && !item.value)
+ let requireFields = search.filter(item => item.required && (!item.value || item.value.length === 0))
if (requireFields.length > 0) {
+ let labels = requireFields.map(item => item.label)
+ labels = Array.from(new Set(labels))
+
notification.warning({
top: 92,
- message: this.state.dict['form.required.input'] + requireFields.map(item => item.label).join('銆�') + ' !',
+ message: this.state.dict['form.required.input'] + labels.join('銆�') + ' !',
duration: 3
})
return
@@ -469,20 +472,22 @@
_dataresource = '(' + _dataresource + ') tb'
}
- if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ let regoptions = null
+ if (setting.queryType === 'statistics' || param.custom_script) {
let allSearch = Utils.getAllSearchOptions(search)
- let options = allSearch.map(item => {
+ regoptions = allSearch.map(item => {
return {
reg: new RegExp('@' + item.key + '@', 'ig'),
- value: item.value
+ value: `'${item.value}'`
}
})
+ }
- options.forEach(item => {
- _dataresource = _dataresource.replace(item.reg, `'${item.value}'`)
+ if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
+ regoptions.forEach(item => {
+ _dataresource = _dataresource.replace(item.reg, item.value)
})
-
_search = ''
}
@@ -494,7 +499,28 @@
DateCount = ''
}
- param.custom_script = Utils.formatOptions(param.custom_script)
+ if (param.custom_script) {
+ regoptions.push({
+ reg: new RegExp('@orderBy@', 'ig'),
+ value: _orderBy
+ })
+ if (setting.laypage !== 'false') {
+ regoptions.push({
+ reg: new RegExp('@pageSize@', 'ig'),
+ value: pageSize
+ }, {
+ reg: new RegExp('@pageIndex@', 'ig'),
+ value: pageIndex
+ })
+ }
+
+ regoptions.forEach(item => {
+ param.custom_script = param.custom_script.replace(item.reg, item.value)
+ })
+
+ 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/tabviews/zshare/dategroup/index.jsx b/src/tabviews/zshare/dategroup/index.jsx
index df8a89a..81ef53d 100644
--- a/src/tabviews/zshare/dategroup/index.jsx
+++ b/src/tabviews/zshare/dategroup/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { DatePicker, Tooltip } from 'antd'
+import { DatePicker, Tooltip, Icon } from 'antd'
import moment from 'moment'
import Utils from '@/utils/utils.js'
@@ -12,14 +12,17 @@
class DateGroup extends Component {
static propTpyes = {
- card: PropTypes.object // 瀛楀吀椤�
+ card: PropTypes.object, // 鎼滅储鏉′欢
+ onGroupChange: PropTypes.func // 鎼滅储鍐呭鍒囨崲
}
state = {
active: '',
quarterId: Utils.getuuid(),
yearId: Utils.getuuid(),
- dateRange: ''
+ dateRange: '',
+ initDateRange: '',
+ initType: ''
}
UNSAFE_componentWillMount() {
@@ -77,13 +80,11 @@
}
this.setState({
active: card.initval[0],
- dateRange: _dateRange
+ dateRange: _dateRange,
+ initDateRange: _dateRange,
+ initType: card.initval[0]
})
}
- }
-
- changeTab = () => {
-
}
onChange = (date, type) => {
@@ -107,7 +108,55 @@
this.setState({
active: type,
dateRange: values
+ }, () => {
+ this.props.onGroupChange()
})
+ }
+
+ clearTime = () => {
+ this.setState({
+ active: '',
+ dateRange: ''
+ }, () => {
+ this.props.onGroupChange()
+ })
+ }
+
+ reset = () => {
+ const { initDateRange, initType } = this.state
+
+ this.setState({
+ active: initType,
+ dateRange: initDateRange
+ })
+ }
+
+ getSearchItems = () => {
+ const { card } = this.props
+ const { dateRange, active } = this.state
+ let items = []
+
+ items.push({
+ type: 'daterange',
+ key: card.datefield,
+ value: dateRange,
+ label: card.label,
+ match: 'between',
+ required: card.required === 'true'
+ })
+
+ if (card.transfer === 'true') {
+ items.push({
+ type: card.type,
+ key: card.field,
+ value: active,
+ label: card.label,
+ match: '=',
+ required: card.required === 'true'
+ })
+ }
+
+ return items
}
render() {
@@ -164,7 +213,12 @@
</span>)
}
})}
- <div className="table-search-date-group-value">{dateRange ? dateRange.join(' ~ ') : ''}</div>
+
+ {dateRange ? <div className="table-search-date-group-value">
+ {dateRange.join(' ~ ')}
+ <Icon type="close-circle" onClick={this.clearTime} className="ant-calendar-picker-clear" />
+ </div> : null}
+ {!dateRange && card.required === 'true' ? <div className="ant-form-explain">璇烽�夋嫨{card.label}!</div> : null}
</div>
)
}
diff --git a/src/tabviews/zshare/dategroup/index.scss b/src/tabviews/zshare/dategroup/index.scss
index ada3e16..e8c84bc 100644
--- a/src/tabviews/zshare/dategroup/index.scss
+++ b/src/tabviews/zshare/dategroup/index.scss
@@ -44,6 +44,9 @@
margin-right: 2px;
padding: 2px 7px;
}
+ .ant-tag-checkable:active {
+ background-color: #ffffff;
+ }
.ant-tag-checkable-checked {
border-color: #1890ff;
}
@@ -52,13 +55,27 @@
line-height: 20px;
font-size: 12px;
bottom: -15px;
+ color: rgba(0, 0, 0, 0.45);
+ padding-right: 25px;
+
+ .ant-calendar-picker-clear {
+ cursor: pointer;
+ right: 5px;
+ pointer-events: unset;
+ }
+ }
+ .table-search-date-group-value:hover {
+ .ant-calendar-picker-clear {
+ opacity: 0.8;
+ }
+ }
+ .ant-form-explain {
+ color: #f5222d;
+ position: absolute;
+ bottom: -18px;
}
}
-// .group-week-picker {
-// .ant-calendar {
-// margin-top: -15px;
-// }
-// }
+
@media screen and (min-width: 1600px) {
.table-search-date-group {
.ant-tag-checkable {
diff --git a/src/tabviews/zshare/topSearch/index.jsx b/src/tabviews/zshare/topSearch/index.jsx
index 2844062..5281aba 100644
--- a/src/tabviews/zshare/topSearch/index.jsx
+++ b/src/tabviews/zshare/topSearch/index.jsx
@@ -21,6 +21,7 @@
label: null, // 鎻愮ず鏂囧瓧
required: null, // 鏄惁蹇呭～
searchlist: null, // 鎼滅储椤�
+ groups: null, // 缁勫悎鎼滅储椤�
formId: Utils.getuuid() // 鎼滅储琛ㄥ崟Id
}
@@ -51,6 +52,7 @@
_list.push(item)
})
+ let _groups = []
_list = _list.map(item => {
if (item.type === 'link') {
let supItem = _list.filter(form => form.field === item.linkField)[0]
@@ -64,6 +66,8 @@
} else {
item.options = item.oriOptions.filter(option => option.parentId === supItem.initval)
}
+ } else if (item.type === 'group') {
+ _groups.push(JSON.parse(JSON.stringify(item)))
}
return item
@@ -74,7 +78,8 @@
label: label,
style: style,
required: required,
- searchlist: _list
+ searchlist: _list,
+ groups: _groups
})
}
@@ -240,6 +245,7 @@
<Select
showSearch
mode="multiple"
+ onChange={this.searchChange}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
getPopupContainer={() => document.getElementById(this.state.formId)}
>
@@ -343,8 +349,8 @@
} else if (item.type === 'group') {
fields.push(
<Col span={item.ratio || 6} key={index}>
- <Form.Item label={item.label} className={item.required ? 'group-required' : ''}>
- <DateGroup card={item} />
+ <Form.Item label={item.label} className={item.required === 'true' ? 'group-required' : ''}>
+ <DateGroup ref={item.uuid} card={item} onGroupChange={this.searchChange} />
</Form.Item>
</Col>
)
@@ -385,16 +391,29 @@
})
}
+ /**
+ * @description 鎼滅储鏉′欢閲嶇疆
+ */
handleReset = () => {
- // 閲嶇疆
+ const { groups } = this.state
+
+ if (groups.length > 0) {
+ groups.forEach(item => {
+ this.refs[item.uuid].reset()
+ })
+ }
this.props.form.resetFields()
this.props.form.validateFields((err, values) => {
- let searches = this.getFieldsValues(values)
- this.props.refreshdata(searches)
+ // 寮傛鑾峰彇鏇存柊鍚庣殑鏃堕棿缁�
+ this.setState({}, () => {
+ let searches = this.getFieldsValues(values)
+ this.props.refreshdata(searches)
+ })
})
}
getFieldsValues = (values) => {
+ const { groups } = this.state
// 鑾峰彇鎼滅储鏉′欢鍊�
let search = []
Object.keys(values).forEach(key => {
@@ -432,6 +451,14 @@
required: this.state.required[key]
})
})
+
+ if (groups.length > 0) {
+ groups.forEach(item => {
+ let items = this.refs[item.uuid].getSearchItems()
+ search.push(...items)
+ })
+ }
+
return search
}
diff --git a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
index f6c62a0..cc8999e 100644
--- a/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
+++ b/src/templates/sharecomponent/searchcomponent/searchform/index.jsx
@@ -324,7 +324,9 @@
return form
})
})
- if (this.props.form.getFieldValue('initval') !== undefined) {
+
+ let _initval = this.props.form.getFieldValue('initval')
+ if (_initval && !values.includes(_initval[0])) {
this.props.form.setFieldsValue({initval: ''})
}
}
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
index b606b5a..7d5847d 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/customscript/index.jsx
@@ -12,7 +12,8 @@
class CustomForm extends Component {
static propTpyes = {
dict: PropTypes.object, // 瀛楀吀椤�
- tableName: PropTypes.string, // 琛ㄥ悕
+ setting: PropTypes.object, // 璁剧疆
+ searches: PropTypes.array, // 鎼滅储鏉′欢
systemScripts: PropTypes.array, // 绯荤粺鑴氭湰
customScripts: PropTypes.array, // 鑷畾涔夎剼鏈�
scriptsChange: PropTypes.func // 琛ㄥ崟
@@ -20,7 +21,27 @@
state = {
editItem: null,
- loading: false
+ loading: false,
+ usefulFields: ''
+ }
+
+ UNSAFE_componentWillMount() {
+ const { searches } = this.props
+ let _usefulFields = searches.map(item => {
+ if (item.type === 'group') {
+ if (item.transfer === 'true') {
+ return item.field + ', ' + item.datefield
+ } else {
+ return item.datefield
+ }
+ } else {
+ return item.field
+ }
+ })
+
+ this.setState({
+ usefulFields: _usefulFields.join(', ')
+ })
}
edit = (record) => {
@@ -35,6 +56,8 @@
}
handleConfirm = () => {
+ const { searches, setting } = this.props
+
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
@@ -101,6 +124,34 @@
LText: _initsql + values.sql + tail
}
+ let allSearch = Utils.initMainSearch(searches)
+ allSearch = Utils.getAllSearchOptions(allSearch)
+
+ let regoptions = allSearch.map(item => {
+ return {
+ reg: new RegExp('@' + item.key + '@', 'ig'),
+ value: `'${item.value}'`
+ }
+ })
+
+ 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 => {
+ param.LText = param.LText.replace(item.reg, item.value)
+ })
+
param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -149,8 +200,9 @@
}
render() {
- const { systemScripts, tableName } = this.props
+ const { systemScripts, setting } = this.props
const { getFieldDecorator } = this.props.form
+ const { usefulFields } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -165,9 +217,9 @@
return (
<Form {...formItemLayout} className="modal-menu-setting-script">
<Row gutter={24}>
- {tableName ? <Col span={8}>
+ {setting.tableName ? <Col span={8}>
<Form.Item label={'琛ㄥ悕'} style={{whiteSpace: 'nowrap', margin: 0}}>
- {tableName}
+ {setting.tableName}
</Form.Item>
</Col> : null}
<Col span={16}>
@@ -177,7 +229,7 @@
</Col>
<Col span={24} className="sqlfield">
<Form.Item label={'鍙敤瀛楁'}>
- id, bid, loginuid, sessionuid, userid, appkey
+ id, bid, loginuid, sessionuid, userid, appkey{usefulFields ? ', ' + usefulFields : ''}
</Form.Item>
</Col>
<Col span={8} style={{whiteSpace: 'nowrap'}}>
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}
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 5150a76..da77965 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -620,7 +620,7 @@
key: 'transfer',
label: '浼犻��',
initVal: card.transfer || 'false',
- tooltip: '鏁版嵁鏌ヨ鏃讹紝绫诲瀷瀛楁鏄惁浣滀负鍙傛暟浼犻�掋��',
+ tooltip: '鏁版嵁鏌ヨ鏃讹紝绫诲瀷瀛楁鏄惁浣滀负鍙傛暟浼犻�掞紝绫诲瀷瀛楁瀵瑰簲鍊间负 {"鏃�": "day", "鍛�": "week", "鏈�": "month", "瀛�": "quarter", "骞�": "year", "鑷畾涔�": "customized"}銆�',
options: [{
value: 'true',
text: Formdict['header.form.true']
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 18a6ed2..0e1c3a1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -312,14 +312,14 @@
}
if (newsearches[item.key]) {
- newsearches[item.key + '1'] = _val ? _val + timetail : null
+ newsearches[item.key + '1'] = _val ? _val + timetail : ''
} else {
- newsearches[item.key] = _val ? _val + timetail : null
+ newsearches[item.key] = _val ? _val + timetail : ''
}
} else if (item.type === 'datemonth') {
// 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
- let _startval = null
- let _endval = null
+ let _startval = ''
+ let _endval = ''
if (item.value) {
_startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
@@ -334,16 +334,16 @@
_endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
}
- newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
} else if (item.type === 'daterange') {
let _endval = ''
if (item.value) {
_endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
}
- newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : ''
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : ''
} else if (item.type === 'text') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
newsearches[field] = item.value
--
Gitblit v1.8.0