From b9a0e8541f0959db5d848f7b893c8838851ce411 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 四月 2020 13:29:49 +0800
Subject: [PATCH] 2020-04-09
---
src/templates/comtableconfig/index.jsx | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/src/templates/comtableconfig/index.jsx b/src/templates/comtableconfig/index.jsx
index 20b0da8..849c1c3 100644
--- a/src/templates/comtableconfig/index.jsx
+++ b/src/templates/comtableconfig/index.jsx
@@ -505,12 +505,11 @@
MenuNo: cell.MenuNo,
Ot: cell.Ot,
PageParam: cell.PageParam,
- LinkUrl: cell.LinkUrl
+ LinkUrl: cell.LinkUrl,
+ disabled: cell.MenuID === menu.MenuID
}
})
}
-
- submenu.children = submenu.children.filter(cell => cell.MenuID !== menu.MenuID)
return submenu
})
@@ -703,10 +702,12 @@
let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
let _search = config.search.map(item => {
- if (item.uuid !== res.uuid && item.field === res.field) {
- fieldrepet = true
- } else if (item.uuid !== res.uuid && item.field && item.label === res.label) {
- labelrepet = true
+ if (item.uuid !== res.uuid && res.field && item.field) {
+ if (item.field === res.field) {
+ fieldrepet = true
+ } else if (item.label === res.label) {
+ labelrepet = true
+ }
}
if (item.uuid === res.uuid) {
@@ -918,10 +919,12 @@
let labelrepet = false // 鎻愮ず鏂囧瓧閲嶅
let _columns = config.columns.map(item => {
- if (item.uuid !== res.uuid && item.field === res.field) {
- fieldrepet = true
- } else if (item.uuid !== res.uuid && item.field && item.label === res.label) {
- labelrepet = true
+ if (item.uuid !== res.uuid && res.field && item.field) {
+ if (item.field === res.field) {
+ fieldrepet = true
+ } else if (item.label === res.label) {
+ labelrepet = true
+ }
}
if (item.uuid === res.uuid) {
@@ -1205,7 +1208,7 @@
this.menuformRef.handleConfirm().then(res => {
this.actionFormRef.handleConfirm().then(result => {
- if (!['pop', 'exec', 'prompt'].includes(result) || result.funcType || result.intertype !== 'inner' || result.innerFunc ) {
+ if (!['pop', 'exec', 'prompt'].includes(result.OpenType) || result.funcType || result.intertype !== 'inner' || result.innerFunc ) {
notification.warning({
top: 92,
message: '鎵撳紑鏂瑰紡涓� 寮圭獥锛堣〃鍗曪級銆佹彁绀烘鎴栫洿鎺ユ墽琛岋紝涓斾娇鐢ㄧ郴缁熷嚱鏁版椂锛屾墠鍙互鍒涘缓鎺ュ彛锛�',
@@ -1378,6 +1381,7 @@
})
} else {
let _verify = this.verifyRef.state.verify
+ let _loading = this.verifyRef.state.updateloading
if (card.OpenType !== 'excelOut' && _verify.default === 'false' && _verify.scripts.length === 0) {
notification.warning({
@@ -1408,11 +1412,29 @@
return item
})
- this.setState({
- profileVisible: false,
- config: config,
- card: '',
- })
+ if (_loading) {
+ let _this = this
+
+ confirm({
+ content: `瀛樺湪鏈繚瀛橀」锛岀‘瀹氭彁浜ゅ悧锛焋,
+ okText: this.state.dict['header.confirm'],
+ cancelText: this.state.dict['header.cancel'],
+ onOk() {
+ _this.setState({
+ profileVisible: false,
+ config: config,
+ card: '',
+ })
+ },
+ onCancel() {}
+ })
+ } else {
+ this.setState({
+ profileVisible: false,
+ config: config,
+ card: '',
+ })
+ }
}
}
@@ -2860,6 +2882,7 @@
return (
<div className="common-table-board">
+ {/* <div className="ant-modal-mask"></div> */}
<DndProvider backend={HTML5Backend}>
{/* 宸ュ叿鏍� */}
<div className="tools">
--
Gitblit v1.8.0