From 159940642620c547bb020b5cdf4bf16a3dfae15f Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 10 九月 2020 23:37:17 +0800 Subject: [PATCH] 2020-09-10 --- src/menu/actioncomponent/actionform/index.jsx | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/menu/actioncomponent/actionform/index.jsx b/src/menu/actioncomponent/actionform/index.jsx index a3e887b..6a579a9 100644 --- a/src/menu/actioncomponent/actionform/index.jsx +++ b/src/menu/actioncomponent/actionform/index.jsx @@ -673,15 +673,13 @@ if (values.OpenType === 'excelIn') { values.position = 'toolbar' } else if (values.OpenType === 'excelOut') { - if (values.intertype === 'inner' && !values.innerFunc) { - if ((setting.interType === 'inner' && setting.innerFunc) || setting.interType === 'outer') { - notification.warning({ - top: 92, - message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒', - duration: 5 - }) - return - } + if (values.intertype === 'system' && setting.interType !== 'system') { + notification.warning({ + top: 92, + message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄦ暟鎹簮锛屽鍑篍xcel浣跨敤鍐呴儴鎺ュ彛鏃讹紝闇�鑷畾涔夊唴閮ㄥ嚱鏁帮紒', + duration: 5 + }) + return } values.position = 'toolbar' -- Gitblit v1.8.0