From 16f80ddfc338bc65a893c1b7eb93d1d9861158b2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 七月 2023 23:05:17 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/transfer/index.jsx | 115 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/src/menu/transfer/index.jsx b/src/menu/transfer/index.jsx
index 6eeecbf..f0a90d6 100644
--- a/src/menu/transfer/index.jsx
+++ b/src/menu/transfer/index.jsx
@@ -29,6 +29,22 @@
const _this = this
if (!config.enabled) {
+ let tb = config.components[0]
+ if (config.components.length === 1 && tb.setting.interType === 'system' && !tb.setting.dataresource) {
+ confirm({
+ title: '褰撳墠椤甸潰灏嗘竻绌猴紝纭畾鍒囨崲涓鸿嚜瀹氫箟椤甸潰鍚楋紵',
+ content: '',
+ onOk() {
+ return new Promise(resolve => {
+ _this.execUpdate(resolve, true)
+ })
+ },
+ onCancel() {}
+ })
+
+ return
+ }
+
notification.warning({
top: 92,
message: '鏈惎鐢ㄨ彍鍗曚笉鍙崌绾э紒',
@@ -49,7 +65,7 @@
})
}
- execUpdate = (_resolve) => {
+ execUpdate = (_resolve, clear) => {
let _config = fromJS(this.props.config).toJS()
_config.permission = 'true'
_config.Template = 'CustomPage'
@@ -59,23 +75,53 @@
delete _config.autoMatic
let useMSearch = false
- _config.components.forEach((item, i) => {
- if (item.type === 'tabs') {
- item.name = '鏍囩缁�' + i
- item.width = 24
- item.subtype = 'tabs'
- item.setting = {autoSwitch: 'false', blacklist: [], name: item.name, position: 'top', supModule: [], tabStyle: 'line', width: 24}
- item.subtabs.forEach(tab => {
- tab.components[0].subtype = 'normaltable'
- tab.components[0].width = 24
- tab.components[0].wrap.width = 24
- tab.components[0].wrap.name = tab.components[0].name
- if (tab.components[0].setting.useMSearch === 'true') {
- useMSearch = true
- }
-
- tab.components[0].action.forEach(btn => {
+ if (clear) {
+ _config.components = []
+ } else {
+ _config.components.forEach((item, i) => {
+ if (item.type === 'tabs') {
+ item.name = '鏍囩缁�' + i
+ item.width = 24
+ item.subtype = 'tabs'
+ item.setting = {autoSwitch: 'false', blacklist: [], name: item.name, position: 'top', supModule: [], tabStyle: 'line', width: 24}
+
+ item.subtabs.forEach(tab => {
+ tab.components[0].subtype = 'normaltable'
+ tab.components[0].width = 24
+ tab.components[0].wrap.width = 24
+ tab.components[0].wrap.name = tab.components[0].name
+ if (tab.components[0].setting.useMSearch === 'true') {
+ useMSearch = true
+ }
+
+ tab.components[0].action.forEach(btn => {
+ if (btn.OpenType === 'popview' && btn.config) {
+ btn.config.Template = 'CustomPage'
+ if (btn.config.components[0]) {
+ btn.config.components[0].subtype = 'normaltable'
+ }
+ }
+ })
+ tab.components[0].cols = tab.components[0].cols.filter(col => !(col.field && col.Hide === 'true'))
+ tab.components[0].cols.forEach(col => {
+ if (col.type !== 'custom') return
+ col.elements.forEach(btn => {
+ if (btn.OpenType === 'popview' && btn.config) {
+ btn.config.Template = 'CustomPage'
+ if (btn.config.components[0]) {
+ btn.config.components[0].subtype = 'normaltable'
+ }
+ }
+ })
+ })
+ })
+ } else {
+ item.subtype = 'normaltable'
+ item.width = 24
+ item.wrap.width = 24
+ item.wrap.name = item.name
+ item.action.forEach(btn => {
if (btn.OpenType === 'popview' && btn.config) {
btn.config.Template = 'CustomPage'
if (btn.config.components[0]) {
@@ -83,8 +129,8 @@
}
}
})
- tab.components[0].cols = tab.components[0].cols.filter(col => !(col.field && col.Hide === 'true'))
- tab.components[0].cols.forEach(col => {
+ item.cols = item.cols.filter(col => !(col.field && col.Hide === 'true'))
+ item.cols.forEach(col => {
if (col.type !== 'custom') return
col.elements.forEach(btn => {
if (btn.OpenType === 'popview' && btn.config) {
@@ -95,34 +141,9 @@
}
})
})
- })
- } else {
- item.subtype = 'normaltable'
- item.width = 24
- item.wrap.width = 24
- item.wrap.name = item.name
- item.action.forEach(btn => {
- if (btn.OpenType === 'popview' && btn.config) {
- btn.config.Template = 'CustomPage'
- if (btn.config.components[0]) {
- btn.config.components[0].subtype = 'normaltable'
- }
- }
- })
- item.cols = item.cols.filter(col => !(col.field && col.Hide === 'true'))
- item.cols.forEach(col => {
- if (col.type !== 'custom') return
- col.elements.forEach(btn => {
- if (btn.OpenType === 'popview' && btn.config) {
- btn.config.Template = 'CustomPage'
- if (btn.config.components[0]) {
- btn.config.components[0].subtype = 'normaltable'
- }
- }
- })
- })
- }
- })
+ }
+ })
+ }
if (useMSearch) {
let cell = {
--
Gitblit v1.8.0