From 930a74e9fb7bd74e7fb0875b13d16657c1163c58 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 一月 2023 10:17:41 +0800
Subject: [PATCH] 2023-01-13
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 8651b50..993a997 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -6,7 +6,6 @@
import moment from 'moment'
import Api from '@/api'
-import options from '@/store/options.js'
import asyncComponent from '@/utils/asyncComponent'
import Utils, { getEditTableSql, getMark } from '@/utils/utils.js'
import MkIcon from '@/components/mk-icon'
@@ -15,7 +14,6 @@
import enUS from '@/locales/en-US/main.js'
import CusSwitch from './cusSwitch'
import Encrypts from '@/components/encrypts'
-import '@/assets/css/table.scss'
import './index.scss'
const { Paragraph } = Typography
@@ -508,7 +506,10 @@
<CardCellComponent data={record} cards={config} elements={col.elements}/>
)
} else if (col.type === 'action') {
- style.padding = '0px 5px'
+ style.padding = '0px'
+ if (col.style) {
+ style = {...style, ...col.style}
+ }
children = (
<CardCellComponent data={record} cards={config} elements={col.elements}/>
)
@@ -893,7 +894,7 @@
static propTpyes = {
statFValue: PropTypes.any, // 鍚堣瀛楁鏁版嵁
MenuID: PropTypes.string, // 鑿滃崟Id
- setting: PropTypes.object, // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乧olumnfixed锛堝垪鍥哄畾锛夈�乤ctionfixed锛堟寜閽浐瀹氾級
+ setting: PropTypes.object, // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乤ctionfixed锛堟寜閽浐瀹氾級
columns: PropTypes.array, // 琛ㄦ牸鍒�
lineMarks: PropTypes.any, // 琛屾爣璁�
fields: PropTypes.array, // 缁勪欢瀛楁闆�
@@ -938,6 +939,10 @@
if (item.type === 'text' && item.editable === 'true' && item.editType === 'select' && item.resourceType === '1') {
let _option = Utils.getSelectQueryOptions(item)
+
+ if (window.GLOB.debugger === true || window.debugger === true) {
+ console.info(_option.sql)
+ }
item.base_sql = window.btoa(window.encodeURIComponent(_option.sql))
item.arr_field = _option.field
@@ -1108,11 +1113,6 @@
localItems.push(`select '${item.uuid}' as obj_name,'${item.arr_field}' as arr_field,'${item.base_sql}' as LText`)
}
})
-
- if (options.sysType !== 'local') {
- localItems = [...localItems, ...mainItems]
- mainItems = []
- }
// 鏈湴璇锋眰
let param = {
@@ -1990,7 +1990,7 @@
{!submit.hasAction && pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
<Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
</div>
- <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
+ <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''}`} id={tableId}>
<Table
rowKey="$$uuid"
components={components}
--
Gitblit v1.8.0