From 65e310e342effbb7d98bd5f97b3404a44e3c5233 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 21 十二月 2019 00:29:36 +0800
Subject: [PATCH] 2019-12-21
---
src/tabviews/commontable/index.jsx | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 7bdf4db..d17c945 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -1,14 +1,13 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { BackTop, notification} from 'antd'
+import { BackTop, notification, Spin} from 'antd'
import moment from 'moment'
import Api from '@/api'
import MainSearch from './mainSearch'
import MainAction from './mainAction'
import MainTable from './mainTable'
import NotFount from '@/components/404'
-import Loading from '@/components/loading'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import Utils from '@/utils/utils.js'
@@ -294,7 +293,7 @@
const { arr_field, pageIndex, pageSize, orderColumn, orderType, search, setting } = this.state
let _search = Utils.joinMainSearchkey(search)
- _search = _search ? 'where (' + _search + ')' : ''
+ _search = _search ? 'where ' + _search : ''
let param = {
func: 'sPC_Get_TableData',
@@ -306,7 +305,7 @@
let LText = `select top ${pageSize} ${arr_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${setting.dataresource} ${_search}) tmptable where rows > ${pageSize * (pageIndex - 1)} order by tmptable.rows`
let DateCount = `select count(1) as total from ${setting.dataresource} ${_search}`
-
+ console.log(LText)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -428,7 +427,7 @@
let orderBy = orderColumn ? (orderColumn + ' ' + orderType) : setting.order
let LText = `select ${_arr_label_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${setting.dataresource} ${_search}) tmptable order by tmptable.rows`
-
+ console.log(LText)
param.LText = Utils.formatOptions(LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + '.000'
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
@@ -472,7 +471,7 @@
return (
<div className="commontable" id={'commontable' + this.props.MenuID}>
- {loadingview && <Loading />}
+ {loadingview && <Spin size="large" />}
{searchlist && searchlist.length > 0 ?
<MainSearch
refreshdata={this.refreshbysearch}
--
Gitblit v1.8.0