From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14

---
 src/menu/components/card/cardcellcomponent/index.jsx |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 9459118..756e8a2 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -2,6 +2,7 @@
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
 import { Modal, Button } from 'antd'
+import moment from 'moment'
 
 import asyncComponent from '@/utils/asyncComponent'
 import { getCardCellForm } from './formconfig'
@@ -75,7 +76,7 @@
   }
 
   UNSAFE_componentWillReceiveProps(nextProps) {
-    if (this.props.side !== nextProps.side) {
+    if (this.props.side !== nextProps.side && nextProps.side) {
       this.setState({
         elements: fromJS(nextProps.elements).toJS()
       })
@@ -180,12 +181,6 @@
   getStyle = (style) => {
     const { card, elements } = this.state
 
-    // if (card.eleType === 'button') {
-    //   if ((style.paddingLeft || style.paddingRight) && !style.width) {
-    //     style.width = 'auto'
-    //   }
-    // }
-
     let _card = this.resetCardStyle(card, style)
 
     let _elements = elements.map(cell => {
@@ -283,7 +278,7 @@
    * @description 鎸夐挳缂栬緫锛岃幏鍙栨寜閽〃鍗曚俊鎭�
    */
   handleAction = (card) => {
-    const { cards } = this.props
+    const { cards, side } = this.props
 
     let usefulFields = sessionStorage.getItem('permFuncField')
     if (usefulFields) {
@@ -322,11 +317,11 @@
       })
     } else {
       let anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
-  
+
       this.setState({
         actvisible: true,
         card: card,
-        formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors)
+        formlist: getActionForm(card, functip, cards, usefulFields, modules, anchors, side)
       })
     }
   }
@@ -361,6 +356,13 @@
     const { elements } = this.state
 
     this.elementFormRef.handleConfirm().then(res => {
+      if (res.width % 0.5) {
+        res.width = parseInt(res.width / 0.5) * 0.5
+      }
+      if (res.width % 1) {
+        res.width = (res.width + '').replace(/.5/, 'x')
+      }
+
       let _elements = elements.map(cell => {
         if (cell.uuid === res.uuid) {
           res.style = cell.style || {}
@@ -436,17 +438,7 @@
         if (cell.uuid === res.uuid) {
           res.eleType = cell.eleType || null
           res.style = cell.style || null
-          // res.modal = cell.modal || null
-          // res.config = cell.config || null
           res.wrapStyle = cell.wrapStyle || null
-          // res = {...cell, ...res}
-
-          // if (!res.control) {
-          //   delete res.controlField
-          //   delete res.controlVal
-          // }
-          
-          // delete res.focus
 
           if (res.OpenType === 'form') {
             if (cell.OpenType !== 'form') {
@@ -458,12 +450,22 @@
             if (res.show === 'link' || res.show === 'icon') {
               style.color = color[cl]
               style.backgroundColor = 'transparent'
+            } else if (res.class === 'default') {
+              style.color = 'rgba(0, 0, 0, 0.65)'
+              style.backgroundColor = '#fff'
+              style.borderColor = '#d9d9d9'
+            } else if (res.class.indexOf('border') > -1) {
+              style.color = color[cl]
+              style.backgroundColor = '#fff'
+              style.borderColor = color[cl]
             } else {
               style.color = '#ffffff'
               style.backgroundColor = color[cl]
             }
             res.style = {...res.style, ...style}
           }
+
+          res.updateTime = moment().format('YYYY-MM-DD HH:mm')
 
           return res
         }
@@ -521,6 +523,7 @@
       let _elements = elements.map(cell => {
         if (cell.uuid === card.uuid) {
           cell.verify = res
+          cell.updateTime = moment().format('YYYY-MM-DD HH:mm')
         }
 
         return cell
@@ -609,10 +612,9 @@
   }
 
   dropButton = (id) => {
-    const { cards, cardCell } = this.props
+    const { cards } = this.props
 
     if (!cards.action) return
-    if (cardCell.type === 'custom') return
 
     let index = cards.action.findIndex(item => item.uuid === id)
 
@@ -706,6 +708,7 @@
       return <VerifyCard
         card={card}
         config={cards}
+        side={side || ''}
         columns={side === 'sub' ? cards.subColumns : cards.columns}
         wrappedComponentRef={(inst) => this.verifyRef = inst}
       />
@@ -735,7 +738,7 @@
     const { elements, visible, actvisible, profVisible, card, record } = this.state
 
     return (
-      <div className="model-menu-card-cell-list">
+      <div className={'model-menu-card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '') }>
         <DragElement
           list={elements}
           parent={cardCell}
@@ -784,7 +787,7 @@
             destroyOnClose
           >
             <ActionForm
-              type={cards.type === 'balcony' ? '' : 'card'}
+              type={cards.type === 'balcony' || cardCell.$cardType === 'extendCard' ? '' : 'card'}
               card={card}
               formlist={this.state.formlist}
               inputSubmit={this.handleActionSubmit}

--
Gitblit v1.8.0