From a975aa770d1f5d0ae133f0e87a28b5d6b94734ef Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 09 五月 2024 11:16:42 +0800
Subject: [PATCH] 2024-05-09
---
src/tabviews/custom/components/chart/antv-scatter/index.jsx | 4
src/tabviews/custom/components/chart/antv-bar-line/index.jsx | 4
src/tabviews/custom/components/table/base-table/index.jsx | 4
src/templates/sharecomponent/actioncomponent/formconfig.jsx | 4 -
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 6 +
src/tabviews/zshare/actionList/editLine/index.jsx | 2
src/tabviews/custom/components/tree/antd-tree/index.jsx | 4
src/tabviews/zshare/actionList/popupbutton/index.jsx | 2
src/views/basedesign/updateFormTab/index.jsx | 6 --
src/tabviews/custom/components/card/double-data-card/index.jsx | 4
src/templates/comtableconfig/updatetable/index.jsx | 6 --
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 2
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/tabviews/custom/components/carousel/data-card/index.jsx | 4
src/tabviews/custom/components/table/edit-table/index.jsx | 4
src/tabviews/custom/components/calendar/index.jsx | 4
src/tabviews/zshare/actionList/shareLink/index.jsx | 2
src/tabviews/zshare/actionList/newpagebutton/index.jsx | 2
src/tabviews/custom/components/form/simple-form/index.jsx | 4
src/tabviews/zshare/actionList/normalbutton/index.jsx | 2
src/tabviews/custom/components/chart/custom-chart/index.jsx | 4
src/tabviews/zshare/actionList/changeuserbutton/index.jsx | 2
src/tabviews/custom/components/card/data-card/index.jsx | 6 +-
src/tabviews/zshare/actionList/exportPdf/index.jsx | 2
src/menu/components/form/formaction/formconfig.jsx | 3 +
src/tabviews/custom/components/form/tab-form/index.jsx | 4
src/tabviews/custom/components/card/table-card/index.jsx | 4
src/tabviews/custom/components/card/prop-card/index.jsx | 4
src/tabviews/zshare/actionList/tabbutton/index.jsx | 4
src/tabviews/zshare/actionList/funczip/index.jsx | 2
src/templates/treepageconfig/updatetable/index.jsx | 6 --
src/menu/components/share/actioncomponent/formconfig.jsx | 20 ++++++
src/tabviews/custom/components/table/normal-table/index.jsx | 6 +-
src/tabviews/zshare/actionList/funcMegvii/index.jsx | 2
src/tabviews/custom/components/timeline/normal-timeline/index.jsx | 4
src/tabviews/zshare/actionList/printbutton/index.jsx | 2
src/tabviews/custom/components/carousel/prop-card/index.jsx | 4
src/tabviews/custom/components/form/step-form/index.jsx | 4
src/tabviews/custom/components/card/balcony/index.jsx | 4
src/tabviews/custom/components/card/cardcellList/index.scss | 12 ++++
40 files changed, 93 insertions(+), 78 deletions(-)
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index 5d3565e..bfc2018 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -439,6 +439,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
}, ...closetab, ...refresh]
},
{
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index c9f53f2..16fdb06 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -728,6 +728,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
},
...closetab,
...refresh]
@@ -756,6 +759,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
},
...refresh]
},
@@ -774,6 +780,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
}]
},
{
@@ -879,7 +888,7 @@
initVal: card.hover || '',
tooltip: '榧犳爣鎮诞鎸夐挳涓婃柟鏃剁殑棰滆壊鍙樺寲銆�',
required: false,
- forbid: type === 'card' || appType === 'mob',
+ forbid: appType === 'mob',
options: [{
value: '',
text: '鏃�'
@@ -2082,6 +2091,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
},
...refresh]
},
@@ -2107,6 +2119,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
},
...refresh]
},
@@ -2125,6 +2140,9 @@
}, {
value: 'mainline',
text: '鍒锋柊涓婄骇缁勪欢 - 琛�'
+ }, {
+ value: 'maingrid',
+ text: '鍒锋柊涓婄骇缁勪欢'
}]
},
{
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index ddfa334..0b443d7 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -566,7 +566,8 @@
<Select.Option value="line" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛�</Select.Option>
<Select.Option value="grid">鍒锋柊缁勪欢</Select.Option>
<Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛� / 缁勪欢</Select.Option>
- <Select.Option value="mainline">涓婄骇锛堣锛�</Select.Option>
+ <Select.Option value="mainline">鍒锋柊涓婄骇缁勪欢 - 琛�</Select.Option>
+ <Select.Option value="maingrid">鍒锋柊涓婄骇缁勪欢</Select.Option>
</Select>
</Form.Item>
</Col>
@@ -577,7 +578,8 @@
<Select.Option value="line" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛�</Select.Option>
<Select.Option value="grid">鍒锋柊缁勪欢</Select.Option>
<Select.Option value="line_grid" disabled={config.wrap.commit !== 'change'}>鍒锋柊琛� / 缁勪欢</Select.Option>
- <Select.Option value="mainline">涓婄骇锛堣锛�</Select.Option>
+ <Select.Option value="mainline">鍒锋柊涓婄骇缁勪欢 - 琛�</Select.Option>
+ <Select.Option value="maingrid">鍒锋柊涓婄骇缁勪欢</Select.Option>
</Select>
</Form.Item>
</Col>
diff --git a/src/tabviews/custom/components/calendar/index.jsx b/src/tabviews/custom/components/calendar/index.jsx
index adda59d..c8ea014 100644
--- a/src/tabviews/custom/components/calendar/index.jsx
+++ b/src/tabviews/custom/components/calendar/index.jsx
@@ -180,8 +180,8 @@
if (config.uuid !== menuId) return
- if (position === 'mainline' && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/card/balcony/index.jsx b/src/tabviews/custom/components/card/balcony/index.jsx
index 717fa6d..830ba46 100644
--- a/src/tabviews/custom/components/card/balcony/index.jsx
+++ b/src/tabviews/custom/components/card/balcony/index.jsx
@@ -273,8 +273,8 @@
this.loadData()
} else {
- if ((position === 'mainline' || position === 'popclose') && config.wrap.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.wrap.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.wrap.supModule) {
+ MKEmitter.emit('reloadData', config.wrap.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/card/cardcellList/index.scss b/src/tabviews/custom/components/card/cardcellList/index.scss
index ff8997c..e5cfb31 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.scss
+++ b/src/tabviews/custom/components/card/cardcellList/index.scss
@@ -10,6 +10,18 @@
.ant-btn {
padding: 0;
}
+ .ant-btn.mk-btn-hover-bg:not([disabled]):hover {
+ opacity: 1!important;
+ color: #ffffff!important;
+ border-color: var(--mk-sys-color)!important;
+ background-color: var(--mk-sys-color)!important;
+ }
+ .ant-btn.mk-btn-hover-border:not([disabled]):hover {
+ opacity: 1!important;
+ color: var(--mk-sys-color)!important;
+ border-color: var(--mk-sys-color)!important;
+ background-color: #ffffff!important;
+ }
.file-image {
max-height: 100%;
vertical-align: top;
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 95c8bb2..1dca646 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -410,7 +410,7 @@
if (config.uuid !== menuId) return
if (config.supNodes) {
- if (position === 'mainline' || position === 'popclose') {
+ if (['mainline', 'maingrid', 'popclose'].includes(position)) {
let supNode = this.supModules[this.supModules.length - 1]
config.supNodes.forEach((item, i) => {
setTimeout(() => {
@@ -447,8 +447,8 @@
} else {
this.loadData(id)
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index bc0cd42..6cb8d86 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -372,8 +372,8 @@
} else {
this.loadData(id)
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index 7885b03..a7f4188 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -434,8 +434,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData('', btn)
}
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index 231e066..f605597 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -272,8 +272,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index b2be453..64f8dc1 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -282,8 +282,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index d1808aa..e42ca31 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -270,8 +270,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
index 38923d3..db28367 100644
--- a/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-bar-line/index.jsx
@@ -548,8 +548,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/chart/antv-scatter/index.jsx b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
index 891181e..6526bdb 100644
--- a/src/tabviews/custom/components/chart/antv-scatter/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-scatter/index.jsx
@@ -231,8 +231,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/chart/custom-chart/index.jsx b/src/tabviews/custom/components/chart/custom-chart/index.jsx
index 747e2fc..044790e 100644
--- a/src/tabviews/custom/components/chart/custom-chart/index.jsx
+++ b/src/tabviews/custom/components/chart/custom-chart/index.jsx
@@ -222,8 +222,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/form/simple-form/index.jsx b/src/tabviews/custom/components/form/simple-form/index.jsx
index 9954a82..d6c4abc 100644
--- a/src/tabviews/custom/components/form/simple-form/index.jsx
+++ b/src/tabviews/custom/components/form/simple-form/index.jsx
@@ -267,8 +267,8 @@
})
}
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else if (position === 'grid' && config.wrap.datatype === 'static') {
this.setState({
data: null
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index 7b48e9c..94fd836 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -265,8 +265,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else if (position === 'grid' && config.wrap.datatype === 'static') {
this.setState({
data: null
diff --git a/src/tabviews/custom/components/form/tab-form/index.jsx b/src/tabviews/custom/components/form/tab-form/index.jsx
index 15fe9d4..5bbc94b 100644
--- a/src/tabviews/custom/components/form/tab-form/index.jsx
+++ b/src/tabviews/custom/components/form/tab-form/index.jsx
@@ -229,8 +229,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) {
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else if (position === 'grid' && config.wrap.datatype === 'static') {
this.setState({
data: null
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 50dd7bc..bc2b635 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -573,8 +573,8 @@
} else {
this.reloadtable(btn, id)
}
- } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.reloadtable(btn, id)
}
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 116551f..524645a 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -743,8 +743,8 @@
} else {
this.reloadtable(btn)
}
- } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.reloadtable(btn)
}
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 323e0eb..fe39799 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -928,7 +928,7 @@
if (config.uuid !== menuId) return
if (config.supNodes) {
- if (position === 'mainline' || position === 'popclose') {
+ if (['mainline', 'maingrid', 'popclose'].includes(position)) {
let supNode = this.supModules[this.supModules.length - 1]
config.supNodes.forEach((item, i) => {
setTimeout(() => {
@@ -957,8 +957,8 @@
} else {
this.reloadtable(btn, id)
}
- } else if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.reloadtable(btn, id)
}
diff --git a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
index e2444f1..29e50f7 100644
--- a/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
+++ b/src/tabviews/custom/components/timeline/normal-timeline/index.jsx
@@ -252,8 +252,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index e218c48..35b14ec 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -275,8 +275,8 @@
if (config.uuid !== menuId) return
- if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ if (['mainline', 'maingrid', 'popclose'].includes(position) && config.setting.supModule) {
+ MKEmitter.emit('reloadData', config.setting.supModule, position === 'maingrid' ? '' : BID)
} else {
this.loadData()
}
diff --git a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
index d1f4c8a..72cef08 100644
--- a/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/changeuserbutton/index.jsx
@@ -239,7 +239,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/editLine/index.jsx b/src/tabviews/zshare/actionList/editLine/index.jsx
index 2ce6835..90f053d 100644
--- a/src/tabviews/zshare/actionList/editLine/index.jsx
+++ b/src/tabviews/zshare/actionList/editLine/index.jsx
@@ -124,7 +124,7 @@
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index b14214d..4d9919b 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -554,7 +554,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<ExcelIn btn={btn} triggerExcelIn={() => this.setState({ loading: true })} returndata={this.getexceldata} ref="excelIn" />
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index f16a983..43ef2df 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -1097,7 +1097,7 @@
loading={loading}
disabled={disabled}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/exportPdf/index.jsx b/src/tabviews/zshare/actionList/exportPdf/index.jsx
index 3678b0b..89575fe 100644
--- a/src/tabviews/zshare/actionList/exportPdf/index.jsx
+++ b/src/tabviews/zshare/actionList/exportPdf/index.jsx
@@ -130,7 +130,7 @@
type="link"
title={btn.show === 'icon' ? btn.label : ''}
style={style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/funcMegvii/index.jsx b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
index 19fc33c..43a80d7 100644
--- a/src/tabviews/zshare/actionList/funcMegvii/index.jsx
+++ b/src/tabviews/zshare/actionList/funcMegvii/index.jsx
@@ -533,7 +533,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
{this.getModels()}
diff --git a/src/tabviews/zshare/actionList/funczip/index.jsx b/src/tabviews/zshare/actionList/funczip/index.jsx
index 534806d..a54b3fc 100644
--- a/src/tabviews/zshare/actionList/funczip/index.jsx
+++ b/src/tabviews/zshare/actionList/funczip/index.jsx
@@ -425,7 +425,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index 0199b4a..ea3a5d9 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -330,7 +330,7 @@
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
style={btn.style || null}
disabled={disabled}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 39d9016..15a507f 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -3568,7 +3568,7 @@
loading={loading}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index 7c57f0a..df029ca 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -328,7 +328,7 @@
loading={loading && !name}
disabled={disabled}
style={btn.style}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<span onClick={(e) => {e.stopPropagation()}} onDoubleClick={(e) => {e.stopPropagation()}}>{this.getPop()}</span>
diff --git a/src/tabviews/zshare/actionList/printbutton/index.jsx b/src/tabviews/zshare/actionList/printbutton/index.jsx
index 86a4840..1e8c326 100644
--- a/src/tabviews/zshare/actionList/printbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/printbutton/index.jsx
@@ -2385,7 +2385,7 @@
loading={loading}
disabled={disabled}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
<span onClick={(e) => {e.stopPropagation()}}>{this.getModels()}</span>
diff --git a/src/tabviews/zshare/actionList/shareLink/index.jsx b/src/tabviews/zshare/actionList/shareLink/index.jsx
index d5ba3e8..c13444a 100644
--- a/src/tabviews/zshare/actionList/shareLink/index.jsx
+++ b/src/tabviews/zshare/actionList/shareLink/index.jsx
@@ -167,7 +167,7 @@
title={btn.show === 'icon' ? btn.label : ''}
loading={loading}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/tabviews/zshare/actionList/tabbutton/index.jsx b/src/tabviews/zshare/actionList/tabbutton/index.jsx
index dbc22b9..4b767da 100644
--- a/src/tabviews/zshare/actionList/tabbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/tabbutton/index.jsx
@@ -325,7 +325,7 @@
type="link"
title={btn.show === 'icon' ? btn.label : ''}
style={btn.style || null}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
>{label}</Button>
</Dropdown>)
}
@@ -337,7 +337,7 @@
title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
style={btn.style || null}
disabled={disabled}
- className={btn.$toolbtn ? (btn.hover || '') : ''}
+ className={btn.hover || ''}
onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
>{label}</Button>
)
diff --git a/src/templates/comtableconfig/updatetable/index.jsx b/src/templates/comtableconfig/updatetable/index.jsx
index 97d5062..ed03667 100644
--- a/src/templates/comtableconfig/updatetable/index.jsx
+++ b/src/templates/comtableconfig/updatetable/index.jsx
@@ -1080,14 +1080,10 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.execSuccess === 'maingrid') {
- _btn.execSuccess = 'mainline'
}
if (_btn.execError === 'equaltab') {
_btn.execError = 'grid'
- } else if (_btn.execError === 'maingrid') {
- _btn.execError = 'mainline'
}
if (_btn.popClose === 'equaltab') {
@@ -1097,8 +1093,6 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.popClose === 'maingrid') {
- _btn.popClose = 'mainline'
}
if (_btn.OpenType === 'pop' || (_btn.OpenType === 'funcbutton' && _btn.funcType === 'print' && _btn.execMode === 'pop')) {
diff --git a/src/templates/sharecomponent/actioncomponent/formconfig.jsx b/src/templates/sharecomponent/actioncomponent/formconfig.jsx
index 6cdce8c..79f1290 100644
--- a/src/templates/sharecomponent/actioncomponent/formconfig.jsx
+++ b/src/templates/sharecomponent/actioncomponent/formconfig.jsx
@@ -64,13 +64,11 @@
}
refresh.push({
value: 'maingrid',
- text: '鍒锋柊涓昏〃锛堣锛�'
+ text: '鍒锋柊涓昏〃'
}, {
value: 'equaltab',
text: '鍒锋柊鍚岀骇鏍囩'
})
- } else if (card.execSuccess === 'maingrid') {
- card.execSuccess = 'grid'
}
if (card.OpenType === 'blank') {
diff --git a/src/templates/treepageconfig/updatetable/index.jsx b/src/templates/treepageconfig/updatetable/index.jsx
index cebb5ca..8de0cea 100644
--- a/src/templates/treepageconfig/updatetable/index.jsx
+++ b/src/templates/treepageconfig/updatetable/index.jsx
@@ -1121,14 +1121,10 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.execSuccess === 'maingrid') {
- _btn.execSuccess = 'mainline'
}
if (_btn.execError === 'equaltab') {
_btn.execError = 'grid'
- } else if (_btn.execError === 'maingrid') {
- _btn.execError = 'mainline'
}
if (_btn.popClose === 'equaltab') {
@@ -1138,8 +1134,6 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.popClose === 'maingrid') {
- _btn.popClose = 'mainline'
}
if (_btn.OpenType === 'pop' || (_btn.OpenType === 'funcbutton' && _btn.funcType === 'print' && _btn.execMode === 'pop')) {
diff --git a/src/views/basedesign/updateFormTab/index.jsx b/src/views/basedesign/updateFormTab/index.jsx
index 5fb70ae..d17db4b 100644
--- a/src/views/basedesign/updateFormTab/index.jsx
+++ b/src/views/basedesign/updateFormTab/index.jsx
@@ -1195,14 +1195,10 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.execSuccess === 'maingrid') {
- _btn.execSuccess = 'mainline'
}
if (_btn.execError === 'equaltab') {
_btn.execError = 'grid'
- } else if (_btn.execError === 'maingrid') {
- _btn.execError = 'mainline'
}
if (_btn.popClose === 'equaltab') {
@@ -1212,8 +1208,6 @@
if (newCon.equalTab && oldtabs && oldtabs[newCon.equalTab]) {
_btn.syncComponent.push(oldtabs[newCon.equalTab])
}
- } else if (_btn.popClose === 'maingrid') {
- _btn.popClose = 'mainline'
}
if (_btn.OpenType === 'pop' || (_btn.OpenType === 'funcbutton' && _btn.funcType === 'print' && _btn.execMode === 'pop')) {
--
Gitblit v1.8.0