From 325aa13d3b61d1c066f8fcab107003ef36713df3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 一月 2025 10:20:09 +0800
Subject: [PATCH] 2025-01-16
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 496 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 372 insertions(+), 124 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index cd0962e..9ebf5c9 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -4,10 +4,11 @@
import { Col, Tooltip, notification, Typography, message } from 'antd'
import moment from 'moment'
-// import Api from '@/api'
+import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import { getMark } from '@/utils/utils.js'
import MkIcon from '@/components/mk-icon'
+import MKEmitter from '@/utils/events.js'
import Encrypts from '@/components/encrypts'
import './index.scss'
@@ -24,6 +25,7 @@
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
const ExportPdf = asyncComponent(() => import('@/tabviews/zshare/actionList/exportPdf'))
+const FuncButton = asyncComponent(() => import('@/tabviews/zshare/actionList/funcbutton'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncComponent(() => import('@/components/barcode'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
@@ -92,16 +94,40 @@
openNewView = (e, card) => {
const { cardCell, data, cards } = this.props
- if (data.$disabled) return
+ e.stopPropagation()
- if (card.anchors && card.anchors.length > 0) {
+ if (card.anchors) {
let id = card.anchors[card.anchors.length - 1]
let node = document.getElementById('anchor' + id)
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (!card.link || (card.linkType === 'qywx' || card.linkType === 'linkmenu')) return
- e.stopPropagation()
+ if (card.linkType === 'qywx') return
+ if (card.linkType === 'linkmenu') {
+ if (card.linkThdMenu) {
+ let __param = {
+ $BID: data.$$uuid || ''
+ }
+
+ if (card.field) {
+ __param.$searchkey = card.field
+ __param.$searchval = data[card.field] || ''
+ }
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ __param[key] = data[key]
+ })
+
+ let tabmenu = card.linkThdMenu
+
+ tabmenu.param = __param
+
+ MKEmitter.emit('modifyTabs', tabmenu, true)
+ }
+ return
+ }
let url = ''
@@ -136,71 +162,78 @@
}
// positecgroup
- // if (/^sso$/ig.test(url)) {
- // if (!data.LinkUrl1) {
- // notification.warning({
- // top: 92,
- // message: '閾炬帴鍦板潃涓嶅瓨鍦紒',
- // duration: 5
- // })
- // return
- // }
+ if (/^sso$/ig.test(url)) {
+ if (!data.LinkUrl1) {
+ notification.warning({
+ top: 92,
+ message: '閾炬帴鍦板潃涓嶅瓨鍦紒',
+ duration: 5
+ })
+ return
+ }
- // let _url = data.LinkUrl1
- // if (/index\.html/ig.test(_url)) {
- // _url = _url.replace(/index\.html.*/ig, '')
- // } else if (!/\/$/ig.test(_url)) {
- // _url = _url + '/'
- // }
+ let _url = data.LinkUrl1
+ if (/index\.html/ig.test(_url)) {
+ _url = _url.replace(/index\.html.*/ig, '')
+ } else if (!/\/$/ig.test(_url)) {
+ _url = _url + '/'
+ }
- // let key = (() => {
- // let uuid = []
- // let timestamp = new Date().getTime()
- // let _options = '0123456789abcdefghigklmnopqrstuv'
- // for (let i = 0; i < 19; i++) {
- // uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
- // }
- // uuid = timestamp + uuid.join('')
- // return uuid
- // })()
+ let key = (() => {
+ let uuid = []
+ let timestamp = new Date().getTime()
+ let _options = '0123456789abcdefghigklmnopqrstuv'
+ for (let i = 0; i < 19; i++) {
+ uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ }
+ uuid = timestamp + uuid.join('')
+ return uuid
+ })()
- // let _param = {
- // func: 'webapi_scan_binding_key',
- // binding_type: 'mk',
- // scan_type: 'toggle',
- // scan_appkey: data.scan_appkey || '',
- // id: key
- // }
+ let _param = {
+ func: 'webapi_scan_binding_key',
+ binding_type: 'mk',
+ scan_type: 'toggle',
+ scan_appkey: data.scan_appkey || '',
+ id: key
+ }
- // Api.getSystemConfig(_param).then(res => {
- // if (!res.status) {
- // notification.warning({
- // top: 92,
- // message: res.message,
- // duration: 5
- // })
- // } else if (res.thd_party_appid && res.thd_party_member_id && res.thd_party_openid) {
- // let href = _url + 'admin/index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
- // appid: res.thd_party_appid,
- // memberId: res.thd_party_member_id,
- // openid: res.thd_party_openid,
- // key: key
- // })))
-
- // window.open(href)
- // } else {
- // notification.warning({
- // top: 92,
- // message: '淇℃伅缂哄け锛岃鑱旂郴绠＄悊鍛橈紒',
- // duration: 5
- // })
- // }
- // })
- // return
- // }
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ } else if (res.thd_party_appid && res.thd_party_member_id && res.thd_party_openid) {
+ let href = _url + 'admin/index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+ appid: res.thd_party_appid,
+ memberId: res.thd_party_member_id,
+ openid: res.thd_party_openid,
+ key: key
+ })))
+ window.open(href)
+ } else {
+ notification.warning({
+ top: 92,
+ message: '淇℃伅缂哄け锛岃鑱旂郴绠＄悊鍛橈紒',
+ duration: 5
+ })
+ }
+ })
+ return
+ }
- if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url)) {
- let name = url.replace(/.+\//g, '').replace(/\.{1}[^.]*$/g, '')
+ if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url) || card.linkType === 'download') {
+ let name = ''
+ if (card.datatype === 'static') {
+ name = card.value || ''
+ } else if (data.hasOwnProperty(card.field)) {
+ name = data[card.field] + ''
+ }
+ name = name.replace(/\.{1}[^.]*$/g, '')
+ name = name ? name + url.replace(/.+\./g, '.') : ''
+
let d = document.createElement('a')
d.href = url
d.setAttribute('download', name)
@@ -209,15 +242,13 @@
d.click()
d.remove()
} else {
+ let Id = data.$$uuid || ''
+
+ if (cards.subtype === 'propcard' && cardCell) {
+ Id = cardCell.setting.primaryId || ''
+ }
+
if (card.joint === 'true') {
- let Id = ''
-
- if (cards.subtype === 'propcard' && cardCell) {
- Id = cardCell.setting.primaryId || ''
- } else {
- Id = data[cards.setting.primaryKey] || ''
- }
-
let con = '?'
if (/\?/ig.test(url)) {
@@ -225,6 +256,18 @@
}
url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ } else if (/@/.test(url)) {
+ url = url.replace(/@id@/ig, Id)
+ url = url.replace(/@appkey@/ig, window.GLOB.appkey)
+ url = url.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+ url = url.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ let reg = new RegExp('@' + key + '@', 'ig')
+ url = url.replace(reg, data[key])
+ })
}
window.open(url)
@@ -296,7 +339,7 @@
contents.push(
<div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
- <div className={'ant-mk-text line1' + className} style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
+ <div className={'ant-mk-text line1' + className} style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{card.prefix || ''}{data.$Index || ''}{card.postfix || ''}</span></div>
</div>
</div>
)
@@ -433,7 +476,7 @@
}
if (card.copyable === 'true') {
- if (card.link || (card.anchors && card.anchors.length > 0)) {
+ if (card.link || card.anchors) {
let url = orival
if (card.link === 'static') {
@@ -473,23 +516,31 @@
}
className = mark.signType
}
-
- if (card.link || (card.anchors && card.anchors.length > 0)) {
- _style.cursor = 'pointer'
- }
if (card.bgImage && data[card.bgImage]) {
_style.backgroundImage = `url('${data[card.bgImage]}')`
}
-
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
- {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
- <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+
+ if (!data.$disabled && (card.link || card.anchors)) {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
</div>
- </div>
- )
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
+ </div>
+ )
+ }
} else if (card.eleType === 'number') {
let val = ''
let _style = {...card.style}
@@ -511,6 +562,9 @@
}
if (card.format === 'percent') {
val = val * 100
+ if (!card.round) {
+ val = +val.toFixed(2)
+ }
} else if (card.format === 'abs') {
val = Math.abs(val)
}
@@ -602,10 +656,21 @@
}
}
+ let _style = {...card.style}
+
+ if (card.marks) {
+ let _s = {}
+ getMark(card.marks, data, _s)
+
+ if (_s.color) {
+ _style.color = _s.color
+ }
+ }
+
if (card.tipType === 'text') {
contents.push(
<div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={card.style}>
+ <div style={_style}>
{val ? <Tooltip title={val}>
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>
</Tooltip> : <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>}
@@ -615,7 +680,7 @@
} else {
contents.push(
<div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={card.style}>
+ <div style={_style}>
{val ? <Tooltip title={val}>
<MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>
</Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>}
@@ -670,6 +735,7 @@
}
} else {
url = data[card.field] || ''
+ url = url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
}
if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
@@ -687,24 +753,31 @@
_imagestyle.backgroundPosition = _style.backgroundPosition || 'center'
_imagestyle.backgroundRepeat = _style.backgroundRepeat || 'no-repeat'
- if (card.link) {
- _style.cursor = 'pointer'
- }
-
if (_style.position === 'absolute') {
_style.width = '100%'
}
-
+
let scale = url && card.scale === 'true'
let urls = url ? url.split(',').filter(Boolean) : ['']
-
- urls.forEach((u, i) => {
- contents.push(<div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
- <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
- <MkPicture style={_imagestyle} lostTip={card.lostTip !== 'false'} scale={scale} url={u} urls={urls}/>
- </div>
- </div>)
- })
+
+ if (card.link && !data.$disabled) {
+ _style.cursor = 'pointer'
+ urls.forEach((u, i) => {
+ contents.push(<div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+ <MkPicture style={_imagestyle} lostTip={card.lostTip !== 'false'} scale={scale} url={u} urls={urls}/>
+ </div>
+ </div>)
+ })
+ } else {
+ urls.forEach((u, i) => {
+ contents.push(<div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
+ <div style={_style}>
+ <MkPicture style={_imagestyle} lostTip={card.lostTip !== 'false'} scale={scale} url={u} urls={urls}/>
+ </div>
+ </div>)
+ })
+ }
} else if (card.eleType === 'splitline') {
let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
_style_ = _style_ || {}
@@ -821,14 +894,64 @@
_data = [data]
}
+ let _val = card.formula
+ if (/@username@|@fullName@|@bid@/ig.test(_val)) {
+ _val = _val.replace(/@username@/ig, sessionStorage.getItem('User_Name') || '').replace(/@fullName@/ig, sessionStorage.getItem('Full_Name') || '').replace(/@bid@/ig, data.$$BID || '')
+ }
+
try {
// eslint-disable-next-line
- let func = new Function('data', card.formula)
+ let func = new Function('data', _val)
val = func(_data)
} catch (e) {
console.warn(e)
val = ''
}
+
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ } else if (typeof(val) === 'object' && val.type === 'linkmenu') {
+ // type: 'linkmenu', linkThdMenu: null, menuId: '', value: ``, defaultValue: '', onclick: 'inner'
+ let item = {linkType: 'linkmenu', linkThdMenu: val.linkThdMenu}
+ let _val_ = val.value || ''
+
+ if (!item.linkThdMenu && val.menuId) {
+ item.linkThdMenu = window.GLOB.mkThdMenus.get(val.menuId) || ''
+ }
+ if (!item.linkThdMenu && val.defaultValue) {
+ _val_ = val.defaultValue
+ }
+
+ if (val.onclick === 'inner') {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>
+ <span onClick={(e) => {this.openNewView(e, item)}} dangerouslySetInnerHTML={{__html: _val_}}></span>
+ </div>
+ </div>
+ </div>
+ )
+ } else {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, item)}}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: _val_}}></div>
+ </div>
+ </div>
+ )
+ }
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
+ </div>
+ </div>
+ )
+ }
+ return
} else if (card.$sync) {
if (card.eval === 'false') {
val = ''
@@ -844,7 +967,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = 0
}
@@ -858,9 +981,49 @@
val = ''
} else if (data) {
let _val = card.formula
+ let _data = {}
Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ if (/^1949-10-01/.test(data[key])) {
+ _data[key.toLowerCase()] = ''
+ } else if (/\d{4}-\d{2}-\d{2}\s00:00:00/.test(data[key])) {
+ _data[key.toLowerCase()] = data[key].replace(/\s00:00:00/g, '')
+ } else {
+ _data[key.toLowerCase()] = data[key]
+ }
+ })
+ _data.username = sessionStorage.getItem('User_Name') || ''
+ _data.fullname = sessionStorage.getItem('Full_Name') || ''
+ _data.bid = data.$$BID || ''
+
+ if (card.eval === 'false' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (card.$keys) {
+ let empty = true
+
+ card.$keys.forEach(key => {
+ if (!_data.hasOwnProperty(key)) {
+ empty = false
+ } else if (_data[key]) {
+ empty = false
+ }
+ })
+
+ if (empty) return null
+ }
+
+ Object.keys(_data).forEach(key => {
+ if (_data[key]) return
+
+ _val = _val.replace(new RegExp('[^@]*@' + key + '@', 'ig'), '')
+ })
+
+ if (!_val) return null
+ }
+
+ Object.keys(_data).forEach(key => {
let reg = new RegExp('@' + key + '@', 'ig')
- _val = _val.replace(reg, data[key])
+ _val = _val.replace(reg, _data[key])
})
if (card.eval !== 'false') {
@@ -868,7 +1031,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = ''
}
@@ -879,15 +1042,6 @@
if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
- } else if (card.eval === 'func') {
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
- </div>
- </div>
- )
- return
}
if (card.round && typeof(val) === 'number') {
@@ -897,8 +1051,10 @@
if (val !== '') {
if (val && typeof(val) === 'string') {
- val = val.replace(/\n/ig, '<br/>')
- if (!/<(span|div|p|a|img)\s/g.test(val)) {
+ if (!card.evalchars || card.evalchars.includes('enter')) {
+ val = val.replace(/\\n|\n/ig, '<br/>')
+ }
+ if ((!card.evalchars || card.evalchars.includes('space')) && !/<(span|div|p|a|img)\s/g.test(val)) {
val = val.replace(/\s/ig, ' ')
}
@@ -938,14 +1094,76 @@
className = mark.signType
}
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style}>
- {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
- <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ if (card.link && !data.$disabled) {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
</div>
- </div>
- )
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
+ </div>
+ )
+ }
+ } else if (card.eleType === 'tag') {
+ let vals = ''
+
+ if (card.datatype === 'static') {
+ vals = card.value
+ } else {
+ vals = data[card.field] || ''
+ }
+
+ if (!vals && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
+ vals = vals.split(',').filter(Boolean)
+
+ if (card.signs) {
+ vals = vals.map(val => {
+ let sign = card.signs.filter(s => s.value === val)[0]
+ let cell = {value: val, style: {...card.style}}
+
+ if (sign) {
+ cell.style.backgroundColor = sign.background
+ cell.style.color = sign.color
+ cell.style.borderColor = sign.border
+
+ // delete cell.style.borderTopColor
+ // delete cell.style.borderBottomColor
+ // delete cell.style.borderLeftColor
+ // delete cell.style.borderRightColor
+ }
+
+ return cell
+ })
+
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div className="ant-mk-tag">
+ {vals.map((item, index) => <span key={index} className="tag-item" style={item.style}>{item.value}</span>)}
+ </div>
+ </div>
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div className="ant-mk-tag">
+ {vals.map((val, index) => <span key={index} className="tag-item" style={card.style}>{val}</span>)}
+ </div>
+ </div>
+ )
+ }
} else if (card.eleType === 'color') {
let color = ''
@@ -1005,6 +1223,10 @@
} else if (data.$$empty) {
_data = []
}
+ let name = ''
+ if (card.showName) {
+ name = data[card.showName] || ' '
+ }
_style_ = _style_ || {}
if (card.wrapStyle) {
@@ -1012,11 +1234,14 @@
}
let MkButton = null
+ let lid = (data.$$uuid || '') + (data.$Index || '')
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
MkButton = <NormalButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1027,6 +1252,7 @@
MkButton = <ExcelInButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1036,6 +1262,7 @@
MkButton = <ExcelOutButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1044,7 +1271,9 @@
} else if (card.OpenType === 'popview') {
MkButton = <PopupButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1053,7 +1282,9 @@
} else if (card.OpenType === 'tab') {
MkButton = <TabButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1061,7 +1292,10 @@
} else if (card.OpenType === 'innerpage') {
MkButton = <NewPageButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
+ columns={cards.columns}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1071,6 +1305,7 @@
MkButton = <ChangeUserButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1080,6 +1315,7 @@
MkButton = <PrintButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1090,6 +1326,7 @@
MkButton = <FuncMegvii
btn={card}
BID={data.$$BID}
+ LID={lid}
disabled={_disabled}
setting={cards.setting}
selectedData={_data}
@@ -1098,6 +1335,7 @@
MkButton = <FuncZip
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1106,6 +1344,7 @@
} else if (card.funcType === 'expPdf') {
MkButton = <ExportPdf
btn={card}
+ LID={lid}
/>
} else if (card.funcType === 'addline' || card.funcType === 'delline') {
MkButton = <EditLine
@@ -1113,6 +1352,15 @@
disabled={_disabled}
selectedData={_data}
/>
+ } else {
+ MkButton = <FuncButton
+ BID={data.$$BID}
+ disabled={_disabled}
+ LID={lid}
+ btn={card}
+ columns={cards.columns}
+ selectedData={_data}
+ />
}
}
--
Gitblit v1.8.0