From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21

---
 src/menu/components/card/cardcellcomponent/dragaction/action.jsx |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
index 8aa9cc2..4db573b 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/action.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useDrag, useDrop } from 'react-dnd'
 import { Popover, Button, Switch, Checkbox } from 'antd'
-import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, ProfileOutlined, WarningOutlined } from '@ant-design/icons'
+import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, ProfileOutlined, WarningOutlined, PlusOutlined, MinusOutlined } from '@ant-design/icons'
 
 import { resetStyle } from '@/utils/utils-custom.js'
 import MkIcon from '@/components/mk-icon'
@@ -18,7 +18,13 @@
   const [, drop] = useDrop({
     accept: 'action',
     canDrop: () => true,
-    drop({ id: draggedId }) {
+    drop(item) {
+      const { id: draggedId } = item
+
+      if (item.$init) {
+        item.overIndex = id
+      }
+
       if (!draggedId || draggedId === id) return
 
       const { index: originIndex } = findCard(draggedId)
@@ -33,6 +39,9 @@
   let warning = null
   if (['pop', 'prompt', 'exec', 'form'].includes(card.OpenType)) {
     hasProfile = true
+    if (card.formType === 'count_line') {
+      hasProfile = false
+    }
   } else if (card.OpenType === 'excelIn' || card.OpenType === 'excelOut') {
     hasProfile = true
   } else if (card.funcType === 'print') {
@@ -47,15 +56,41 @@
   if (card.OpenType === 'form') {
     if (card.formType === 'switch') {
       btnElement = (<Switch style={_style} className={card.size === 'large' ? 'ant-switch-large' : ''} size={card.size} checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''}/>)
-    } else {
+    } else if (card.formType === 'counter' || card.formType === 'count_line') {
+      btnElement = (<div style={_style} className={'mk-counter ' + card.size}><span><MinusOutlined /></span><span>1</span><span><PlusOutlined /></span></div>)
+    } else if (card.formType === 'radio') {
       btnElement = (<Checkbox style={_style}></Checkbox>)
+    } else {
+      btnElement = (<Button style={_style} type="link"><MkIcon type="scan"/></Button>)
     }
   } else if (card.show === 'icon') {
     btnElement = (<Button style={_style} type="link"><MkIcon type={card.icon}/>{warning}</Button>)
   } else if (card.show === 'link') {
-    btnElement = (<Button style={_style} type="link">{card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>)
+    btnElement = (<Button style={_style} type="link">{card.showName || card.label}{card.icon ? <MkIcon type={card.icon}/> : null}{warning}</Button>)
   } else {
-    btnElement = (<Button style={_style}>{card.icon ? <MkIcon type={card.icon}/> : null}{card.label}{warning}</Button>)
+    btnElement = (<Button style={_style}>{card.icon ? <MkIcon type={card.icon}/> : null}{card.showName || card.label}{warning}</Button>)
+  }
+
+  let _style_ = {opacity: isDragging ? 0.3 : 1, ...card.wrapStyle}
+
+  if (card.style && card.style.clear === 'left') {
+    _style_.clear = 'left'
+  } else if (card.style && card.style.clear === 'right') {
+    _style_.float = 'right'
+  }
+
+  let className = card.width || 0
+  if (card.hidden === 'true') {
+    className += ' mk-hidden'
+  }
+  if (card.checkType) {
+    className += ' ' + card.checkType
+  }
+
+  let updateTime = null
+
+  if (card.updateTime && card.updateTime.indexOf(window.GLOB.curDate) > -1) {
+    updateTime = card.updateTime.substr(11)
   }
 
   return (
@@ -66,12 +101,11 @@
         <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
         <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} />
         {hasProfile ? <ProfileOutlined className="profile" title="setting" onClick={() => profileCard(id)} /> : null}
+        {updateTime}
       </div>
     } trigger="hover">
-      <div ref={node => drag(drop(node))} className={'ant-col card-button-cell ant-col-' + card.width} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
-        <div style={{opacity: isDragging ? 0 : 1, ...card.wrapStyle}}>
-          {btnElement}
-        </div>
+      <div ref={node => drag(drop(node))} style={_style_} className={'ant-col card-button-cell ant-col-' + className} onDoubleClick={(e) => {e.stopPropagation(); doubleClickCard(id)}}>
+        {btnElement}
       </div>
     </Popover>
   )

--
Gitblit v1.8.0