From 14dddbb8c4babce0f2444e1d2d1a3784a273969d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2019 09:15:57 +0800
Subject: [PATCH] 2019-12-27
---
src/components/tabview/index.jsx | 2 +-
src/tabviews/subtable/index.jsx | 4 ++--
src/tabviews/commontable/index.jsx | 4 ++--
src/components/sidemenu/editthdmenu/index.jsx | 1 -
src/templates/comtableconfig/tabform/index.jsx | 26 ++++++++++++--------------
src/templates/subtableconfig/index.jsx | 4 ++--
src/utils/utils.js | 2 +-
7 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/components/sidemenu/editthdmenu/index.jsx b/src/components/sidemenu/editthdmenu/index.jsx
index cfc8668..b40bfd3 100644
--- a/src/components/sidemenu/editthdmenu/index.jsx
+++ b/src/components/sidemenu/editthdmenu/index.jsx
@@ -464,7 +464,6 @@
}
} else if (type === 'tabButton') {
let pageParam = ''
- console.log(config)
if (config && config.type === 'Modal') {
pageParam = config
}
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 6f61f04..2a6a77e 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -56,7 +56,7 @@
if (menu.MenuID === this.state.selectedTabId) {
tabs[0] && (tabs[0].selected = true)
}
- console.log(tabs)
+
this.props.modifyTabview(tabs)
}
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 445c4d8..d91f0bd 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -328,7 +328,7 @@
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}`
- 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 +472,7 @@
}
let LText = `select ${_arr_label_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_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)
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index 54f4c20..f8eda17 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -317,7 +317,7 @@
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}`
- 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)
@@ -444,7 +444,7 @@
}
let LText = `select ${_arr_label_field} from (select ${arr_field} ,ROW_NUMBER() over(order by ${orderBy}) as rows from ${_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)
diff --git a/src/templates/comtableconfig/tabform/index.jsx b/src/templates/comtableconfig/tabform/index.jsx
index d338f64..cdf8c4b 100644
--- a/src/templates/comtableconfig/tabform/index.jsx
+++ b/src/templates/comtableconfig/tabform/index.jsx
@@ -29,7 +29,7 @@
let _tabs = this.props.tabs.filter(tab => tab.type === type)
let initTab = _tabs.filter(tab => tab.uuid === _initval)[0]
- console.log(_tabs)
+
this.setState({
formlist: formlist.map(item => {
if (item.key === 'linkTab') {
@@ -85,19 +85,17 @@
})
})
- console.log(value)
-
- this.setState({
- formlist: this.state.formlist.map(form => {
- return form
- })
- }, () => {
- this.setState({
- formlist: this.state.formlist.map(form => {
- return form
- })
- })
- })
+ // this.setState({
+ // formlist: this.state.formlist.map(form => {
+ // return form
+ // })
+ // }, () => {
+ // this.setState({
+ // formlist: this.state.formlist.map(form => {
+ // return form
+ // })
+ // })
+ // })
}
}
diff --git a/src/templates/subtableconfig/index.jsx b/src/templates/subtableconfig/index.jsx
index 051935b..b96a88b 100644
--- a/src/templates/subtableconfig/index.jsx
+++ b/src/templates/subtableconfig/index.jsx
@@ -1681,13 +1681,13 @@
actionloading: false,
columnsloading: false
}, () => {
- console.log(btnParam)
+
this.setState({
menuloading: false,
menucloseloading: false
})
})
- // this.submitAction(btnParam)
+ this.submitAction(btnParam)
})
} else {
this.setState({
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 963039c..b0fd07f 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -577,7 +577,7 @@
ROLLBACK TRAN
END`
- console.log(Ltext)
+
Ltext = Ltext.replace(/\n\s{4}/ig, 'mchr13k')
return Ltext
--
Gitblit v1.8.0