From 04a9e254f765ccea77dad02574a8c6fc45ddafb8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 11:31:46 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/pastecomponent/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/menu/components/share/pastecomponent/index.jsx b/src/menu/components/share/pastecomponent/index.jsx
index cb1bb7b..aa7abd3 100644
--- a/src/menu/components/share/pastecomponent/index.jsx
+++ b/src/menu/components/share/pastecomponent/index.jsx
@@ -7,7 +7,7 @@
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
-import './index.scss'
+// import './index.scss'
const PasteForm = asyncComponent(() => import('@/templates/zshare/pasteform'))
@@ -19,10 +19,6 @@
state = {
visible: false
- }
-
- handleMenuClick = () => {
- this.setState({visible: true})
}
resetconfig = (item, config) => {
@@ -116,9 +112,14 @@
pasteSubmit = () => {
const { options } = this.props
this.pasteFormRef.handleConfirm().then(res => {
-
if (!options.includes(res.copyType)) {
notification.warning({ top: 92, message: '閰嶇疆淇℃伅鏍煎紡閿欒锛�', duration: 5 })
+ return
+ }
+
+ if (!this.props.config) {
+ this.props.updateConfig(res)
+ this.setState({visible: false})
return
}
@@ -181,7 +182,7 @@
})
}
- this.props.updateConfig(config)
+ this.props.updateConfig(config, type)
this.setState({visible: false})
notification.success({
--
Gitblit v1.8.0