From daf42d3c347be272b436f08ff25dfa37f0952852 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 19 一月 2020 11:36:56 +0800
Subject: [PATCH] 2020-01-19
---
src/setupProxy.js | 9 +++++----
src/tabviews/subtable/index.jsx | 16 +++++++++++++---
src/tabviews/subtabtable/index.jsx | 16 +++++++++++++---
src/tabviews/commontable/index.jsx | 16 +++++++++++++---
4 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/src/setupProxy.js b/src/setupProxy.js
index 5c34ad2..e2434ee 100644
--- a/src/setupProxy.js
+++ b/src/setupProxy.js
@@ -1,9 +1,10 @@
const proxy = require('http-proxy-middleware')
-const service = 'mkwms'
+const host = 'http://qingqiumarket.cn'
+const service = 'mkwms/'
module.exports = function(app) {
app.use(proxy('/webapi', {
- target: `http://qingqiumarket.cn/${service}/webapi`,
+ target: `${host}/${service}webapi`,
secure: false,
changeOrigin: true,
pathRewrite: {
@@ -13,7 +14,7 @@
}))
app.use(proxy('/zh-CN', { // 鐧诲綍鎺ュ彛
- target: `http://qingqiumarket.cn/${service}/zh-CN`,
+ target: `${host}/${service}zh-CN`,
secure: false,
changeOrigin: true,
pathRewrite: {
@@ -22,7 +23,7 @@
}))
app.use(proxy('/Upload', { // 鐧诲綍鎺ュ彛
- target: `http://qingqiumarket.cn/${service}/zh-CN/Home/Upload`,
+ target: `${host}/${service}zh-CN/Home/Upload`,
secure: false,
changeOrigin: true,
pathRewrite: {
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index b76243f..553275c 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -412,7 +412,7 @@
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
let fieldmap = new Map()
- search.forEach(item => {
+ let options = search.map(item => {
let _field = item.key
if (fieldmap.has(_field)) {
@@ -421,9 +421,19 @@
fieldmap.set(item.key, true)
- let reg = new RegExp('@' + _field, 'ig')
- _dataresource = _dataresource.replace(reg, `'${item.value}'`)
+ return {
+ reg: new RegExp('@' + _field, 'ig'),
+ value: item.value
+ }
})
+
+ options.reverse()
+
+ options.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`
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 3ed8c99..102e3cd 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -373,7 +373,7 @@
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
let fieldmap = new Map()
- search.forEach(item => {
+ let options = search.map(item => {
let _field = item.key
if (fieldmap.has(_field)) {
@@ -382,9 +382,19 @@
fieldmap.set(item.key, true)
- let reg = new RegExp('@' + _field, 'ig')
- _dataresource = _dataresource.replace(reg, `'${item.value}'`)
+ return {
+ reg: new RegExp('@' + _field, 'ig'),
+ value: item.value
+ }
})
+
+ options.reverse()
+
+ options.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`
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index cb71290..20c3383 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -335,7 +335,7 @@
if (setting.queryType === 'statistics') { // 缁熻鏁版嵁婧愶紝鍐呭鏇挎崲
let fieldmap = new Map()
- search.forEach(item => {
+ let options = search.map(item => {
let _field = item.key
if (fieldmap.has(_field)) {
@@ -344,9 +344,19 @@
fieldmap.set(item.key, true)
- let reg = new RegExp('@' + _field, 'ig')
- _dataresource = _dataresource.replace(reg, `'${item.value}'`)
+ return {
+ reg: new RegExp('@' + _field, 'ig'),
+ value: item.value
+ }
})
+
+ options.reverse()
+
+ options.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`
--
Gitblit v1.8.0