From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/dragtitle/card.jsx | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/form/dragtitle/card.jsx b/src/menu/components/form/dragtitle/card.jsx
index 48e07f4..63a8d4b 100644
--- a/src/menu/components/form/dragtitle/card.jsx
+++ b/src/menu/components/form/dragtitle/card.jsx
@@ -1,10 +1,17 @@
import React from 'react'
+import { fromJS } from 'immutable'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Popover } from 'antd'
+import { Popover } from 'antd'
+import { CloseOutlined, EditOutlined } from '@ant-design/icons'
+import getForm from './options'
+import asyncIconComponent from '@/utils/asyncIconComponent'
import './index.scss'
-const Card = ({ id, card, active, moveCard, findCard, editCard, closeCard, selectCard }) => {
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
+const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
+
+const Card = ({ id, card, active, moveCard, findCard, closeCard, selectCard, updateGroup }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'form', id, originalIndex },
@@ -26,11 +33,7 @@
}
}
})
- const opacity = isDragging ? 0 : 1
-
- const edit = () => {
- editCard(id)
- }
+ const opacity = isDragging ? 0.5 : 1
const close = () => {
closeCard(id)
@@ -40,11 +43,39 @@
selectCard(id)
}
+ const getForms = () => {
+ return getForm(card)
+ }
+
+ const updateSetting = (res) => {
+ let _card = fromJS(card).toJS()
+
+ if (res.prevEnable) {
+ _card.prevButton.enable = res.prevEnable
+ delete res.prevEnable
+ }
+ if (res.subEnable) {
+ _card.subButton.enable = res.subEnable
+ delete res.subEnable
+ }
+ if (res.nextEnable) {
+ _card.nextButton.enable = res.nextEnable
+ delete res.nextEnable
+ }
+
+ _card.setting = res
+
+ updateGroup(_card)
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" type="edit" onClick={edit} />
- <Icon className="close" type="close" onClick={close} />
+ <NormalForm title="鍒嗙粍缂栬緫" width={850} update={updateSetting} getForms={getForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
+ <CopyComponent type="formgroup" card={card}/>
+ <CloseOutlined className="close" type="close" onClick={close} />
</div>
} trigger="hover">
<div className={'page-card ' + (active ? 'active' : '')} onClick={select} style={{ opacity: opacity}}>
--
Gitblit v1.8.0