From 836722dd114fa35967a5e96be96ba4503ebf8e1d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 十二月 2022 17:29:11 +0800
Subject: [PATCH] 2022-12-29
---
src/menu/components/module/voucher/index.jsx | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/module/voucher/index.jsx b/src/menu/components/module/voucher/index.jsx
index c3167d2..def62fe 100644
--- a/src/menu/components/module/voucher/index.jsx
+++ b/src/menu/components/module/voucher/index.jsx
@@ -1,18 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover } from 'antd'
-import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
+import { Popover, Button } from 'antd'
+import { EditOutlined, ToolOutlined, DeleteOutlined, FontColorsOutlined, DownOutlined, CalendarOutlined } from '@ant-design/icons'
-// import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import MKEmitter from '@/utils/events.js'
import getWrapForm from './options'
+import VoucherTable from './voucherTable'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-// const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
class Voucher extends Component {
static propTpyes = {
@@ -33,18 +32,15 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
- dataName: card.dataName || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
width: card.width || 12,
name: '鍑瘉',
subtype: card.subtype,
- setting: { interType: 'system' },
+ // setting: { interType: 'system' },
wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'edit' },
- style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
+ style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px', paddingBottom: '20px' },
headerStyle: {},
columns: [],
scripts: [],
@@ -58,10 +54,6 @@
}
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -73,7 +65,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
/**
@@ -93,15 +84,11 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'margin', 'shadow', 'clear'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds[0] !== card.uuid || comIds.length !== 1) return
-
- let _card = {...card, style}
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
this.updateComponent(_card)
}
@@ -124,7 +111,6 @@
return (
<div className="menu-voucher-box" style={card.style} id={card.uuid}>
- {/* <NormalHeader config={card} updateComponent={this.updateComponent}/> */}
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<NormalForm title="鍩烘湰璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
@@ -137,7 +123,31 @@
<ToolOutlined />
</Popover>
<div className="voucher-box">
- jjj
+ <div className="voucher-header">
+ <Button className="add-background header-btn">鏂板</Button>
+ <Button className="add-background header-btn">淇濆瓨</Button>
+ <Button className="print-background header-btn">鎵撳嵃</Button>
+ <Button className="system-background header-btn">瀵煎叆</Button>
+ <Button className="out-background header-btn">瀵煎嚭</Button>
+ </div>
+ <div className="voucher-body">
+ <div className="pre-wrap">
+ <div className="voucher-code">
+ <div>璁�<DownOutlined/></div>
+ <div>1</div>
+ 鍙�
+ </div>
+ <div className="voucher-date">
+ 鏃ユ湡锛�<div>璇烽�夋嫨鏃ユ湡 <CalendarOutlined /></div>
+ </div>
+ <div className="voucher-affix">
+ 闄勫崟鎹� <div>2</div> 寮�
+ <Button type="link" className="">闄勪欢</Button>
+ <Button type="link" className="">澶囨敞</Button>
+ </div>
+ </div>
+ <VoucherTable config={card}/>
+ </div>
</div>
</div>
)
--
Gitblit v1.8.0