From dfbbd566cc378ab2a12157ceea6a73f0e04f136d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 三月 2022 11:45:15 +0800
Subject: [PATCH] 2022-03-10
---
src/tabviews/custom/components/table/edit-table/index.jsx | 7 ++-----
src/tabviews/custom/index.jsx | 2 +-
src/tabviews/custom/components/share/tabtransfer/index.jsx | 2 +-
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 1 -
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/share/tabtransfer/index.jsx b/src/tabviews/custom/components/share/tabtransfer/index.jsx
index efd711f..39e4bca 100644
--- a/src/tabviews/custom/components/share/tabtransfer/index.jsx
+++ b/src/tabviews/custom/components/share/tabtransfer/index.jsx
@@ -243,7 +243,7 @@
} else if (item.type === 'table' && item.subtype === 'editable') {
return (
<Col span={item.width} key={item.uuid}>
- <EditTable config={item} data={data} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
+ <EditTable config={item} BID={BID} BData={BData} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 9c8d79c..75c6619 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -1,6 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import {connect} from 'react-redux'
+import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
import { notification } from 'antd'
@@ -15,13 +15,11 @@
// 閫氱敤缁勪欢
const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
-// const MainTable = asyncComponent(() => import('./normalTable'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
class EditableTable extends Component {
static propTpyes = {
BID: PropTypes.any, // 鐖剁骇Id
- data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
menuType: PropTypes.any, // 鑿滃崟绫诲瀷
@@ -566,7 +564,7 @@
}
render() {
- const { BID, setting, searchlist, actions, config, columns, BData, data, selectedData, lock } = this.state
+ const { BID, setting, searchlist, actions, config, columns, BData, selectedData, lock } = this.state
return (
<div className="custom-edit-table" style={config.style}>
@@ -586,7 +584,6 @@
<div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
<MainTable
BID={BID}
- data={data}
setting={setting}
columns={columns}
MenuID={config.uuid}
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 6598db5..c72e73b 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -873,7 +873,6 @@
lineMarks: PropTypes.any, // 琛屾爣璁�
fields: PropTypes.array, // 缁勪欢瀛楁闆�
BID: PropTypes.any, // 涓昏〃ID
- data: PropTypes.any, // 琛ㄦ牸鏁版嵁
total: PropTypes.any, // 鎬绘暟
loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 4baafcd..9beb7c6 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1140,7 +1140,7 @@
} else if (item.type === 'table' && item.subtype === 'editable') {
return (
<Col span={item.width} key={item.uuid}>
- <EditTable config={item} data={data} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
+ <EditTable config={item} BID={_bid} mainSearch={mainSearch} menuType={menuType} />
</Col>
)
} else if (item.type === 'group' && item.subtype === 'normalgroup') {
--
Gitblit v1.8.0