From 34e7681fd12b1c4e4994d3bea1a553870e10bc50 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:58:54 +0800
Subject: [PATCH] 2023-03-11

---
 src/tabviews/custom/components/card/cardItem/index.jsx |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index 224438e..92777c5 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -41,15 +41,17 @@
   }
 
   openView = () => {
-    const { card, data, cards } = this.props
+    const { card, data, cards, onClick } = this.props
 
+    onClick && onClick()
+    
     if (!card.setting.click || data.$disabled) return
 
     if (card.setting.click === 'menus' && cards.subtype === 'datacard' && card.$cardType !== 'extendCard') {
       let menu = null
       
       if (card.menus && card.menus.length > 0) {
-        let s = data[card.setting.menuType] || ''
+        let s = data[card.setting.menuType] + ''
         card.menus.forEach(m => {
           if (s !== m.sign) return
           menu = m
@@ -145,8 +147,10 @@
   }
 
   doubleClick = () => {
-    const { card, data, cards } = this.props
+    const { card, data, cards, onDoubleClick } = this.props
 
+    onDoubleClick && onDoubleClick()
+    
     if (card.setting.click !== 'button' || card.setting.clickType !== 'multi' || data.$disabled) return
 
     if (card.setting.linkbtn) {
@@ -161,15 +165,24 @@
   }
 
   render() {
-    const { card, data, cards } = this.props
+    const { card, data, cards, children } = this.props
     let style = {...card.style}
+
+    let bg = null
 
     if (card.setting.bgField) {
       style.backgroundImage = `url('${data[card.setting.bgField] || ''}')`
     }
 
+    if (style.backgroundImage) {
+      bg = <div className="card-background" style={{backgroundImage: style.backgroundImage}}></div>
+      style.backgroundImage = ''
+    }
+
     return (
-      <div className={'card-item-box ' + (card.setting.btnControl || '')} style={style} onClick={this.openView} onDoubleClick={this.doubleClick}>
+      <div className={'card-item-box ' + (card.setting.btnControl || '') + (card.setting.click ? ' mk-pointer' : '')} style={style} onClick={this.openView} onDoubleClick={this.doubleClick}>
+        {bg}
+        {children}
         <CardCellComponent data={data} cards={cards} cardCell={card} elements={card.elements}/>
         {card.setting.type === 'multi' ? <div className={'back-side ' + card.setting.transform} style={card.backStyle}>
           <CardCellComponent data={data} cards={cards} cardCell={card} elements={card.backElements}/>

--
Gitblit v1.8.0