From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27
---
src/tabviews/zshare/actionList/popupbutton/index.jsx | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index f61eadf..efd9c5c 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -4,14 +4,11 @@
import { Button, Modal, notification, Drawer } from 'antd'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import MKEmitter from '@/utils/events.js'
import MkIcon from '@/components/mk-icon'
import './index.scss'
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
-const CustomPage = asyncSpinComponent(() => import('@/tabviews/custom'))
const PopView = asyncSpinComponent(() => import('@/tabviews/custom/popview'))
class PopupButton extends Component {
@@ -26,7 +23,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
popData: null,
primaryId: '',
@@ -131,7 +127,7 @@
if (btn.uuid !== tabId) return
- if (btn.$view === 'CustomPage') {
+ if (btn.$view === 'popview') {
if (btn.popClose !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.popClose, btn)
}
@@ -172,13 +168,6 @@
duration: 5
})
return
- } else if (setting.tabType === 'subtab') {
- notification.warning({
- top: 92,
- message: '寮圭獥椤甸潰涓嶆敮鎸佹璁剧疆锛�',
- duration: 5
- })
- return
}
let _data = null
@@ -186,7 +175,7 @@
if (btn.Ot === 'requiredSgl' && setting.primaryKey) {
_data = data[0]
- primaryId = _data[setting.primaryKey] || ''
+ primaryId = _data.$$uuid || _data[setting.primaryKey] || ''
}
this.setState({
@@ -248,19 +237,18 @@
ratio = ratio + 'vw'
}
return <Modal
- wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview')}
+ wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview ') + (btn.popshow || '')}
title={btn.label}
width={ratio}
maskClosable={btn.clickouter === 'close'}
visible={visible}
onCancel={this.popclose}
footer={[
- <Button key="close" onClick={this.popclose}>{this.state.dict['main.close']}</Button>
+ <Button key="close" onClick={this.popclose}>鍏抽棴</Button>
]}
destroyOnClose
>
{!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
- {btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuID={btn.uuid} MenuName={btn.label} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
{btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
</Modal>
} else {
@@ -297,7 +285,6 @@
destroyOnClose
>
{!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
- {btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuName={btn.label} MenuID={btn.uuid} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
{btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
<div className="close-drawer">
<Button onClick={this.popclose}>
--
Gitblit v1.8.0