From 3bbb8c98fd999cfdaa6d7e061af04d3bdf47e1fd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 17 九月 2021 17:50:29 +0800
Subject: [PATCH] 2021-09-17
---
src/tabviews/treepage/index.jsx | 2
src/components/tabview/index.scss | 4 +-
src/utils/utils-datamanage.js | 19 +++++++++
src/tabviews/formtab/index.jsx | 2
src/tabviews/zshare/normalTable/index.jsx | 4 +-
src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx | 23 +++++++++++
src/menu/datasource/verifycard/settingform/index.jsx | 11 +++++
src/tabviews/zshare/settingcomponent/index.scss | 6 +-
src/tabviews/calendar/index.jsx | 2
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 4 ++
src/tabviews/zshare/pageMessage/index.scss | 4 +-
src/tabviews/commontable/index.scss | 2
src/tabviews/custom/index.jsx | 2
src/views/billprint/index.jsx | 11 +++++
src/tabviews/commontable/index.jsx | 2
src/components/breadview/index.scss | 4 +-
src/tabviews/zshare/normalTable/index.scss | 2
17 files changed, 84 insertions(+), 20 deletions(-)
diff --git a/src/components/breadview/index.scss b/src/components/breadview/index.scss
index 10194f5..6abee24 100644
--- a/src/components/breadview/index.scss
+++ b/src/components/breadview/index.scss
@@ -62,8 +62,8 @@
opacity: 1;
}
.ant-back-top {
- bottom: 20px;
- right: 30px;
+ bottom: 10px;
+ right: 20px;
}
}
diff --git a/src/components/tabview/index.scss b/src/components/tabview/index.scss
index 5ea2e5a..09130ce 100644
--- a/src/components/tabview/index.scss
+++ b/src/components/tabview/index.scss
@@ -104,8 +104,8 @@
opacity: 1;
}
.ant-back-top {
- bottom: 20px;
- right: 30px;
+ bottom: 10px;
+ right: 20px;
}
.mk-water-mark {
position: absolute;
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index f5b54bd..be345d0 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -474,6 +474,17 @@
)}
</Form.Item>
</Col> : null}
+ <Col span={8}>
+ <Form.Item label="浜嬪姟">
+ {getFieldDecorator('transaction', {
+ initialValue: setting.transaction || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="true">浣跨敤</Radio>
+ <Radio value="false">涓嶄娇鐢�</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col>
{config.type !== 'navbar' && config.type !== 'balcony' ? <Col span={8}>
<Form.Item label="鍒濆鍖栨暟鎹�">
{getFieldDecorator('onload', {
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index f63be99..533d8e0 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -548,7 +548,7 @@
<MainSearch BID={BID} searchlist={searchlist} setting={setting} menuType={menuType} refreshdata={this.refreshbysearch}/> : null
}
{config && config.calendar ? <CalendarComponent calendar={config.calendar} loading={loading} data={data} triggerDate={this.triggerDate} changeDate={this.changeDate}/> : null}
- {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
<Modal
title={config.tab ? config.tab.label : ''}
width={'80vw'}
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index 72d448d..f847541 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -1156,7 +1156,7 @@
})}
</Tabs>))
}
- {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
{menuType !== 'HS' && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts} permAction={this.props.permAction}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
diff --git a/src/tabviews/commontable/index.scss b/src/tabviews/commontable/index.scss
index 086a875..c7ed74b 100644
--- a/src/tabviews/commontable/index.scss
+++ b/src/tabviews/commontable/index.scss
@@ -2,7 +2,7 @@
position: relative;
min-height: calc(100vh - 94px);
padding-top: 16px;
- padding-bottom: 80px;
+ padding-bottom: 0px;
.box404 {
padding-top: 30px;
}
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 06c8835..478a593 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1142,7 +1142,7 @@
<div className={'custom-page-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
{(loadingview || loading) ? <Spin className="view-spin" size="large" /> : null}
<Row>{this.getComponents()}</Row>
- {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
{menuType !== 'HS' && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts} permAction={this.props.permAction}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
diff --git a/src/tabviews/formtab/index.jsx b/src/tabviews/formtab/index.jsx
index 35e72b5..69bdf15 100644
--- a/src/tabviews/formtab/index.jsx
+++ b/src/tabviews/formtab/index.jsx
@@ -662,7 +662,7 @@
)
})
}
- {this.props.menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {this.props.menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
diff --git a/src/tabviews/treepage/index.jsx b/src/tabviews/treepage/index.jsx
index 6c49ffd..c5ef22b 100644
--- a/src/tabviews/treepage/index.jsx
+++ b/src/tabviews/treepage/index.jsx
@@ -631,7 +631,7 @@
)}
</Col>
</Row> : null}
- {menuType !== 'HS' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
+ {menuType !== 'HS' && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
{menuType !== 'HS' && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts} permAction={this.props.permAction}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index ec5a55a..0c1fdb3 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -783,6 +783,10 @@
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
+ if (setting.transaction === 'true') {
+ param.func = 'sPC_Get_TableData_try'
+ }
+
return param
}
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index fdbc84e..38c2501 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1121,7 +1121,7 @@
<div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '')}>
{offset && <Affix offsetTop={offset} className="fix-header">
<Table
- size="middle"
+ size={setting.size || 'middle'}
style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
@@ -1136,7 +1136,7 @@
/>
</Affix>}
<Table
- size="middle"
+ size={setting.size || 'middle'}
style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
diff --git a/src/tabviews/zshare/normalTable/index.scss b/src/tabviews/zshare/normalTable/index.scss
index 8202f79..abfca41 100644
--- a/src/tabviews/zshare/normalTable/index.scss
+++ b/src/tabviews/zshare/normalTable/index.scss
@@ -1,6 +1,6 @@
.normal-data-table {
position: relative;
- padding: 0 0px 30px;
+ padding: 0 0px 15px;
.normal-table-footer {
padding: 10px 0px;
diff --git a/src/tabviews/zshare/pageMessage/index.scss b/src/tabviews/zshare/pageMessage/index.scss
index 74f1603..2b07659 100644
--- a/src/tabviews/zshare/pageMessage/index.scss
+++ b/src/tabviews/zshare/pageMessage/index.scss
@@ -2,8 +2,8 @@
.page-message {
position: fixed;
z-index: 2;
- bottom: 65px;
- right: 30px;
+ bottom: 55px;
+ right: 20px;
width: 40px;
height: 40px;
}
diff --git a/src/tabviews/zshare/settingcomponent/index.scss b/src/tabviews/zshare/settingcomponent/index.scss
index 6746775..34e6780 100644
--- a/src/tabviews/zshare/settingcomponent/index.scss
+++ b/src/tabviews/zshare/settingcomponent/index.scss
@@ -2,8 +2,8 @@
.page-setting {
position: fixed;
z-index: 2;
- bottom: 65px;
- right: 30px;
+ bottom: 55px;
+ right: 20px;
width: 40px;
height: 40px;
}
@@ -15,7 +15,7 @@
}
.page-message-wrap.exist + .page-setting-wrap {
.page-setting {
- bottom: 110px;
+ bottom: 100px;
}
}
.custom-setting-modal {
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
index 055561e..d7000ac 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/datasource/index.jsx
@@ -617,6 +617,29 @@
</Form.Item>
</Col>
<Col span={12}>
+ <Form.Item label="琛ㄦ牸澶у皬">
+ {getFieldDecorator('size', {
+ initialValue: setting.size || 'middle'
+ })(
+ <Radio.Group>
+ <Radio value="default">澶�</Radio>
+ <Radio value="middle">涓�</Radio>
+ <Radio value="small">灏�</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
+ <Form.Item label="浜嬪姟">
+ {getFieldDecorator('transaction', {
+ initialValue: setting.transaction || 'false'
+ })(
+ <Radio.Group>
+ <Radio value="true">浣跨敤</Radio>
+ <Radio value="false">涓嶄娇鐢�</Radio>
+ </Radio.Group>)}
+ </Form.Item>
+ </Col>
+ <Col span={12}>
<Form.Item label={
<Tooltip placement="topLeft" title="楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��">
<Icon type="question-circle" />
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 13b2678..dc9d801 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -90,6 +90,10 @@
default_sql: setting.execute ? 'true' : 'false'
}
+ if (setting.transaction === 'true') {
+ param.func = 'sPC_Get_TableData_try'
+ }
+
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
let RoleID = sessionStorage.getItem('role_id') || ''
@@ -226,6 +230,10 @@
exec_type: 'y',
arr_field: statFields.map(col => col.field).join(','),
default_sql: setting.execute ? 'true' : 'false'
+ }
+
+ if (setting.transaction === 'true') {
+ param.func = 'sPC_Get_TableData_try'
}
let _dataresource = setting.dataresource
@@ -676,7 +684,8 @@
primaryKey: setting.primaryKey || '',
foreign_key: '',
sql: _dataresource,
- script: _customScript
+ script: _customScript,
+ transaction: setting.transaction === 'true'
}
}
@@ -687,12 +696,16 @@
export function getStructuredParams (params, config, BID = '') {
let LText_field = []
let diffUser = false
+ let transaction = false
let _LText = params.map((item, index) => {
let _script = item.script
if (!diffUser && (/@userid@/ig.test(item.sql) || /@userid@/ig.test(_script))) {
diffUser = true
+ }
+ if (item.transaction) {
+ transaction = true
}
item.columns.forEach(cell => {
@@ -708,6 +721,10 @@
BID: BID
}
+ if (transaction) {
+ param.func = 'sPC_Get_structured_data_try'
+ }
+
let { LText, LText1, LText2 } = Utils.sPCInUpDeFormatOptions(param.LText)
param.LText1 = LText1
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index 09bc613..7307a3d 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -319,7 +319,8 @@
primaryKey: setting.primaryKey || '',
foreign_key: '',
sql: _dataresource,
- script: _customScript
+ script: _customScript,
+ transaction: setting.transaction === 'true'
}
}
@@ -328,6 +329,7 @@
if (!params || params.length === 0) return ''
let LText_field = []
+ let transaction = false
let LText = params.map((item, index) => {
let _sql = item.sql
let _script = item.script
@@ -336,6 +338,9 @@
_script = `declare @ErrorCode nvarchar(50),@retmsg nvarchar(4000) select @ErrorCode='',@retmsg =''
${_script}
`
+ }
+ if (item.transaction) {
+ transaction = true
}
item.columns.forEach(cell => {
@@ -351,6 +356,10 @@
BID: BID || ''
}
+ if (transaction) {
+ param.func = 'sPC_Get_structured_data_try'
+ }
+
param.LText = Utils.formatOptions(param.LText)
param.LText_field = Utils.formatOptions(param.LText_field)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
--
Gitblit v1.8.0