From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/module/voucher/index.jsx | 110 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/src/menu/components/module/voucher/index.jsx b/src/menu/components/module/voucher/index.jsx
index e150d22..4d26cc9 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,9 +32,6 @@
let _card = {
uuid: card.uuid,
type: card.type,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
- dataName: card.dataName || '',
format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
@@ -43,26 +39,19 @@
name: '鍑瘉',
subtype: card.subtype,
// setting: { interType: 'system' },
- wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'edit' },
- style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px' },
+ wrap: { name: '鍑瘉', title: '', width: card.width || 12, type: 'createVoucher', space: 30 },
+ style: { marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px', paddingBottom: '20px' },
headerStyle: {},
columns: [],
scripts: [],
}
-
- this.setState({
- card: _card
- })
- this.props.updateConfig(_card)
+
+ this.updateComponent(_card)
} else {
this.setState({
card: fromJS(card).toJS()
})
}
- }
-
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
}
shouldComponentUpdate (nextProps, nextState) {
@@ -76,51 +65,32 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
/**
* @description 鍗＄墖琛屽灞備俊鎭洿鏂帮紙鏁版嵁婧愶紝鏍峰紡绛夛級
*/
- updateComponent = (component) => {
+ updateComponent = (card) => {
+ card.width = card.wrap.width
+ card.name = card.wrap.name
+
this.setState({
- card: component
+ card: card
})
- component.width = component.wrap.width
- component.name = component.wrap.name
-
- this.props.updateConfig(component)
+ this.props.updateConfig(card)
}
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', 'minHeight'], card.style, this.getStyle)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
-
- if (comIds[0] !== card.uuid || comIds.length !== 1) return
-
- let _card = {...card, style}
-
- this.setState({
- card: _card
- })
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- this.props.updateConfig(_card)
- }
-
- /**
- * @description 鏇存柊鎼滅储鏉′欢閰嶇疆淇℃伅
- */
- updateconfig = (config) => {
- this.setState({
- card: config
- })
- this.props.updateConfig(config)
+ this.updateComponent(_card)
}
getWrapForms = () => {
@@ -131,7 +101,6 @@
updateWrap = (res) => {
let _card = {...this.state.card, wrap: res}
- _card.switchable = res.type !== 'edit'
this.updateComponent(_card)
}
@@ -141,7 +110,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}>
@@ -154,7 +122,49 @@
<ToolOutlined />
</Popover>
<div className="voucher-box">
- jjj
+ {card.wrap.type === 'createVoucher' ? <div className="voucher-header" style={{padding: `10px ${card.wrap.space || 0}px`}}>
+ <Button>淇濆瓨骞舵柊澧�</Button>
+ <Button>淇濆瓨</Button>
+ <Button>鎵撳嵃</Button>
+ <Button>鏇村</Button>
+ </div> : null}
+ {card.wrap.type === 'checkVoucher' ? <div className="voucher-header" style={{padding: `10px ${card.wrap.space || 0}px`}}>
+ <Button>淇濆瓨</Button>
+ <Button>鎵撳嵃</Button>
+ <Button>瀹℃牳</Button>
+ <Button>鍏抽棴</Button>
+ </div> : null}
+ <div className="voucher-body" style={{padding: `0px ${card.wrap.space || 0}px`}}>
+ {card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <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> : null}
+ {card.wrap.type === 'createTemp' || card.wrap.type === 'checkTemp' ? <div className="pre-wrap">
+ <div className="temp-code">
+ 妯℃澘鍚嶇О:
+ <div> </div>
+ </div>
+ <div className="temp-code">
+ 妯℃澘绫诲瀷:
+ <div>鏃ュ父鏀嚭<DownOutlined/></div>
+ </div>
+ <Button>鍏抽棴</Button>
+ <Button>淇濆瓨</Button>
+ </div> : null}
+ <VoucherTable config={card}/>
+ {card.wrap.type === 'createVoucher' || card.wrap.type === 'checkVoucher' ? <div className="user">鍒跺崟浜猴細</div> : null}
+ </div>
</div>
</div>
)
--
Gitblit v1.8.0