From 9a1416e0b5cdb40f49b3c2061b04b35551d77e99 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 19 九月 2023 18:14:21 +0800
Subject: [PATCH] 2023-09-19
---
src/templates/sharecomponent/settingcomponent/settingform/index.jsx | 157 ++++------------------------------------------------
1 files changed, 12 insertions(+), 145 deletions(-)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
index c796d48..3c65cb8 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/index.jsx
@@ -3,10 +3,10 @@
import { fromJS } from 'immutable'
import { Form, notification, Modal, Spin, Tabs, Typography, Popconfirm, Button } from 'antd'
import { CheckCircleOutlined, StopOutlined, SwapOutlined, DeleteOutlined, BorderOutlined } from '@ant-design/icons'
-import moment from 'moment'
import Api from '@/api'
import Utils from '@/utils/utils.js'
+import { formatSearch, joinMainSearchkey } from '@/utils/utils-custom.js'
import SettingUtils from './utils.jsx'
import asyncComponent from '@/utils/asyncComponent'
import DataSource from './datasource'
@@ -30,9 +30,8 @@
formlist: [],
btnloading: false,
activeKey: 'setting',
- search: '',
+ searches: [],
arr_field: '',
- regoptions: [],
setting: null,
defaultSql: '',
visible: false,
@@ -78,25 +77,7 @@
})
}
- // 鎼滅储鐨剋here鏉′欢
- let _search = this.formatSearch(search)
- _search = Utils.joinMainSearchkey(_search)
-
- _search = _search.replace(/@\$@/ig, '')
- _search = _search ? 'where ' + _search : ''
-
let status = fromJS(_setting).toJS()
- let regoptions = this.getRegOptions(search)
-
- if (config.urlFields && config.urlFields.length > 0) {
- config.urlFields.forEach(field => {
- regoptions.push({
- key: field,
- value: '0',
- type: 'url'
- })
- })
- }
if (window.GLOB.funcs && window.GLOB.funcs.length > 0) {
window.GLOB.funcs.forEach(m => {
@@ -112,9 +93,8 @@
this.setState({
setting: _setting,
- search: _search,
+ searches: formatSearch(search),
arr_field: arr_field.join(','),
- regoptions: regoptions, // 鎼滅储鏉′欢锛屾鍒欐浛鎹�
columns: columns,
scripts: _scripts,
status
@@ -123,123 +103,6 @@
componentDidMount () {
this.props.updRecord(this.state.status)
- }
-
- getRegOptions = (searches) => {
- if (!searches || searches.length === 0) return []
-
- let options = []
- let fieldmap = new Map()
- searches.forEach(search => {
- let item = {
- key: search.field,
- value: '0'
- }
-
- if (fieldmap.has(item.key)) {
- item.key = item.key + '1'
- }
-
- fieldmap.set(item.key, true)
-
- if (search.type === 'group') {
- options.push({
- key: search.field,
- value: '0'
- })
- options.push({
- key: search.datefield,
- value: '0'
- })
- options.push({
- key: search.datefield + '1',
- value: '0'
- })
- options.push(item)
- } else if (['datemonth', 'dateweek'].includes(search.type)) {
- options.push(item)
- options.push({
- key: item.key + '1',
- value: '0'
- })
- } else if (search.type === 'daterange') {
- let _skey = search.field
- let _ekey = search.field + '1'
-
- if (/,/.test(search.field)) {
- _skey = search.field.split(',')[0]
- _ekey = search.field.split(',')[1]
- }
-
- options.push({
- key: _skey,
- value: '0'
- })
- options.push({
- key: _ekey,
- value: '0'
- })
- } else if (search.type === 'text' || search.type === 'select') {
- item.key.split(',').forEach(field => {
- let cell = JSON.parse(JSON.stringify(item))
- cell.key = field
-
- options.push(cell)
- })
- } else {
- options.push(item)
- }
- })
-
- return options
- }
-
- /**
- * @description 鑾峰彇鍏ㄩ儴鎼滅储鏉′欢
- * @param {Array} searches 鎼滅储鏉′欢鏁扮粍
- */
- formatSearch (searches) {
- if (!searches || searches.length === 0) return []
-
- let newsearches = []
- searches.forEach(search => {
- if (!search.field) return
-
- let item = {
- key: search.field,
- match: search.match,
- type: search.type,
- label: search.label,
- value: search.initval,
- required: search.required === 'true'
- }
-
- if (item.type === 'group') {
- item.key = search.datefield
- item.type = 'daterange'
- item.match = 'between'
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
-
- newsearches.push(item)
- return
- } else if (item.type === 'date') {
- item.value = moment().format('YYYY-MM-DD')
- } else if (item.type === 'datemonth') {
- item.value = moment().format('YYYY-MM')
- } else if (item.type === 'dateweek') {
- item.value = moment().format('YYYY-MM-DD')
- } else if (item.type === 'daterange') {
- item.value = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')].join(',')
- } else if (item.type === 'multiselect' || (item.type === 'checkcard' && search.multiple === 'true')) {
- item.type = 'multi'
- item.value = '@$@'
- } else {
- item.value = '@$@'
- }
- newsearches.push(item)
- })
-
- return newsearches
}
handleConfirm = (trigger) => {
@@ -297,7 +160,8 @@
}
sqlverify = (_resolve, _reject, type, uscripts) => {
- const { setting, scripts, arr_field, regoptions, search } = this.state
+ const { config } = this.props
+ const { setting, scripts, arr_field, searches } = this.state
if (setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熸帴鍙ｆ椂锛屼笉闇�瑕乻ql楠岃瘉
_resolve()
@@ -316,7 +180,7 @@
} else if (type === 'scripts' && _scripts.length === 0) {
_resolve()
} else { // type 涓� submit 銆� verify 锛屼互鍙婂叾浠栭渶瑕侀獙璇佺殑鍦烘櫙
- let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, regoptions, search)
+ let r = SettingUtils.getDebugSql(setting, _scripts, arr_field, searches, config.urlFields)
if (r.errors) {
notification.warning({
@@ -341,7 +205,7 @@
// 鏍囩鍒囨崲
changeTab = (val) => {
- const { activeKey, search, arr_field } = this.state
+ const { activeKey, searches, arr_field } = this.state
if (this.scriptsForm && this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))) {
notification.warning({
@@ -357,11 +221,14 @@
if (res.dataresource) {
let _dataresource = res.dataresource
+ let _search = joinMainSearchkey(searches)
+ _search = _search ? 'where ' + _search : ''
+
if (/\s/.test(_dataresource)) {
_dataresource = '(' + _dataresource + ') tb'
}
- _defaultSql = `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`
+ _defaultSql = `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`
}
this.setState({
@@ -517,7 +384,7 @@
scripts={scripts}
defaultSql={defaultSql}
urlFields={config.urlFields}
- searches={this.props.search}
+ searches={this.state.searches}
scriptsChange={this.scriptsChange}
scriptsUpdate={this.scriptsUpdate}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
--
Gitblit v1.8.0