From 1e4a7720c748bc0206b02b30f4a2e0b3dafb54f3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 二月 2024 13:31:13 +0800
Subject: [PATCH] 2024-02-19

---
 src/menu/components/share/searchcomponent/dragsearch/card.jsx |  152 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index d0d41c2..6061187 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -1,12 +1,14 @@
 import React from 'react'
 import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, Popover, Form } from 'antd'
+import { Select, DatePicker, Input, Popover, Form, Switch, Checkbox } from 'antd'
+import { EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
 import moment from 'moment'
 
 import DateGroup from '@/menu/components/search/main-search/dategroup'
 import './index.scss'
 
 const { MonthPicker, WeekPicker, RangePicker } = DatePicker
+const { Search } = Input
 
 const Card = ({ id, card, moveCard, findCard, copyCard, editCard, delCard }) => {
   const originalIndex = findCard(id).index
@@ -19,83 +21,131 @@
   const [, drop] = useDrop({
     accept: 'search',
     canDrop: () => true,
-    drop: ({ id: draggedId }) => {
-      if (!draggedId || draggedId === id) return
-
-      const { index: originIndex } = findCard(draggedId)
-      if (originIndex === -1) return
-
-      const { index: overIndex } = findCard(id)
-      moveCard(draggedId, overIndex)
+    drop: (item) => {
+      const { id: draggedId, originalIndex } = item
+      
+      if (originalIndex === undefined) {
+        item.dropTargetId = id
+      } else {
+        if (!draggedId || draggedId === id) return
+  
+        const { index: originIndex } = findCard(draggedId)
+        if (originIndex === -1) return
+  
+        const { index: overIndex } = findCard(id)
+        moveCard(draggedId, overIndex)
+      }
     }
   })
-  const opacity = isDragging ? 0 : 1
+  const opacity = isDragging ? 0.5 : 1
 
   let _defaultValue = '' // 涓嬫媺鎼滅储銆佹椂闂磋寖鍥寸被鍨嬶紝鍒濆鍊奸渶瑕侀澶勭悊
 
   if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
-    if (card.initval) {
-      let _option = card.options.filter(option => option.Value === card.initval)[0]
-      if (_option) {
-        _defaultValue = _option.Text || ''
-      } else {
-        _defaultValue = ''
-      }
-    } else if (card.setAll === 'true') {
-      _defaultValue = '鍏ㄩ儴'
+    let _option = card.options.filter(option => option.Value === card.initval)[0]
+    if (_option) {
+      _defaultValue = _option.Text || ''
+    } else {
+      _defaultValue = ''
     }
   } else if (card.type === 'daterange') {
     _defaultValue = [null, null]
-    if (card.initval) {
+    if (card.initval === 'week') {
+      _defaultValue = [moment().startOf('week'), moment().endOf('week')]
+    } else if (card.initval === 'month') {
+      _defaultValue = [moment().startOf('month'), moment().endOf('month')]
+    } else if (card.initval === 'lastMonth') {
+      _defaultValue = [moment().subtract(1, 'months').startOf('month'), moment().subtract(1, 'months').endOf('month')]
+    } else if (card.initval) {
       try {
         let _initval = JSON.parse(card.initval)
         _defaultValue = [moment().subtract(_initval[0], 'days'), moment().subtract(_initval[1], 'days')]
-      } catch {
+      } catch (e) {
         _defaultValue = [null, null]
       }
     }
   }
 
+  let formItem = null
+  let type = ''
+  if (card.type === 'text') {
+    if (card.inputType !== 'search') {
+      formItem = <Input placeholder={card.label} value={card.initval} />
+    } else {
+      formItem = <Search placeholder={card.label} value={card.initval} enterButton/>
+    }
+
+  } else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
+    formItem = <Select placeholder={card.label} value={_defaultValue}></Select>
+  } else if (card.type === 'date') {
+    let format = 'YYYY-MM-DD'
+    if (card.precision === 'hour') {
+      format = 'YYYY-MM-DD HH'
+    } else if (card.precision === 'minute') {
+      format = 'YYYY-MM-DD HH:mm'
+    } else if (card.precision === 'second') {
+      format = 'YYYY-MM-DD HH:mm:ss'
+    }
+    formItem = <DatePicker format={format} placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'days') : null} />
+  } else if (card.type === 'dateweek') {
+    formItem = <WeekPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} />
+  } else if (card.type === 'datemonth') {
+    formItem = <MonthPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'month') : null} />
+  } else if (card.type === 'daterange') {
+    let format = 'YYYY-MM-DD'
+    if (card.precision === 'hour') {
+      format = 'YYYY-MM-DD HH'
+    } else if (card.precision === 'minute') {
+      format = 'YYYY-MM-DD HH:mm'
+    } else if (card.precision === 'second') {
+      format = 'YYYY-MM-DD HH:mm:ss'
+    }
+
+    formItem = <RangePicker
+      format={format}
+      className="data-range"
+      placeholder={['BeginTime', 'EndTime']}
+      renderExtraFooter={() => 'extra footer'}
+      value={_defaultValue}
+    />
+  } else if (card.type === 'group') {
+    formItem = <DateGroup card={card} />
+  } else if (card.type === 'switch') {
+    formItem = (<Switch checkedChildren={card.openText || ''} unCheckedChildren={card.closeText || ''} style={{marginTop: '8px'}} checked={card.initval === card.openVal}/>)
+  } else if (card.type === 'check') {
+    formItem = <Checkbox style={{lineHeight: '36px'}} checked={card.initval === card.openVal}>{card.checkTip || ''}</Checkbox>
+  } else if (card.type === 'range') {
+    type = 'range-wrap'
+    let vals = card.initval.split(',')
+    formItem = (<>
+      <Input style={{marginTop: '4px'}} value={vals[0] || ''} />
+      鑷�
+      <Input style={{marginTop: '4px'}} value={vals[1] || ''} />
+    </>)
+  }
+
+  let labelwidth = card.labelwidth || 33.3
+  if (card.labelShow === 'false') {
+    labelwidth = 0
+  }
+
   return (
     <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
       <div className="mk-popover-control">
-        <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
-        <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
-        <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
+        <EditOutlined className="edit" title="缂栬緫" onClick={() => editCard(id)} />
+        <CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
+        <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
       </div>
     } trigger="hover">
-      <div className={'page-card ' + (card.labelShow || '')} style={{ opacity: opacity}}>
+      <div className={`page-card ${type} ${card.labelShow || ''}`} style={{ opacity: opacity}}>
         <div ref={node => drag(drop(node))}>
           <Form.Item
-            labelCol={{xs: { span: 24 }, sm: { span: 8 }}}
-            wrapperCol = {{xs: { span: 24 }, sm: { span: 16 }}}
+            labelCol={{style: {width: labelwidth + '%'}}}
+            wrapperCol={{style: {width: (100 - labelwidth) + '%'}}}
             label={card.labelShow !== 'false' ? card.label : ''}
             required={card.required === 'true'}
           >
-            {card.type === 'text' ?
-              <Input placeholder={card.label} value={card.initval} /> : null
-            }
-            {(card.type === 'multiselect' || card.type === 'select' || card.type === 'link') ?
-              <Select placeholder={card.label} value={_defaultValue}></Select> : null
-            }
-            {card.type === 'date' ?
-              <DatePicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'days') : null} /> : null
-            }
-            {card.type === 'dateweek' ?
-              <WeekPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval * 7, 'days') : null} /> : null
-            }
-            {card.type === 'datemonth' ?
-              <MonthPicker placeholder={card.label} value={card.initval ? moment().subtract(card.initval, 'month') : null} /> : null
-            }
-            {card.type === 'daterange' ?
-              <RangePicker
-                className="data-range"
-                placeholder={['BeginTime', 'EndTime']}
-                renderExtraFooter={() => 'extra footer'}
-                value={_defaultValue}
-              /> : null
-            }
-            {card.type === 'group' ? <DateGroup card={card} /> : null }
+            {formItem}
           </Form.Item>
         </div>
       </div>

--
Gitblit v1.8.0