From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/menu/components/carousel/prop-card/index.jsx | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/src/menu/components/carousel/prop-card/index.jsx b/src/menu/components/carousel/prop-card/index.jsx
index 6459a3d..1795efc 100644
--- a/src/menu/components/carousel/prop-card/index.jsx
+++ b/src/menu/components/carousel/prop-card/index.jsx
@@ -1,20 +1,20 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, notification, Carousel } from 'antd'
+import { Popover, Modal, notification, Carousel } from 'antd'
+import { PlusOutlined, SettingOutlined, EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
+import getWrapForm from '../data-card/options'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
-const WrapComponent = asyncIconComponent(() => import('../data-card/wrapsetting'))
-const CardComponent = asyncComponent(() => import('../cardcomponent'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
+const CardSimpleComponent = asyncComponent(() => import('@/menu/components/card/cardsimplecomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
@@ -30,7 +30,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
@@ -43,7 +42,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
tabId: card.tabId || '',
parentId: card.parentId || '',
format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
@@ -73,6 +71,10 @@
_card.wrap = config.wrap
_card.wrap.name = card.name
_card.style = config.style
+
+ _card.setting = config.setting
+ _card.columns = config.columns
+ _card.scripts = config.scripts
_card.subcards = config.subcards.map(scard => {
scard.uuid = Utils.getuuid()
@@ -327,6 +329,16 @@
this.props.updateConfig(card)
}
+ getWrapForms = () => {
+ const { card } = this.state
+
+ return getWrapForm(card.wrap, card.subtype)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
+ }
+
clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
e.stopPropagation()
@@ -342,22 +354,24 @@
<div className="menu-prop-carousel-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鍗＄墖" onClick={this.addCard} type="plus" />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <PlusOutlined className="plus" title="娣诲姞鍗＄墖" onClick={this.addCard}/>
+ <NormalForm title="杞挱-闈欐�佹暟鎹�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
+ </NormalForm>
<CopyComponent type="propcard" card={card}/>
<PasteComponent config={card} options={['cardcell']} updateConfig={this.updateComponent} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<UserComponent config={card}/>
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
{card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
- {card.wrap.datatype === 'static' ? <Icon style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/> : null}
+ {card.wrap.datatype === 'static' ? <SettingOutlined style={{color: '#eeeeee', cursor: 'not-allowed'}}/> : null}
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined/>
</Popover>
{card.subcards.length > 0 ? <Carousel dotPosition={card.wrap.dotPosition || 'bottom'} effect={card.wrap.effect || 'scrollx'}>
- {card.subcards.map((subcard) => (<CardComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
+ {card.subcards.map((subcard) => (<CardSimpleComponent key={subcard.uuid} cards={card} card={subcard} move={this.move} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
</Carousel> : null}
</div>
)
--
Gitblit v1.8.0