From 325aa13d3b61d1c066f8fcab107003ef36713df3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 10:20:09 +0800
Subject: [PATCH] 2025-01-16

---
 src/menu/components/card/cardcomponent/index.jsx |  244 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 203 insertions(+), 41 deletions(-)

diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index c4bb5f3..ea2add7 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -12,8 +12,10 @@
 import MKEmitter from '@/utils/events.js'
 import './index.scss'
 
+const { confirm } = Modal
+
 const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
+const CardCellComponent = asyncComponent(() => import('@/menu/components/card/cardcellcomponent'))
 const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
 const PasteController = asyncIconComponent(() => import('@/components/paste'))
 
@@ -31,6 +33,7 @@
     formlist: null,        // 璁剧疆琛ㄥ崟淇℃伅
     elements: null,        // 缂栬緫缁�
     side: 'front',
+    timestamp: '',
     appType: sessionStorage.getItem('appType'),
     visible: false
   }
@@ -42,6 +45,7 @@
     const { card } = this.props
 
     this.setState({
+      timestamp: new Date().getTime() + '',
       card: fromJS(card).toJS(),
       elements: fromJS(card.elements).toJS(),
     })
@@ -115,10 +119,11 @@
       _elements = fromJS(card.backElements).toJS()
     }
 
-    this.setState({side: _side, elements: _elements})
+    this.setState({side: _side, elements: _elements, timestamp: new Date().getTime() + ''})
   }
   
   addElement = () => {
+    const { cards } = this.props
     const { card } = this.state
 
     let newcard = {}
@@ -128,6 +133,12 @@
     newcard.eleType = 'text'
     newcard.datatype = 'dynamic'
     newcard.height = 1
+
+    if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header') {
+      newcard.datatype = 'static'
+    } else if (cards.subtype === 'propcard' && cards.wrap.datatype === 'static') {
+      newcard.datatype = 'static'
+    }
 
     // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
     MKEmitter.emit('cardAddElement', card.uuid, newcard)
@@ -148,7 +159,7 @@
     const { card, side } = this.state
 
     let _style = null
-    let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow']
+    let options = ['height', 'background', 'border', 'padding', 'margin', 'shadow', 'clear', 'overflow']
     if (side === 'front') {
       _style = card.style ? fromJS(card.style).toJS() : {}
     } else if (side === 'back') {
@@ -188,6 +199,37 @@
   updateSetting = (res) => {
     const { card, side, appType } = this.state
 
+    if (card.$cardType === 'extendCard' && res.cardRole === 'header') {
+      let _card = {...card, setting: res}
+
+      let originLength = _card.elements.length
+      _card.elements = _card.elements.filter(item => item.eleType === 'text')
+      _card.backElements = []
+
+      delete _card.menus
+
+      if (_card.elements.length < originLength) {
+        const that = this
+
+        confirm({
+          title: '琛ㄦ牸澶翠粎鏀寔鏂囨湰锛岀‘瀹氳鍒囨崲鍗$墖瑙掕壊鍚�?',
+          content: '',
+          okText: '纭畾',
+          cancelText: '鍙栨秷',
+          onOk() {
+            that.setState({ card: _card, side: 'front', timestamp: new Date().getTime() + '', elements: fromJS(_card.elements).toJS() })
+            that.props.updateElement(_card)
+          },
+          onCancel() {}
+        })
+      } else {
+        this.setState({ card: _card, side: 'front' })
+        this.props.updateElement(_card)
+      }
+
+      return
+    }
+
     if (appType === '' && res.menu) {
       let list = null
       try {
@@ -225,6 +267,7 @@
     if (side === 'back' && res.type === 'simple') {
       this.setState({
         side: 'front',
+        timestamp: new Date().getTime() + '',
         elements: fromJS(_card.elements).toJS()
       })
     }
@@ -232,13 +275,132 @@
     this.props.updateElement(_card)
   }
 
+  updateFields = (elements, resolve, type) => {
+    const { card, side } = this.state
+
+    let items = elements
+
+    if (type === 'form') {
+      items = []
+
+      elements.forEach(item => {
+        let cell = {
+          uuid: Utils.getuuid(),
+          eleType: 'text',
+          height: 1,
+          innerHeight: 21,
+          prefix: item.label ? item.label + ': ' : '',
+          datatype: item.field ? 'dynamic' : 'static',
+          field: item.field || '',
+          width: item.span || 12,
+          value: '',
+          style: {marginBottom: '15px'}
+        }
+
+        if (item.type === 'number') {
+          cell.eleType = 'number'
+          cell.decimal = typeof(item.decimal) === 'number' ? item.decimal : ''
+        }
+
+        items.push(cell)
+      })
+    }
+
+    if (items.length === 0) {
+      resolve({status: false, message: '鍏冪礌涓嶅彲涓虹┖锛�'})
+      return
+    }
+
+    let _card = { ...card }
+    let _card2 = { ...card }
+    let pass = false
+
+    if (side === 'back') {
+      if (!_card.backElements || _card.backElements.length === 0) {
+        _card.backElements = items
+        pass = true
+      } else {
+        _card.backElements = items
+        _card2.backElements = [...card.backElements, ...items]
+      }
+    } else {
+      if (!_card.elements || _card.elements.length === 0) {
+        _card.elements = items
+        pass = true
+      } else {
+        _card.elements = items
+        _card2.elements = [...card.elements, ...items]
+      }
+    }
+
+    if (pass) {
+      this.setState({
+        card: _card,
+        timestamp: new Date().getTime() + '',
+        elements: side === 'back' ? fromJS(_card.backElements).toJS() : fromJS(_card.elements).toJS()
+      })
+
+      this.props.updateElement(_card)
+    } else {
+      const that = this
+      const _modal = confirm({
+        title: '鍗$墖涓凡瀛樺湪鍏冪礌锛岃閫夋嫨瑕佽繘琛岀殑鎿嶄綔銆�',
+        className: 'mk-confirm-modal',
+        content: <div className="footer">
+          <Button key="cancel" onClick={() => _modal.destroy()}>鍙栨秷</Button>
+          <Button key="replace" className="mk-border-purple" onClick={() => {
+            that.setState({
+              card: _card,
+              timestamp: new Date().getTime() + '',
+              elements: side === 'back' ? fromJS(_card.backElements).toJS() : fromJS(_card.elements).toJS()
+            })
+      
+            that.props.updateElement(_card)
+            _modal.destroy()
+          }}>鏇挎崲</Button>
+          <Button key="confirm" className="mk-border-green" onClick={() => {
+            that.setState({
+              card: _card2,
+              timestamp: new Date().getTime() + '',
+              elements: side === 'back' ? fromJS(_card2.backElements).toJS() : fromJS(_card2.elements).toJS()
+            })
+      
+            that.props.updateElement(_card2)
+            _modal.destroy()
+          }}>娣诲姞</Button>
+        </div>
+      })
+    }
+
+    resolve({status: true})
+  }
+
   paste = (element, resolve) => {
     const { card } = this.state
 
+    if (['simpleform', 'forms', 'formgroup', 'cardcell'].includes(element.copyType)) {
+      if (element.copyType === 'simpleform') {
+        this.updateFields(element.subcards[0].fields, resolve, 'form')
+      } else if (element.copyType === 'forms') {
+        this.updateFields(element.fields, resolve, 'form')
+      } else if (element.copyType === 'formgroup') {
+        this.updateFields(element.fields, resolve, 'form')
+      } else {
+        this.updateFields(element.elements, resolve)
+      }
+      return
+    }
+
     let _uuid = Utils.getuuid()
     
+    if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header' && element.eleType !== 'text') {
+      resolve({status: false, message: '琛ㄦ牸澶翠粎鏀寔鏂囨湰鍏冪礌锛�'})
+      return
+    }
+
     if (element.copyType === 'action') {
       element.eleType = 'button'
+      element.width = element.width || element.width === 0 ? element.width : 12
     }
 
     element.uuid = _uuid
@@ -255,47 +417,19 @@
     const { card, appType } = this.state
 
     if (card.setting.click === 'menu' && card.setting.menu) {
-      if (['IM'].includes(card.setting.menu)) {
-        if (!sessionStorage.getItem('instantMessage')) return
-        
-        let param = {
-          MenuID: sessionStorage.getItem('instantMessage'),
-          copyMenuId: '',
-          type: 'view'
-        }
-    
-        param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
-    
-        MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
-      } else {
-        MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
-      }
+      MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
     } else if (card.setting.click === 'menus' && card.menus && card.menus.length > 0 && cards.subtype === 'datacard' && appType) {
       this.setState({visible: true})
     }
   }
 
   changeMenu = (MenuId) => {
-    if (MenuId === 'IM') {
-      if (!sessionStorage.getItem('instantMessage')) return
-
-      let param = {
-        MenuID: sessionStorage.getItem('instantMessage'),
-        copyMenuId: '',
-        type: 'view'
-      }
-  
-      param = window.btoa(window.encodeURIComponent(JSON.stringify(param)))
-  
-      MKEmitter.emit('changeEditMenu', {routerUrl: '/imdesign/' + param})
-    } else {
-      MKEmitter.emit('changeEditMenu', {MenuID: MenuId})
-    }
+    MKEmitter.emit('changeEditMenu', {MenuID: MenuId})
   }
 
   render() {
     const { cards } = this.props
-    const { card, elements, side, visible } = this.state
+    const { card, elements, side, visible, timestamp } = this.state
 
     let _style = {...card.style}
 
@@ -311,20 +445,48 @@
     }
     _style = resetStyle(_style)
 
+    let checkAll = ''
+    if ((cards.subtype === 'datacard' || cards.subtype === 'dualdatacard') && card.$cardType === 'extendCard') {
+      checkAll = card.setting.checkAll === 'show' ? ' mk-checkable mk-extend-card' : ''
+      if (checkAll && cards.wrap.selStyle === 'check square') {
+        checkAll = ' mk-checkable square mk-extend-card'
+      }
+    } else if (cards.subtype === 'datacard') {
+      if (cards.wrap.selStyle === 'check') {
+        checkAll = ' mk-checkable'
+      } else if (cards.wrap.selStyle === 'check square') {
+        checkAll = ' mk-checkable square'
+      }
+    }
+
+    let tablerole = ''
+    if (card.$cardType === 'extendCard' && card.setting.cardRole === 'header') {
+      tablerole = ' mk-table-header'
+    }
+
+    let _style_ = null
+
+    if (card.style.clear === 'left') {
+      _style_ = {clear: 'left'}
+    } else if (card.style.clear === 'right') {
+      _style_ = {float: 'right'}
+    }
+
     return (
-      <Col span={card.setting.width || 6}>
-        <div className={'card-item ' + (card.setting.btnControl || '')} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
-          <CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
+      <Col span={card.setting.width || 6} style={_style_}>
+        <div className={'card-item ' + (card.setting.btnControl || '') + checkAll + tablerole} style={_style} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
+          <span className="circle-select"></span>
+          <CardCellComponent cards={cards} cardCell={card} side={side} timestamp={timestamp} elements={elements} updateElement={this.updateCard}/>
           <div className="card-control" onDoubleClick={(e) => e.stopPropagation()}>
             <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
               <div className="mk-popover-control">
                 <PlusOutlined className="plus" title="娣诲姞鍏冪礌" onClick={this.addElement} />
-                <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} />
-                <NormalForm title="鍗$墖璁剧疆" width={800} update={this.updateSetting} getForms={this.getSettingForms}>
+                {!tablerole ? <PlusSquareOutlined className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} /> : null}
+                <NormalForm title={cards.subtype === 'datacard' && card.$cardType !== 'extendCard' ? '寰幆鍗$墖璁剧疆' : '灞炴�у崱鐗囪缃�'} width={950} update={this.updateSetting} getForms={this.getSettingForms}>
                   <EditOutlined className="edit" title="缂栬緫"/>
                 </NormalForm>
                 <CopyComponent type="cardcell" card={card}/>
-                <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
+                <PasteController options={['action', 'customCardElement', 'simpleform', 'forms', 'formgroup', 'cardcell']} updateConfig={this.paste} />
                 <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} />
                 <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
                   <div className="mk-popover-control">
@@ -338,7 +500,7 @@
                 {card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
               </div>
             } trigger="hover">
-              <ToolOutlined />
+              <ToolOutlined style={cards.subtype === 'datacard' && card.$cardType === 'extendCard' ? {color: '#26C281'} : null}/>
             </Popover>
           </div>
         </div>

--
Gitblit v1.8.0