From d5c3340757ae00a2ad617c4241dfd3792f36e036 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 14 十二月 2020 18:23:42 +0800
Subject: [PATCH] 2020-12-14
---
src/menu/components/share/actioncomponent/index.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/menu/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
similarity index 97%
rename from src/menu/actioncomponent/index.jsx
rename to src/menu/components/share/actioncomponent/index.jsx
index 0075307..a56e70d 100644
--- a/src/menu/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -14,9 +14,9 @@
import ActionForm from './actionform'
import VerifyCard from '@/templates/zshare/verifycard'
import CreateFunc from '@/templates/zshare/createfunc'
-import VerifyPrint from './verifyprint'
-import VerifyExcelIn from './verifyexcelin'
-import VerifyExcelOut from './verifyexcelout'
+import VerifyPrint from '@/templates/sharecomponent/actioncomponent/verifyprint'
+import VerifyExcelIn from '@/templates/sharecomponent/actioncomponent/verifyexcelin'
+import VerifyExcelOut from '@/templates/sharecomponent/actioncomponent/verifyexcelout'
import DragElement from './dragaction'
import './index.scss'
@@ -83,7 +83,7 @@
const { config } = this.props
const { card, actionlist } = this.state
- if (comIds.length !== 2 || comIds[0] !== config.uuid) return
+ if (comIds.length !== 2 || comIds[0] !== config.uuid || comIds[1] === 'header') return
let _card = fromJS(card).toJS()
_card.btnstyle = style
@@ -104,7 +104,7 @@
const { config } = this.props
let _style = element.btnstyle ? fromJS(element.btnstyle).toJS() : {}
- let options = ['font', 'border', 'background']
+ let options = ['font', 'border', 'background', 'margin']
this.setState({
card: element
--
Gitblit v1.8.0