From fc241324087e605b145e8bbcc4ee3aece61dbf14 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 三月 2022 15:59:45 +0800
Subject: [PATCH] 2022-03-21
---
src/utils/utils-datamanage.js | 10
src/templates/zshare/editTable/index.jsx | 6
package-lock.json | 14 -
src/tabviews/verupmanage/subtabtable/index.jsx | 38 -----
src/menu/components/form/formaction/actionform/index.jsx | 4
src/menu/components/form/formaction/actionform/index.scss | 5
src/tabviews/calendar/index.jsx | 2
src/tabviews/zshare/actionList/exceloutbutton/index.jsx | 2
src/tabviews/custom/components/table/edit-table/index.jsx | 41 +++--
src/views/billprint/index.jsx | 2
src/tabviews/subtable/index.jsx | 2
src/tabviews/subtabtable/index.jsx | 2
src/tabviews/commontable/index.jsx | 2
src/tabviews/zshare/actionList/normalbutton/index.jsx | 4
src/tabviews/custom/components/share/normalheader/index.jsx | 2
src/tabviews/custom/components/table/normal-table/index.scss | 9 -
src/menu/datasource/verifycard/columnform/index.jsx | 4
src/menu/datasource/verifycard/index.jsx | 4
src/utils/utils.js | 8
src/tabviews/custom/components/table/edit-table/index.scss | 68 ---------
src/index.js | 6
src/menu/components/form/formaction/formconfig.jsx | 5
src/menu/components/share/actioncomponent/formconfig.jsx | 2
src/pc/createview/index.jsx | 2
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 60 ++++----
src/tabviews/custom/components/table/edit-table/normalTable/index.scss | 31 ++++
src/menu/components/table/edit-table/columns/index.scss | 8
src/tabviews/custom/index.jsx | 2
src/tabviews/verupmanage/index.jsx | 3
src/menu/components/table/edit-table/columns/index.jsx | 24 ++
src/views/login/index.jsx | 2
31 files changed, 169 insertions(+), 205 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f712e6b..92f1936 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4938,12 +4938,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001260",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz",
- "integrity": "sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg==",
- "requires": {
- "nanocolors": "^0.1.0"
- }
+ "version": "1.0.30001319",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz",
+ "integrity": "sha512-xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="
},
"capture-exit": {
"version": "2.0.0",
@@ -13941,11 +13938,6 @@
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
- },
- "nanocolors": {
- "version": "0.1.12",
- "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz",
- "integrity": "sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="
},
"nanomatch": {
"version": "1.2.13",
diff --git a/src/index.js b/src/index.js
index 6b7fa3e..bb2bff3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -110,6 +110,8 @@
GLOB.mainSystemApi = ''
}
+ GLOB.debugger = options.sysType === 'local' && GLOB.systemType !== 'production'
+
if (options.sysType !== 'cloud') {
if (config.appkey === options.cakey) {
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">涓嶅彲浣跨敤浜戠appkey锛岃鑱旂郴绠＄悊鍛橈紒</div>'
@@ -223,6 +225,10 @@
writable: false,
value: GLOB.systemType
})
+ Object.defineProperty(GLOB, 'debugger', {
+ writable: false,
+ value: GLOB.debugger
+ })
Object.defineProperty(GLOB, 'mainSystemApi', {
writable: false,
value: GLOB.mainSystemApi
diff --git a/src/menu/components/form/formaction/actionform/index.jsx b/src/menu/components/form/formaction/actionform/index.jsx
index baee983..3b9562c 100644
--- a/src/menu/components/form/formaction/actionform/index.jsx
+++ b/src/menu/components/form/formaction/actionform/index.jsx
@@ -228,7 +228,7 @@
} else if (item.type === 'select') { // 涓嬫媺鎼滅储
fields.push(
<Col span={12} key={index}>
- <Form.Item label={item.tooltip ?
+ <Form.Item help={item.help || null} label={item.tooltip ?
<Tooltip placement="topLeft" overlayClassName={item.tooltipClass} title={item.tooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
@@ -360,7 +360,7 @@
}
}
return (
- <Form {...formItemLayout} className="menu-action-list-form" id="winter">
+ <Form {...formItemLayout} className="menu-form-action-list" id="winter">
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
diff --git a/src/menu/components/form/formaction/actionform/index.scss b/src/menu/components/form/formaction/actionform/index.scss
index 2573ed4..ca43400 100644
--- a/src/menu/components/form/formaction/actionform/index.scss
+++ b/src/menu/components/form/formaction/actionform/index.scss
@@ -1,4 +1,4 @@
-.menu-action-list-form {
+.menu-form-action-list {
min-height: 190px;
.superconfig {
color: #1890ff;
@@ -36,4 +36,7 @@
border-color: #d9d9d9;
box-shadow: none;
}
+ .ant-form-explain {
+ font-size: 12px;
+ }
}
\ No newline at end of file
diff --git a/src/menu/components/form/formaction/formconfig.jsx b/src/menu/components/form/formaction/formconfig.jsx
index ab68eda..a66f6d7 100644
--- a/src/menu/components/form/formaction/formconfig.jsx
+++ b/src/menu/components/form/formaction/formconfig.jsx
@@ -32,7 +32,7 @@
menulist = []
}
if (appType === 'mob') {
- menulist.push({value: 'goback', text: '杩斿洖'})
+ menulist.push({value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'})
}
} else {
menulist = sessionStorage.getItem('fstMenuList')
@@ -246,9 +246,10 @@
{
type: (appType === 'pc' || appType === 'mob') ? 'select' : 'cascader',
key: 'linkmenu',
- label: '鎵撳紑鑿滃崟',
+ label: '涓嬩竴姝ユ搷浣�',
tooltip: '鎵ц鎴愬姛鍚庨渶瑕佹墦寮�鐨勮彍鍗曘��',
initVal: card.linkmenu,
+ help: '鍙繑鍥炰笂涓�椤点��',
required: false,
allowClear: true,
options: menulist
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index e40ee92..4adfb52 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -650,7 +650,7 @@
initVal: card.openmenu || (!appType ? [] : ''),
required: false,
allowClear: true,
- options: appType === 'mob' ? [...appMenus, {value: 'goback', text: '杩斿洖'}] : (appType === 'pc' ? appMenus : menulist),
+ options: appType === 'mob' ? [...appMenus, {value: 'goback', text: '杩斿洖锛堜笂涓�椤碉級'}] : (appType === 'pc' ? appMenus : menulist),
forbid: viewType === 'popview'
},
{
diff --git a/src/menu/components/table/edit-table/columns/index.jsx b/src/menu/components/table/edit-table/columns/index.jsx
index 3ea9182..cbf2d50 100644
--- a/src/menu/components/table/edit-table/columns/index.jsx
+++ b/src/menu/components/table/edit-table/columns/index.jsx
@@ -43,7 +43,7 @@
return true
}
- if (!nextProps.column) return false
+ if (!nextProps.column) return true
return !is(fromJS(this.props.column), fromJS(nextProps.column)) ||
!is(fromJS(this.props.fields), fromJS(nextProps.fields)) ||
@@ -53,17 +53,23 @@
render() {
const { connectDragSource, connectDropTarget, moveCol, addElement, updateCol, editColumn, changeStyle, deleteCol, index, column, align, fields, children, ...restProps } = this.props
+ if (!column) return (
+ <th {...restProps} index={index}>
+ {children}
+ </th>
+ )
+
return connectDragSource(
- connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => column && this.props.editColumn(column)}>
+ connectDropTarget(<th {...restProps} index={index} style={{ cursor: 'move', textAlign: align }} onDoubleClick={() => this.props.editColumn(column)}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
- {column && ['custom', 'action'].includes(column.type) ?
+ {['custom', 'action'].includes(column.type) ?
<PlusOutlined className="plus" title="娣诲姞" onClick={() => this.props.addElement(column)} /> : null
}
<EditOutlined className="edit" title="缂栬緫" onClick={() => this.props.editColumn(column)} />
- {column && column.type === 'custom' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
+ {column.type === 'custom' ? <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => this.props.changeStyle(column)}/> : null}
<DeleteOutlined className="close" title="鍒犻櫎" onClick={this.deleteCol} />
- {column && ['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
+ {['text', 'number', 'formula'].includes(column.type) ? <MarkColumn columns={fields} marks={column.marks} onSubmit={this.updateMarks} /> : null }
</div>
} trigger="hover">
{children}
@@ -516,6 +522,13 @@
}
}
+ let rowSelection = null
+ if (config.wrap.tableType) {
+ rowSelection = {
+ type: config.wrap.tableType === 'radio' ? 'radio' : 'checkbox',
+ }
+ }
+
const columns = this.state.columns.map((col, index) => {
let title = col.label
if (col.editable === 'true') {
@@ -578,6 +591,7 @@
rowClassName="editable-row"
style={style}
bordered={config.wrap.bordered !== 'false'}
+ rowSelection={rowSelection}
components={components}
dataSource={this.state.data}
columns={columns}
diff --git a/src/menu/components/table/edit-table/columns/index.scss b/src/menu/components/table/edit-table/columns/index.scss
index 2934fd7..3703f0e 100644
--- a/src/menu/components/table/edit-table/columns/index.scss
+++ b/src/menu/components/table/edit-table/columns/index.scss
@@ -5,7 +5,8 @@
font-size: inherit;
}
.submit-btn {
- height: 24px;
+ min-height: 24px;
+ height: auto;
margin-right: 10px;
background-color: #1890ff;
border-width: 0;
@@ -63,10 +64,9 @@
}
}
.col-control {
- position: absolute;
+ position: relative;
+ float: right;
z-index: 2;
- right: 0;
- top: -25px;
>.anticon, >div > .anticon {
font-size: 16px;
margin-right: 10px;
diff --git a/src/menu/datasource/verifycard/columnform/index.jsx b/src/menu/datasource/verifycard/columnform/index.jsx
index 3b054c7..9e2108d 100644
--- a/src/menu/datasource/verifycard/columnform/index.jsx
+++ b/src/menu/datasource/verifycard/columnform/index.jsx
@@ -63,6 +63,10 @@
{
required: true,
message: dict['form.required.input'] + '瀛楁!'
+ },
+ {
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
}
]
})(<Input placeholder="" autoComplete="off" />)}
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 8f8afd6..09277c8 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -51,6 +51,10 @@
editable: true,
unique: true,
copy: true,
+ rules: [{
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ }],
width: '28%'
},
{
diff --git a/src/pc/createview/index.jsx b/src/pc/createview/index.jsx
index 4b73505..63e233f 100644
--- a/src/pc/createview/index.jsx
+++ b/src/pc/createview/index.jsx
@@ -161,7 +161,7 @@
}
if (_config.components) {
- config.components = MenuUtils.resetConfig(_config.components, res.clearMenu === 'true')
+ config.components = MenuUtils.resetConfig(_config.components, {}, res.clearMenu === 'true')
config.tables = _config.tables || []
config.style = _config.style || {}
config.statusBarbgColor = _config.statusBarbgColor || ''
diff --git a/src/tabviews/calendar/index.jsx b/src/tabviews/calendar/index.jsx
index 783c13e..d78d54d 100644
--- a/src/tabviews/calendar/index.jsx
+++ b/src/tabviews/calendar/index.jsx
@@ -424,7 +424,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
LText && console.info(LText)
}
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index c11195d..3f673dc 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -664,7 +664,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
diff --git a/src/tabviews/custom/components/share/normalheader/index.jsx b/src/tabviews/custom/components/share/normalheader/index.jsx
index 570a190..92848b7 100644
--- a/src/tabviews/custom/components/share/normalheader/index.jsx
+++ b/src/tabviews/custom/components/share/normalheader/index.jsx
@@ -24,7 +24,7 @@
this.setState({
title: config.plot ? config.plot.title : config.wrap.title,
- show: !['normaltable', 'propcard'].includes(config.subtype) && config.search && config.search.length > 0
+ show: !['normaltable', 'propcard', 'editable'].includes(config.subtype) && config.search && config.search.length > 0
})
}
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index 75c6619..81f7a38 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -57,6 +57,15 @@
let setting = {..._config.setting, ..._config.wrap, style: {}}
setting.tableId = Utils.getuuid()
+ _config.submit.style = _config.submit.style || {}
+ _config.submit.wrapStyle = {}
+ if (_config.submit.style.marginTop) {
+ _config.submit.wrapStyle.paddingTop = _config.submit.style.marginTop
+ }
+ if (_config.submit.style.marginBottom) {
+ _config.submit.wrapStyle.paddingBottom = _config.submit.style.marginBottom
+ }
+
if (setting.height) {
setting.operType = 'btnMode'
}
@@ -581,23 +590,21 @@
columns={config.columns}
selectedData={selectedData}
/>
- <div className={'main-table-box ' + (!actions || actions.length === 0 ? 'no-action' : '')}>
- <MainTable
- BID={BID}
- setting={setting}
- columns={columns}
- MenuID={config.uuid}
- submit={config.submit}
- fields={config.columns}
- total={this.state.total}
- lineMarks={config.lineMarks}
- loading={this.state.loading}
- refreshdata={this.refreshbytable}
- chgSelectData={(selects) => this.setState({selectedData: selects})}
- changeLock={(lock) => this.setState({lock: lock})}
- statFValue={this.state.statFValue}
- />
- </div>
+ <MainTable
+ BID={BID}
+ setting={setting}
+ columns={columns}
+ MenuID={config.uuid}
+ submit={config.submit}
+ fields={config.columns}
+ total={this.state.total}
+ lineMarks={config.lineMarks}
+ loading={this.state.loading}
+ refreshdata={this.refreshbytable}
+ chgSelectData={(selects) => this.setState({selectedData: selects})}
+ changeLock={(lock) => this.setState({lock: lock})}
+ statFValue={this.state.statFValue}
+ />
</div>
)
}
diff --git a/src/tabviews/custom/components/table/edit-table/index.scss b/src/tabviews/custom/components/table/edit-table/index.scss
index 3a12a2b..5031dac 100644
--- a/src/tabviews/custom/components/table/edit-table/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/index.scss
@@ -11,7 +11,8 @@
>.button-list.toolbar-button {
padding: 0;
line-height: 45px;
- padding-right: 60px;
+ display: inline-block;
+ width: 80%;
button {
margin-right: 0px;
margin-bottom: 0px;
@@ -30,71 +31,6 @@
max-width: 95%;
.ant-modal-body {
max-height: calc(100vh - 265px);
- }
- }
- .main-table-box {
- position: relative;
- min-height: 150px;
- .main-pickup {
- position: absolute;
- right: 5px;
- top: -24px;
- z-index: 2;
- }
- .submit-table {
- position: absolute;
- z-index: 2;
- right: 60px;
- top: -26px;
- height: 24px;
- color: #ffffff;
- background-color: #1890ff;
- border-width: 0;
- }
-
- .submit-footer-table {
- float: right;
- height: 24px;
- color: #ffffff;
- background-color: #1890ff;
- border-width: 0;
- margin-top: 10px;
- }
-
- .custom-control {
- position: absolute;
- z-index: 1;
- right: 0px;
- top: -23px;
- font-size: 18px;
- padding: 3px;
- cursor: pointer;
- }
- >.async-spin {
- line-height: 150px!important;
- }
- }
- .no-action.main-table-box {
- .main-pickup {
- position: relative;
- right: 0px;
- top: 0px;
- z-index: 2;
- margin-bottom: 4px;
- float: right;
- }
- .submit-table {
- float: right;
- position: relative;
- z-index: 2;
- right: 0px;
- top: 0px;
- height: 24px;
- color: #ffffff;
- background-color: #1890ff;
- margin-right: 15px;
- margin-bottom: 2px;
- border-width: 0;
}
}
.ant-collapse {
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 c72e73b..4daf315 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1943,34 +1943,38 @@
let height = setting.height || false
return (
- <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
- <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
- {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
- <Table
- rowKey="$$uuid"
- components={components}
- style={setting.style}
- size={setting.size || 'middle'}
- bordered={setting.bordered !== 'false'}
- rowSelection={rowSelection}
- columns={_columns}
- dataSource={_data}
- loading={this.props.loading}
- scroll={{ x: '100%', y: height }}
- onRow={(record, index) => {
- return {
- lineMarks,
- data: record,
- onClick: () => {this.changeRow(record.$$uuid)},
- }
- }}
- onChange={this.changeTable}
- pagination={_pagination}
- />
- {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
- {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
- {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
- </div>
+ <>
+ <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
+ {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}>
+ <Table
+ rowKey="$$uuid"
+ components={components}
+ style={setting.style}
+ size={setting.size || 'middle'}
+ bordered={setting.bordered !== 'false'}
+ rowSelection={rowSelection}
+ columns={_columns}
+ dataSource={_data}
+ loading={this.props.loading}
+ scroll={{ x: '100%', y: height }}
+ onRow={(record, index) => {
+ return {
+ lineMarks,
+ data: record,
+ onClick: () => {this.changeRow(record.$$uuid)},
+ }
+ }}
+ onChange={this.changeTable}
+ pagination={_pagination}
+ />
+ {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
+ {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
+ {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
+ </div>
+ </>
)
}
}
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
index 05967cd..f9fc71d 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.scss
@@ -1,5 +1,6 @@
.edit-custom-table {
position: relative;
+ min-height: 150px;
padding: 0px;
.normal-table-footer {
@@ -277,6 +278,16 @@
font-size: 25px;
height: 45px;
}
+ .submit-footer-table {
+ float: right;
+ min-height: 24px;
+ height: auto;
+ color: #ffffff;
+ background-color: #1890ff;
+ border-width: 0;
+ margin-top: 10px!important;
+ margin-right: 10px!important;
+ }
}
.edit-custom-table.buoyMode {
.ant-table-scroll {
@@ -384,4 +395,24 @@
white-space: unset;
text-overflow: unset;
}
+}
+.edit-custom-table-btn-wrap {
+ float: right;
+ padding: 5px 0px;
+ .main-pickup {
+ position: relative;
+ z-index: 2;
+ }
+ .submit-table {
+ position: relative;
+ z-index: 2;
+ margin-right: 15px;
+ min-height: 24px;
+ height: auto;
+ color: #ffffff;
+ background-color: #1890ff;
+ border-width: 0;
+ margin-top: 0px!important;
+ margin-bottom: 0px!important;
+ }
}
\ No newline at end of file
diff --git a/src/tabviews/custom/components/table/normal-table/index.scss b/src/tabviews/custom/components/table/normal-table/index.scss
index 787734a..3e10f6a 100644
--- a/src/tabviews/custom/components/table/normal-table/index.scss
+++ b/src/tabviews/custom/components/table/normal-table/index.scss
@@ -41,15 +41,6 @@
top: -22px;
z-index: 2;
}
- .custom-control {
- position: absolute;
- z-index: 1;
- right: 0px;
- top: -23px;
- font-size: 18px;
- padding: 3px;
- cursor: pointer;
- }
>.async-spin {
line-height: 150px!important;
}
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 9beb7c6..614ad03 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -424,7 +424,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
diff --git a/src/tabviews/subtable/index.jsx b/src/tabviews/subtable/index.jsx
index d872d45..074d6c0 100644
--- a/src/tabviews/subtable/index.jsx
+++ b/src/tabviews/subtable/index.jsx
@@ -557,7 +557,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
diff --git a/src/tabviews/subtabtable/index.jsx b/src/tabviews/subtabtable/index.jsx
index 2daa24c..b08b1e1 100644
--- a/src/tabviews/subtabtable/index.jsx
+++ b/src/tabviews/subtabtable/index.jsx
@@ -500,7 +500,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = lines.map(item => (`
${item.insert}
${item.selects.join(` union all
diff --git a/src/tabviews/verupmanage/index.jsx b/src/tabviews/verupmanage/index.jsx
index 22c47a4..fe65a69 100644
--- a/src/tabviews/verupmanage/index.jsx
+++ b/src/tabviews/verupmanage/index.jsx
@@ -450,7 +450,7 @@
}
render() {
- const { searchlist, setting, actions, columns, pickup, config, selectedData } = this.state
+ const { searchlist, setting, actions, columns, pickup, config, selectedData, pageSize } = this.state
return (
<div className="veruptable" id={this.state.ContainerId}>
@@ -478,6 +478,7 @@
pickup={pickup}
setting={setting}
columns={columns}
+ pageSize={pageSize}
dict={this.state.dict}
data={this.state.data}
total={this.state.total}
diff --git a/src/tabviews/verupmanage/subtabtable/index.jsx b/src/tabviews/verupmanage/subtabtable/index.jsx
index d33454c..a64b977 100644
--- a/src/tabviews/verupmanage/subtabtable/index.jsx
+++ b/src/tabviews/verupmanage/subtabtable/index.jsx
@@ -46,7 +46,7 @@
total: 0, // 鎬绘暟
loading: false, // 鍒楄〃鏁版嵁鍔犺浇涓�
pageIndex: 1, // 椤电爜
- pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
+ pageSize: 100, // 姣忛〉鏁版嵁鏉℃暟
orderBy: '', // 鎺掑簭
search: '', // 鎼滅储鏉′欢鏁扮粍锛屼娇鐢ㄦ椂闇�鍒嗗満鏅鐞�
popAction: false, // 寮规椤甸潰锛屾寜閽俊鎭�
@@ -350,29 +350,6 @@
}
/**
- * @description 椤甸潰鍒锋柊锛岄噸鏂拌幏鍙栭厤缃�
- */
- reloadview = () => {
- this.setState({
- config: null,
- searchlist: null,
- actions: null,
- columns: null,
- arr_field: '',
- setting: null,
- data: null,
- total: 0,
- loading: false,
- pageIndex: 1,
- pageSize: 10,
- orderBy: '',
- search: ''
- }, () => {
- this.loadconfig()
- })
- }
-
- /**
* @description 鎸夐挳鎿嶄綔瀹屾垚鍚庯紙鎴愬姛鎴栧け璐ワ級锛岄〉闈㈠埛鏂帮紝閲嶇疆椤电爜鍙婇�夋嫨椤�
*/
refreshbyaction = (btn, type) => {
@@ -380,16 +357,6 @@
this.reloadtable()
} else if (btn.execError === 'grid' && type === 'error') {
this.reloadtable()
- } else if (btn.execSuccess === 'view' && type === 'success') {
- this.reloadview()
- } else if (btn.execError === 'view' && type === 'error') {
- this.reloadview()
- } else if (btn.popClose === 'grid' && type === 'pop') {
- this.reloadtable()
- } else if (btn.popClose === 'view' && type === 'pop') {
- this.reloadview()
- } else if (btn.popClose === 'maingrid' && type === 'pop') {
- this.props.handleMainTable('maingrid')
}
}
@@ -446,7 +413,7 @@
}
render() {
- const { BID, BData, setting, searchlist, actions, columns, pickup, selectedData } = this.state
+ const { BID, BData, setting, searchlist, actions, columns, pickup, selectedData, pageSize } = this.state
return (
<div className="verup-subtable" id={'subtable' + this.props.MenuID}>
@@ -481,6 +448,7 @@
pickup={pickup}
setting={setting}
columns={columns}
+ pageSize={pageSize}
dict={this.state.dict}
data={this.state.data}
total={this.state.total}
diff --git a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
index d31fe59..3db61f6 100644
--- a/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/exceloutbutton/index.jsx
@@ -825,7 +825,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
param.custom_script && console.info(`${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${param.custom_script}`)
LText && console.info(LText)
}
diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx
index 55ca27b..4edf0ee 100644
--- a/src/tabviews/zshare/actionList/normalbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx
@@ -1214,7 +1214,7 @@
sql = _prevCustomScript + sql
sql = sql + _backCustomScript
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
@@ -1251,7 +1251,7 @@
Sort: index + 1
}))
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let sql = [...lineMap.values()].map(item => (`
${item.insert}
${item.selects.join(` union all
diff --git a/src/templates/zshare/editTable/index.jsx b/src/templates/zshare/editTable/index.jsx
index b1408c8..ef0ff17 100644
--- a/src/templates/zshare/editTable/index.jsx
+++ b/src/templates/zshare/editTable/index.jsx
@@ -134,7 +134,7 @@
renderCell = (form) => {
const { getFieldDecorator } = form
- const { editing, dataIndex, title, record, children, className, required, inputType } = this.props
+ const { editing, dataIndex, title, record, children, className, required, inputType, rules } = this.props
return (
<td className={className}>
@@ -145,7 +145,8 @@
{
required: required,
message: ['number', 'text', 'input'].includes(inputType) ? `${eTDict['form.required.input']} ${title}!` : `${eTDict['form.required.select']} ${title}!`,
- }
+ },
+ ...rules
],
initialValue: inputType === 'multiStr' ? (record[dataIndex] ? record[dataIndex].split(',') : []) : record[dataIndex],
})(this.getInput(form))}
@@ -576,6 +577,7 @@
inputType: col.inputType,
dataIndex: col.dataIndex,
options: col.options || [],
+ rules: col.rules || [],
min: col.min || 0,
max: col.max || 500,
unlimit: col.unlimit,
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 4b98d65..6c428a5 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -200,7 +200,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈�*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧�*/\n` : ''}` + LText)
}
@@ -339,7 +339,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈� 缁熻鏌ヨ*/\n` : ''}${LText ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
LText && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧� 缁熻鏌ヨ*/\n` : ''}` + LText)
}
@@ -462,7 +462,7 @@
})
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
}
@@ -537,7 +537,7 @@
sql = _prevCustomScript + sql
sql = sql + _backCustomScript
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql.replace(/\n\s{8}/ig, '\n'))
}
@@ -695,7 +695,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
_customScript && console.info(`${setting.$name ? `/*${setting.$name} 鑷畾涔夎剼鏈紙鍚屾鏌ヨ锛�*/\n` : ''}${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
_dataresource && console.info(`${setting.$name ? `/*${setting.$name} 鏁版嵁婧愶紙鍚屾鏌ヨ锛�*/\n` : ''}` + _dataresource)
}
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2b99084..6e6596a 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -851,7 +851,7 @@
sql = sql.replace(/@db@/ig, window.GLOB.externalDatabase)
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
console.info(sql)
}
@@ -1143,7 +1143,7 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -1355,7 +1355,7 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
let fsql = `
${_sql}
${_sqlInsert}
@@ -2102,7 +2102,7 @@
aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
}
- if ((window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
// _sql = _sql.replace(/\n\s{8}/ig, '\n')
console.info(_sql)
}
diff --git a/src/views/billprint/index.jsx b/src/views/billprint/index.jsx
index a3764b8..ca30872 100644
--- a/src/views/billprint/index.jsx
+++ b/src/views/billprint/index.jsx
@@ -308,7 +308,7 @@
}
// 娴嬭瘯绯荤粺鎵撳嵃鏌ヨ璇彞
- if ((options.sysType === 'local' && !window.GLOB.systemType) || window.debugger === true) {
+ if (window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')) {
_customScript && console.info(`${_dataresource ? '' : '/*涓嶆墽琛岄粯璁ql*/\n'}${_customScript}`)
_dataresource && console.info(_dataresource)
}
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index 6ec5486..39bfb4a 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -326,7 +326,7 @@
setTimeout(() => {
sessionStorage.removeItem('loginError')
- }, 1500)
+ }, 2000)
}
const _addressUrl = _href + 'queryAddress'
--
Gitblit v1.8.0