From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16

---
 src/tabviews/custom/components/card/cardItem/index.jsx |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardItem/index.jsx b/src/tabviews/custom/components/card/cardItem/index.jsx
index aa25ec8..84b441d 100644
--- a/src/tabviews/custom/components/card/cardItem/index.jsx
+++ b/src/tabviews/custom/components/card/cardItem/index.jsx
@@ -53,18 +53,14 @@
         MenuID: menu.MenuID,
         MenuName: menu.MenuName,
         type: menu.tabType,
-        param: {}
+        param: {$BID: data.$$uuid || ''}
       }
 
-      if (card.setting.joint === 'true') {
-        newtab.param.$BID = data.$$uuid || ''
-
-        Object.keys(data).forEach(key => {
-          if (/^\$/.test(key)) return
-          if (key === 'children') return
-          newtab.param[key] = data[key]
-        })
-      }
+      Object.keys(data).forEach(key => {
+        if (/^\$/.test(key)) return
+        if (key === 'children') return
+        newtab.param[key] = data[key]
+      })
 
       MKEmitter.emit('modifyTabs', newtab, true)
     } else if (card.setting.click === 'menu') {
@@ -83,17 +79,13 @@
 
       if (!menu) return
 
-      menu.param = {}
-
-      if (card.setting.joint === 'true') {
-        menu.param.$BID = data.$$uuid || ''
+      menu.param = {$BID: data.$$uuid || ''}
         
-        Object.keys(data).forEach(key => {
-          if (/^\$/.test(key)) return
-          if (key === 'children') return
-          menu.param[key] = data[key]
-        })
-      }
+      Object.keys(data).forEach(key => {
+        if (/^\$/.test(key)) return
+        if (key === 'children') return
+        menu.param[key] = data[key]
+      })
 
       MKEmitter.emit('modifyTabs', menu, true)
     } else if (card.setting.click === 'link') {
@@ -107,6 +99,17 @@
         }
 
         src = src + `${con}id=${data.$$uuid || ''}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+      } else if (/@/.test(src)) {
+        src = src.replace(/@id@/ig, data.$$uuid || '')
+        src = src.replace(/@appkey@/ig, window.GLOB.appkey)
+        src = src.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+        src = src.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+        Object.keys(data).forEach(key => {
+          if (/^\$/.test(key)) return
+          let reg = new RegExp('@' + key + '@', 'ig')
+          src = src.replace(reg, data[key])
+        })
       }
 
       window.open(src)
@@ -114,7 +117,7 @@
       if (data.$$type === 'extendCard') {
         MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$selectedData || [])
       } else if (cards.subtype === 'datacard') {
-        MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data], 'linkbtn')
+        MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data], 'linkbtn', (data.$$uuid || '') + (data.$Index || ''))
       } else {
         MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$empty ? [] : [data])
       }
@@ -132,7 +135,7 @@
       if (data.$$type === 'extendCard') {
         MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$selectedData || [])
       } else if (cards.subtype === 'datacard') {
-        MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data], 'linkbtn')
+        MKEmitter.emit('triggerBtnId', card.setting.linkbtn, [data], 'linkbtn', (data.$$uuid || '') + (data.$Index || ''))
       } else {
         MKEmitter.emit('triggerBtnId', card.setting.linkbtn, data.$$empty ? [] : [data])
       }

--
Gitblit v1.8.0