From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/datasource/verifycard/index.jsx | 38 +++++++++-----------------------------
1 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 5a09d3b..2de2854 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -62,6 +62,7 @@
inputType: 'input',
editable: true,
searchable: true,
+ copy: true,
width: '28%'
},
{
@@ -118,6 +119,7 @@
{ value: 'datetime', text: 'datetime' },
],
editable: true,
+ copy: true,
width: '25%',
}
],
@@ -717,6 +719,13 @@
let r = SettingUtils.getDebugSql(setting, _scripts, _columns, searches, config.subtype, config.hasExtend)
+ if (type === 'submit' && r.custompage && setting.queryType !== 'statistics') {
+ Modal.info({
+ title: '鏁版嵁婧愭垨鑷畾涔夎剼鏈腑浣跨敤浜嗚嚜瀹氫箟鍒嗛〉锛屾煡璇㈢被鍨嬭浣跨敤缁熻锛�',
+ })
+ reject()
+ return
+ }
if (r.custompage && setting.laypage === 'true' && _columns.findIndex(col => col.field === 'mk_total') === -1) {
if (config.subtype !== 'basetable') {
const that = this
@@ -1208,33 +1217,6 @@
})
}
- tolowercase = (type) => {
- const that = this
- confirm({
- content: type === 'sub' ? '纭畾灏嗗瓙琛ㄥ瓧娈佃浆涓哄皬鍐欏悧锛�' : '纭畾灏嗗瓧娈佃浆涓哄皬鍐欏悧锛�',
- onOk() {
- that.execlowercase(type)
- },
- onCancel() {}
- })
- }
-
- execlowercase = (type) => {
- const { subColumns, columns } = this.state
-
- if (type === 'sub') {
- this.setState({subColumns: fromJS(subColumns).toJS().map(col => {
- col.field = col.field.toLowerCase()
- return col
- })})
- } else {
- this.setState({columns: fromJS(columns).toJS().map(col => {
- col.field = col.field.toLowerCase()
- return col
- })})
- }
- }
-
/**
* @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
*/
@@ -1282,7 +1264,6 @@
type="fields"
updatefield={this.updatefields}
/>
- <SwapOutlined className="columns-lowercase" title="杞皬鍐�" onClick={() => this.tolowercase()}/>
<ExcelOut data={columns} setting={setting}/>
<EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.datasource = inst} data={columns} columns={colColumns} onChange={(columns) => this.setState({columns})}/>
</TabPane> : <TabPane tab={
@@ -1307,7 +1288,6 @@
type="fields"
updatefield={this.updateSubfields}
/>
- <SwapOutlined className="columns-lowercase" title="杞皬鍐�" onClick={() => this.tolowercase('sub')}/>
<ExcelOut data={subColumns} setting={setting}/>
<EditTable actions={['edit', 'move', 'copy', 'del', 'clear']} searchKey={searchKey} type="datasourcefield" wrappedComponentRef={(inst) => this.subdatasource = inst} data={subColumns} columns={colColumns} onChange={(subColumns) => this.setState({subColumns})}/>
</TabPane> : null}
--
Gitblit v1.8.0