From f155ee9b2db0f4eee687b53fd2f09bd3ebb02677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 10 六月 2023 00:14:05 +0800
Subject: [PATCH] 2023-06-10
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 2b09bfb..ec88944 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -8,15 +8,13 @@
import Api from '@/api'
import asyncComponent from '@/utils/asyncComponent'
import Utils, { getEditTableSql, getMark } from '@/utils/utils.js'
-import MkIcon from '@/components/mk-icon'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import CusSwitch from './cusSwitch'
import Encrypts from '@/components/encrypts'
import './index.scss'
const { Paragraph } = Typography
+const MkIcon = asyncComponent(() => import('@/components/mk-icon'))
const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList'))
class BodyRow extends React.Component {
@@ -121,7 +119,7 @@
this.setState({editing: false})
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -210,7 +208,7 @@
this.setState({editing: false})
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -242,7 +240,7 @@
this.setState({editing: false})
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -544,7 +542,7 @@
this.onBlur()
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -604,7 +602,7 @@
const { col, record } = this.props
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -640,7 +638,7 @@
}
setTimeout(() => {
- if (col.enter === '$next') {
+ if (/\$next/.test(col.enter)) {
MKEmitter.emit('nextLine', col, record.$$uuid)
} else if (col.enter === '$sub') {
MKEmitter.emit('subLine', col, record)
@@ -910,7 +908,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
edData: [],
selectedRowKeys: [], // 琛ㄦ牸涓�変腑琛�
tableId: '', // 琛ㄦ牸ID
@@ -1300,7 +1297,12 @@
let next = edData[index + 1] || null
if (next) {
- let node = document.getElementById(setting.initId + next.$$uuid)
+ let nextId = setting.initId + next.$$uuid
+ if (/^\$next_/.test(col.enter)) {
+ nextId = col.enter.split('_')[1] + next.$$uuid
+ }
+
+ let node = document.getElementById(nextId)
if (node) {
if (setting.editType === 'multi') {
if (setting.triType === 'click') {
@@ -1686,7 +1688,7 @@
this.setState({edData: _data})
}
- MKEmitter.emit('reloadData', this.props.MenuID, item.$$uuid, item)
+ MKEmitter.emit('reloadData', this.props.MenuID, item.$$uuid)
}
execSuccess = (res) => {
@@ -1695,12 +1697,12 @@
if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
notification.success({
top: 92,
- message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
+ message: res.ErrMesg || '鎵ц鎴愬姛',
duration: submit.stime ? submit.stime : 2
})
} else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛
Modal.success({
- title: res.ErrMesg || this.state.dict['main.action.confirm.success']
+ title: res.ErrMesg || '鎵ц鎴愬姛'
})
} else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず
@@ -1717,6 +1719,8 @@
if (submit.execSuccess !== 'never') {
MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execSuccess, submit)
}
+
+ submit.syncComponentId && MKEmitter.emit('reloadData', submit.syncComponentId)
}
execError = (res) => {
@@ -1888,8 +1892,6 @@
}
}
- let _footer = ''
-
let height = setting.height || false
if (height && height <= 100) {
height = height + 'vh'
@@ -1897,9 +1899,9 @@
return (
<>
- <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
+ {setting.hasSubmit ? <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
<Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button>
- </div>
+ </div> : null}
<div className={`edit-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''} mk-edit-${setting.editType || 'simple'}`} id={tableId}>
<Table
rowKey="$$uuid"
@@ -1922,8 +1924,7 @@
onChange={this.changeTable}
pagination={_pagination}
/>
- {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
- {_data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
+ {setting.hasSubmit && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
</div>
</>
)
--
Gitblit v1.8.0