From 7b0dbecd1d6155d26ec67be0a47a16264c738c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 09 五月 2023 14:48:10 +0800
Subject: [PATCH] 2023-05-09
---
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 269 +++++++++++++++++++++++------------------------------
1 files changed, 118 insertions(+), 151 deletions(-)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 1fef86d..4580eb7 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -1,8 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Tabs, Row, Col, Input, Button, Table, Popconfirm, Icon, Tooltip, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
-import { QuestionCircleOutlined } from '@ant-design/icons'
+import { Form, Tabs, Row, Col, Input, Button, Popconfirm, Tooltip, notification, Modal, message, InputNumber, Radio, Typography } from 'antd'
+import { EditOutlined, QuestionCircleOutlined, StopOutlined, CheckCircleOutlined, SwapOutlined, DeleteOutlined } from '@ant-design/icons'
import moment from 'moment'
import Api from '@/api'
@@ -12,6 +12,7 @@
import ColumnForm from './columnform'
import CustomScript from './customscript'
import asyncComponent from '@/utils/asyncComponent'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const { TabPane } = Tabs
@@ -22,7 +23,6 @@
class VerifyCard extends Component {
static propTpyes = {
columns: PropTypes.array, // 鏄剧ず鍒�
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object,
}
@@ -32,7 +32,7 @@
activeKey: 'basemsg',
excelColumns: [
{
- title: this.props.dict['model.form.field'],
+ title: '瀛楁',
dataIndex: 'Column',
width: '14%',
inputType: 'input',
@@ -40,14 +40,14 @@
editable: true
},
{
- title: this.props.dict['model.name'],
+ title: '鍚嶇О',
dataIndex: 'Text',
width: '14%',
inputType: 'input',
editable: true
},
{
- title: this.props.dict['model.form.type'],
+ title: '绫诲瀷',
dataIndex: 'type',
width: '15%',
editable: true,
@@ -71,20 +71,20 @@
]
},
{
- title: this.props.dict['model.required'],
+ title: '蹇呭～',
dataIndex: 'required',
width: '10%',
editable: true,
inputType: 'switch',
- render: (text, record) => record.required === 'true' ? this.props.dict['model.true'] : this.props.dict['model.false']
+ render: (text, record) => record.required === 'true' ? '鏄�' : '鍚�'
},
{
- title: this.props.dict['model.import'],
+ title: '瀵煎叆',
dataIndex: 'import',
width: '10%',
editable: true,
inputType: 'switch',
- render: (text, record) => record.import !== 'false' ? this.props.dict['model.true'] : this.props.dict['model.false']
+ render: (text, record) => record.import !== 'false' ? '鏄�' : '鍚�'
},
{
title: '鏈�灏忓��',
@@ -122,7 +122,7 @@
{
title: '鎶ラ敊缂栫爜',
dataIndex: 'errorCode',
- width: '12%',
+ width: '10%',
editable: true,
inputType: 'select',
options: [
@@ -135,13 +135,24 @@
{
title: '楠岃瘉绫诲瀷',
dataIndex: 'verifyType',
- width: '12%',
- render: (text, record) => record.verifyType === 'logic' ? '閫昏緫楠岃瘉' : '鐗╃悊楠岃瘉',
+ width: '14%',
+ render: (text, record) => {
+ let names = {
+ physical: '鐗╃悊楠岃瘉锛堝叏閲忛獙璇侊級',
+ logic: '閫昏緫楠岃瘉锛堝叏閲忛獙璇侊級',
+ physical_temp: '鐗╃悊楠岃瘉锛堜粎涓存椂琛級',
+ logic_temp: '閫昏緫楠岃瘉锛堜粎涓存椂琛級',
+ }
+
+ return names[text] || '鐗╃悊楠岃瘉锛堝叏閲忛獙璇侊級'
+ },
inputType: 'select',
editable: true,
options: [
- { value: 'physical', text: '鐗╃悊楠岃瘉' },
- { value: 'logic', text: '閫昏緫楠岃瘉' }
+ { value: 'physical', text: '鐗╃悊楠岃瘉锛堝叏閲忛獙璇侊級' },
+ { value: 'logic', text: '閫昏緫楠岃瘉锛堝叏閲忛獙璇侊級' },
+ { value: 'physical_temp', text: '鐗╃悊楠岃瘉锛堜粎涓存椂琛級' },
+ { value: 'logic_temp', text: '閫昏緫楠岃瘉锛堜粎涓存椂琛級' }
]
},
{
@@ -153,15 +164,15 @@
inputType: 'switch',
render: (text, record) => record.status === 'false' ?
(
- <div>
- {this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <div style={{color: '#ff4d4f'}}>
+ 绂佺敤
+ <StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
(
- <div>
- {this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <div style={{color: '#26C281'}}>
+ 鍚敤
+ <CheckCircleOutlined style={{marginLeft: '5px'}}/>
</div>
)
},
@@ -174,12 +185,12 @@
render: (text) => {
let title = text.match(/^\s*\/\*.+\*\//)
title = title && title[0] ? title[0] : ''
- text = title ? text.replace(title, '') : text
+ let _text = title ? text.replace(title, '') : text
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
- <Paragraph copyable ellipsis={{ rows: 4, expandable: true }}>{text}</Paragraph>
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
+ <Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
}
@@ -189,15 +200,13 @@
dataIndex: 'position',
width: '10%',
render: (text, record) => {
- let _text = ''
- if (record.position === 'front') {
- _text = 'sql鍓�'
- } else if (record.position === 'init') {
- _text = '鍒濆鍖�'
+ if (record.position === 'init') {
+ return <span style={{color: 'orange'}}>鍒濆鍖�</span>
+ } else if (record.position === 'front') {
+ return <span style={{color: '#26C281'}}>sql鍓�</span>
} else {
- _text = 'sql鍚�'
+ return <span style={{color: '#1890ff'}}>sql鍚�</span>
}
- return _text
}
},
{
@@ -206,35 +215,33 @@
width: '10%',
render: (text, record) => record.status === 'false' ?
(
- <div>
- {this.props.dict['model.status.forbidden']}
- <Icon style={{marginLeft: '5px'}} type="stop" theme="twoTone" twoToneColor="#ff4d4f" />
+ <div style={{color: '#ff4d4f'}}>
+ 绂佺敤
+ <StopOutlined style={{marginLeft: '5px'}} />
</div>
) :
(
- <div>
- {this.props.dict['model.status.open']}
- <Icon style={{marginLeft: '5px'}} type="check-circle" theme="twoTone" twoToneColor="#52c41a" />
+ <div style={{color: '#26C281'}}>
+ 鍚敤
+ <CheckCircleOutlined style={{marginLeft: '5px'}}/>
</div>
)
},
{
title: '鎿嶄綔',
align: 'center',
- width: '20%',
+ width: '140px',
dataIndex: 'operation',
render: (text, record) =>
- (<div>
- <span className="operation-btn" title={this.props.dict['model.edit']} onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><Icon type="edit" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.up']} onClick={() => this.handleUpDown(record, 'scripts', 'up')} style={{color: '#1890ff'}}><Icon type="arrow-up" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.down']} onClick={() => this.handleUpDown(record, 'scripts', 'down')} style={{color: '#ff4d4f'}}><Icon type="arrow-down" /></span>
- <span className="operation-btn" title={this.props.dict['header.form.status.change']} onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><Icon type="swap" /></span>
+ (<div style={{textAlign: 'center'}}>
+ <span className="operation-btn" title="缂栬緫" onClick={() => this.handleEdit(record, 'scripts')} style={{color: '#1890ff'}}><EditOutlined /></span>
+ <span className="operation-btn" title="鐘舵�佸垏鎹�" onClick={() => this.handleStatus(record, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
<Popconfirm
overlayClassName="popover-confirm"
- title={this.props.dict['model.query.delete']}
+ title="纭畾鍒犻櫎鍚�?"
onConfirm={() => this.handleDelete(record, 'scripts')
}>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><Icon type="delete" /></span>
+ <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
</Popconfirm>
</div>)
}
@@ -243,13 +250,22 @@
UNSAFE_componentWillMount() {
const { card } = this.props
- let _verify = fromJS(card.verify || {range: 1}).toJS()
+ let _verify = fromJS(card.verify || {}).toJS()
let _columns = _verify.columns || []
+
+ delete _verify.dataresource
// 鏃ф暟鎹吋瀹�
_columns = _columns.map(col => {
col.required = col.required || 'true'
col.type = col.type || 'Nvarchar(50)'
+ col.import = col.import || 'true'
+
+ if (col.type === 'text' || col.type === 'image') {
+ col.type = 'Nvarchar(50)'
+ } else if (col.type === 'number') {
+ col.type = 'Decimal(18,2)'
+ }
if (/^Nvarchar/ig.test(col.type)) {
col.limit = col.type.match(/\d+/)[0]
@@ -261,6 +277,10 @@
return col
})
+
+ if (!_verify.hasOwnProperty('range')) {
+ _verify.range = 1
+ }
this.setState({
verify: {
@@ -278,6 +298,17 @@
}
componentDidMount () {
+ this.getsysScript()
+ }
+
+ getsysScript = () => {
+ if (sessionStorage.getItem('mk_sys_scripts')) {
+ this.setState({
+ systemScripts: JSON.parse(sessionStorage.getItem('mk_sys_scripts'))
+ })
+ return
+ }
+
let _scriptSql = `Select distinct func+Remark as funcname,longparam, s.Sort from聽 s_custom_script s inner join (select OpenID from sapp where ID=@Appkey@) p on s.openid = case when s.appkey='' then s.openid else p.OpenID end order by s.Sort`
_scriptSql = Utils.formatOptions(_scriptSql)
@@ -291,18 +322,21 @@
_sParam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
_sParam.secretkey = Utils.encrypt(_sParam.LText, _sParam.timestamp)
-
_sParam.open_key = Utils.encryptOpenKey(_sParam.secretkey, _sParam.timestamp) // 浜戠鏁版嵁楠岃瘉
Api.getSystemConfig(_sParam).then(res => {
if (res.status) {
+ let _scripts = res.data.map(item => {
+ return {
+ name: item.funcname,
+ value: window.decodeURIComponent(window.atob(item.longparam))
+ }
+ })
+
+ sessionStorage.setItem('mk_sys_scripts', JSON.stringify(_scripts))
+
this.setState({
- systemScripts: res.data.map(item => {
- return {
- name: item.funcname,
- value: window.decodeURIComponent(window.atob(item.longparam))
- }
- })
+ systemScripts: _scripts
})
} else {
notification.warning({
@@ -341,7 +375,7 @@
let _columns = JSON.parse(JSON.stringify(verify.columns))
- let _cols = _columns.map(col => col.Column )
+ let _cols = _columns.map(col => col.Column)
columns.forEach(col => {
if (col.field && !_cols.includes(col.field)) {
@@ -430,23 +464,14 @@
changeColumns = (columns) => {
const { verify } = this.state
- if (columns[0] && (columns[0].type === 'image' || columns[0].type === 'text')) {
- columns = columns.map(col => {
- let _cell = {
- uuid: Utils.getuuid(),
- Column: col.Column,
- Text: col.Text,
- type: 'Nvarchar(50)',
- limit: '50',
- import: 'true',
- required: 'true'
- }
-
- return _cell
- })
- }
-
columns = columns.map(col => {
+ col.type = col.type || 'Nvarchar(50)'
+ if (col.type === 'text' || col.type === 'image') {
+ col.type = 'Nvarchar(50)'
+ } else if (col.type === 'number') {
+ col.type = 'Decimal(18,2)'
+ }
+
if (/^Nvarchar/ig.test(col.type)) {
col.limit = col.type.match(/\d+/) ? col.type.match(/\d+/)[0] : '20000'
} else if (/^Decimal/ig.test(col.type)) {
@@ -457,6 +482,9 @@
} else {
col.limit = ''
}
+
+ col.required = col.required || 'true'
+ col.import = col.import || 'true'
return col
})
@@ -520,6 +548,8 @@
verify.scripts.push(values)
}
+ MKEmitter.emit('editLineId', values.uuid)
+
this.setState({
verify: verify
})
@@ -540,11 +570,12 @@
}
handleEdit = (record, type) => {
+ let node = null
+
if (type === 'scripts') {
this.scriptsForm.edit(record)
+ node = document.getElementById('mk-exin-script')
}
-
- let node = document.getElementById('verify-excel-box-tab').parentNode
if (node && node.scrollTop) {
let inter = Math.ceil(node.scrollTop / 10)
@@ -580,68 +611,6 @@
return item
}
})
- }
-
- this.setState({
- verify: verify
- })
- }
-
- handleUpDown = (record, type, direction) => {
- let verify = JSON.parse(JSON.stringify(this.state.verify))
- let index = 0
-
- if (type === 'columns') {
- verify.columns = verify.columns.filter((item, i) => {
- if (item.uuid === record.uuid) {
- index = i
- }
-
- return item.uuid !== record.uuid
- })
- if ((index === 0 && direction === 'up') || (index === verify.columns.length && direction === 'down')) {
- return
- }
-
- if (direction === 'up') {
- verify.columns.splice(index - 1, 0, record)
- } else {
- verify.columns.splice(index + 1, 0, record)
- }
- } else if (type === 'unique') {
- verify.uniques = verify.uniques.filter((item, i) => {
- if (item.uuid === record.uuid) {
- index = i
- }
-
- return item.uuid !== record.uuid
- })
- if ((index === 0 && direction === 'up') || (index === verify.uniques.length && direction === 'down')) {
- return
- }
-
- if (direction === 'up') {
- verify.uniques.splice(index - 1, 0, record)
- } else {
- verify.uniques.splice(index + 1, 0, record)
- }
- } else if (type === 'scripts') {
- verify.scripts = verify.scripts.filter((item, i) => {
- if (item.uuid === record.uuid) {
- index = i
- }
-
- return item.uuid !== record.uuid
- })
- if ((index === 0 && direction === 'up') || (index === verify.scripts.length && direction === 'down')) {
- return
- }
-
- if (direction === 'up') {
- verify.scripts.splice(index - 1, 0, record)
- } else {
- verify.scripts.splice(index + 1, 0, record)
- }
}
this.setState({
@@ -797,19 +766,25 @@
}
return (
- <div id="verify-excel-box-tab">
- <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.tabchange}>
+ <div>
+ {card.label ? <div className="mk-com-name">{card.label} - 楠岃瘉淇℃伅</div> : null}
+ <Tabs activeKey={activeKey} className="excelin-verify-card-box" onChange={this.tabchange}>
<TabPane tab="鍩虹楠岃瘉" key="basemsg">
<Form {...formItemLayout}>
<Row gutter={24}>
<Col span={8}>
- <Form.Item label={this.props.dict['model.form.tablename']}>
+ <Form.Item label={
+ <Tooltip placement="bottomLeft" title="瀵煎叆鏃跺伐浣滆〃鍚嶄笌excel涓繀椤讳竴鑷达紝娉細宸ヤ綔琛ㄥ悕涓篠heet1涓攅xcel涓粎鏈変竴涓伐浣滆〃鏃朵笉杩涜琛ㄥ悕楠岃瘉銆�">
+ <QuestionCircleOutlined className="mk-form-tip" />
+ 宸ヤ綔琛�
+ </Tooltip>
+ }>
{getFieldDecorator('sheet', {
initialValue: verify.sheet || '',
rules: [
{
required: true,
- message: this.props.dict['form.required.input'] + this.props.dict['model.form.tablename'] + '!'
+ message: '璇疯緭鍏ュ伐浣滆〃鍚�!'
}
]
})(<Input placeholder="" autoComplete="off" />)}
@@ -844,7 +819,7 @@
{verify.columns.length ? <span className="count-tip">{verify.columns.length}</span> : null}
</span>
} key="excelcolumn">
- <ColumnForm dict={this.props.dict} columnChange={this.columnChange}/>
+ <ColumnForm columnChange={this.columnChange}/>
<Button className="excel-col-add mk-green" title="娣诲姞鏄剧ず鍒楀瓧娈�" onClick={this.columnFieldInput}>
鍚屾鏄剧ず鍒�
</Button>
@@ -860,17 +835,16 @@
{verify.uniques.length ? <span className="count-tip">{verify.uniques.length}</span> : null}
</span>
} key="unique">
- <UniqueForm fields={verify.columns} dict={this.props.dict} uniqueChange={this.uniqueChange}/>
- <EditTable actions={['edit', 'move', 'del']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
+ <UniqueForm fields={verify.columns} uniqueChange={this.uniqueChange}/>
+ <EditTable actions={['edit', 'move', 'del', 'status']} data={verify.uniques} columns={uniqueColumns} onChange={this.changeUniques}/>
</TabPane> : null}
{card.intertype === 'system' ? <TabPane tab={
<span>
鑷畾涔夎剼鏈�
{verify.scripts.length ? <span className="count-tip">{verify.scripts.length}</span> : null}
</span>
- } key="scripts">
+ } key="scripts" id="mk-exin-script">
<CustomScript
- dict={this.props.dict}
btn={this.props.card}
usefulfields={verify.columns}
scripts={verify.scripts}
@@ -878,14 +852,7 @@
scriptsChange={this.scriptsChange}
wrappedComponentRef={(inst) => this.scriptsForm = inst}
/>
- <Table
- bordered
- rowKey="uuid"
- className="custom-table"
- dataSource={verify.scripts}
- columns={scriptsColumns}
- pagination={false}
- />
+ <EditTable actions={['move']} data={verify.scripts} columns={scriptsColumns} onChange={(scripts) => {this.setState({verify: {...verify, scripts}})}}/>
</TabPane> : null}
<TabPane tab="淇℃伅鎻愮ず" key="tip">
<Form {...formItemLayout}>
--
Gitblit v1.8.0