From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/templates/zshare/verifycard/index.jsx | 192 +++++++++++++++++++-----------------------------
1 files changed, 76 insertions(+), 116 deletions(-)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index b2be305..ade0e92 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Form, Tabs, Row, Col, Button, Popconfirm, notification, Modal, message, InputNumber, Typography } from 'antd'
-import { CheckCircleOutlined, StopOutlined, EditOutlined, SwapOutlined, DeleteOutlined, ExclamationOutlined, BorderOutlined } from '@ant-design/icons'
+import { CheckCircleOutlined, StopOutlined, EditOutlined, SwapOutlined, DeleteOutlined, ExclamationOutlined } from '@ant-design/icons'
import Toast from 'antd-mobile/es/components/toast'
import Dialog from 'antd-mobile/es/components/dialog'
import moment from 'moment'
@@ -21,13 +21,13 @@
import asyncComponent from '@/utils/asyncComponent'
import { updateForm } from '@/utils/utils-update.js'
import MKEmitter from '@/utils/events.js'
-import MinView from '@/assets/img/minview.png'
import './index.scss'
const { TabPane } = Tabs
const { confirm } = Modal
const { Paragraph } = Typography
const EditTable = asyncComponent(() => import('@/templates/zshare/editTable'))
+const FullScripts = asyncComponent(() => import('./fullScripts'))
class VerifyCard extends Component {
static propTpyes = {
@@ -44,8 +44,6 @@
appType: sessionStorage.getItem('appType'),
notes: [], // 鐭俊妯℃澘
setting: null,
- visible: false,
- scriptId: '',
verify: {},
fields: [],
usefulfields: '',
@@ -545,7 +543,11 @@
let _invalid = _verify.invalid
if (!_invalid) { // 閫夋嫨琛屾椂锛屽け鏁堥獙璇侀粯璁ゅ紑鍚�
- _invalid = card.Ot !== 'notRequired' ? 'true' : 'false'
+ if (config.setting && config.setting.maxScript && config.setting.maxScript >= 300) {
+ _invalid = 'false'
+ } else {
+ _invalid = card.Ot !== 'notRequired' ? 'true' : 'false'
+ }
}
if (card.sqlType === 'custom') { // 鑷畾涔夐獙璇佹椂锛屼笉浣跨敤榛樿sql
_verify.default = 'false'
@@ -664,15 +666,36 @@
resolve(_fields)
}
}).then(_fields => {
- let _usefulfields = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'tbid']
- let _declare = ['@UserName nvarchar(50)', '@FullName nvarchar(50)', '@RoleID nvarchar(512)', '@mk_departmentcode nvarchar(512)', '@mk_organization nvarchar(512)', '@mk_user_type nvarchar(20)', '@mk_nation nvarchar(50)', '@mk_province nvarchar(50)', '@mk_city nvarchar(50)', '@mk_district nvarchar(50)', '@mk_address nvarchar(100)', '@ErrorCode nvarchar(50)', '@retmsg nvarchar(4000)', '@BillCode nvarchar(50)', '@BVoucher nvarchar(50)', '@FIBVoucherDate nvarchar(50)', '@FiYear nvarchar(50)', '@ModularDetailCode nvarchar(50)', '@bid nvarchar(50)', '@tbid nvarchar(50)']
- let _select = ['@UserName=\'\'', '@FullName=\'\'', '@RoleID=\'\'', '@mk_departmentcode=\'\'', '@mk_organization=\'\'', '@mk_user_type=\'\'', '@mk_nation=\'\'', '@mk_province=\'\'', '@mk_city=\'\'', '@mk_district=\'\'', '@mk_address=\'\'', '@ErrorCode=\'\'', '@retmsg=\'\'', '@BillCode=\'\'', '@BVoucher=\'\'', '@FIBVoucherDate=\'\'', '@FiYear=\'\'', '@ModularDetailCode=\'\'', '@bid=\'\'']
+ let _usefulfields = ['UserName', 'FullName', 'RoleID', 'mk_departmentcode', 'mk_organization', 'mk_user_type', 'mk_nation', 'mk_province', 'mk_city', 'mk_district', 'mk_address', 'BillCode', 'BVoucher', 'FIBVoucherDate', 'FiYear', 'ModularDetailCode', 'tbid', 'mk_deleted']
+ let _declare = ['@UserName nvarchar(50)', '@FullName nvarchar(50)', '@RoleID nvarchar(512)', '@mk_departmentcode nvarchar(512)', '@mk_organization nvarchar(512)', '@mk_user_type nvarchar(20)', '@mk_nation nvarchar(50)', '@mk_province nvarchar(50)', '@mk_city nvarchar(50)', '@mk_district nvarchar(50)', '@mk_address nvarchar(100)', '@ErrorCode nvarchar(50)', '@retmsg nvarchar(4000)', '@BillCode nvarchar(50)', '@BVoucher nvarchar(50)', '@FIBVoucherDate nvarchar(50)', '@FiYear nvarchar(50)', '@ModularDetailCode nvarchar(50)', '@bid nvarchar(50)', '@tbid nvarchar(50)', '@mk_deleted int']
+ let _select = ['@UserName=\'\'', '@FullName=\'\'', '@RoleID=\'\'', '@mk_departmentcode=\'\'', '@mk_organization=\'\'', '@mk_user_type=\'\'', '@mk_nation=\'\'', '@mk_province=\'\'', '@mk_city=\'\'', '@mk_district=\'\'', '@mk_address=\'\'', '@ErrorCode=\'\'', '@retmsg=\'\'', '@BillCode=\'\'', '@BVoucher=\'\'', '@FIBVoucherDate=\'\'', '@FiYear=\'\'', '@ModularDetailCode=\'\'', '@bid=\'\'', '@mk_deleted=1']
let fieldArr = _usefulfields.map(_f => _f.toLowerCase())
let hasBid = false
_usefulfields = []
fieldArr.push('bid')
+
+ let verIndex = _fields.findIndex(item => item.type === 'vercode')
+ if (verIndex > -1) {
+ _fields = fromJS(_fields).toJS()
+ _fields.splice(verIndex, 0, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_timestamp'
+ }, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_send_type'
+ }, {
+ type: 'text',
+ fieldlength: 50,
+ writein: 'false',
+ field: 'mk_n_id'
+ })
+ }
_fields = _fields.filter(_f => _f.field)
_fields.forEach(_f => {
@@ -788,6 +811,10 @@
let _insertsql = ''
let _updatesql = ''
let _primaryKey = config.setting.primaryKey || 'id'
+
+ if (this.props.side === 'sub') {
+ _primaryKey = config.setting.subKey || 'id'
+ }
if (card.sqlType === 'insert' || card.sqlType === 'insertOrUpdate') {
let keys = []
@@ -921,7 +948,7 @@
if (_verify.voucher && _verify.voucher.enabled) {
_voucher = ',BVoucher=@BVoucher,FIBVoucherDate=@FIBVoucherDate,FiYear=@FiYear'
}
- _defaultsql = `update ${card.sql} set deleted=1,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
+ _defaultsql = `update ${card.sql} set deleted=@mk_deleted,modifydate=getdate(),modifyuser=@username,modifystaff=@fullname,modifyuserid=@userid@${_voucher} where ${_primaryKey}${card.Ot !== 'requiredOnce' ? '=@ID@' : ' in (select ID from dbo.SplitComma(@ID@))'};`
} else if (card.sqlType === 'delete') {
let _msg = ''
if (columns && columns.length > 0 && card.Ot !== 'notRequired') {
@@ -1511,7 +1538,7 @@
render() {
const { card } = this.props
- const { activeKey, verifyInter, setting, verify, fields, visible, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
+ const { activeKey, verifyInter, setting, verify, fields, uniqueFields, uniqueColumns, unionFields, onceUniqueColumns, columnsFields, contrastColumns, customColumns, orderColumns, scriptsColumns, cbScriptsColumns, orderModular, orderModularDetail, voucher, voucherDetail, notes, appType } = this.state
const formItemLayout = {
labelCol: {
xs: { span: 24 },
@@ -1611,17 +1638,25 @@
{verify.scripts.length ? <span className="count-tip">{verify.scripts.length}</span> : null}
</span>
} key="scripts" id="mk-normal-script">
- <BorderOutlined className="full-scripts" onClick={() => {
- if (this.scriptsForm && (this.scriptsForm.state.editItem || (this.scriptsForm.props.form.getFieldValue('sql') && !/^\s+$/.test(this.scriptsForm.props.form.getFieldValue('sql'))))) {
- notification.warning({
- top: 92,
- message: '璇蜂繚瀛樿嚜瀹氫箟鑴氭湰锛�',
- duration: 5
- })
- return
- }
- this.setState({visible: true, scriptId: ''})
- }}/>
+ <FullScripts
+ verify={verify}
+ getScriptsFullForm={() => this.scriptsFullForm}
+ getScriptsForm={() => this.scriptsForm}
+ handleStatus={this.handleStatus}
+ handleDelete={this.handleDelete}
+ >
+ <CustomScript
+ type="fullscreen"
+ btn={this.props.card}
+ initsql={this.state.initsql}
+ customScripts={verify.scripts}
+ defaultsql={this.state.defaultsql}
+ usefulfields={this.state.usefulfields}
+ systemScripts={this.state.systemScripts}
+ scriptsChange={this.scriptsChange}
+ wrappedComponentRef={(inst) => this.scriptsFullForm = inst}
+ />
+ </FullScripts>
<CustomScript
btn={this.props.card}
initsql={this.state.initsql}
@@ -1655,7 +1690,7 @@
<Form {...formItemLayout}>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> S </span>
<Button onClick={() => {this.showError('S')}} type="primary" size="small">
鏌ョ湅
@@ -1663,14 +1698,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.stime || 2} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'stime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> Y </span>
<Button onClick={() => {this.showError('Y')}} type="primary" size="small">
鏌ョ湅
@@ -1680,7 +1715,15 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -1 </span>
+ 鎵ц鎴愬姛鏃犳彁绀恒��
+ </Form.Item>
+ </Col>
+ </Row>
+ <Row gutter={24}>
+ <Col offset={6} span={6}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> N </span>
<Button onClick={() => {this.showError('N')}} type="primary" size="small">
鏌ョ湅
@@ -1688,14 +1731,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ntime || (appType === 'mob' ? 3 : 10)} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ntime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> F </span>
<Button onClick={() => {this.showError('F')}} type="primary" size="small">
鏌ョ湅
@@ -1703,14 +1746,14 @@
</Form.Item>
</Col>
<Col span={8}>
- <Form.Item label={'鍋滅暀鏃堕棿'}>
+ <Form.Item label="鍋滅暀鏃堕棿">
<InputNumber defaultValue={verify.ftime || (appType === 'mob' ? 3 : 10)} min={1} max={10000} precision={0} onChange={(val) => {this.timeChange(val, 'ftime')}} />
</Form.Item>
</Col>
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> E </span>
<Button onClick={() => {this.showError('E')}} type="primary" size="small">
鏌ョ湅
@@ -1720,7 +1763,7 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
+ <Form.Item label="鎻愮ず缂栫爜">
<span className="errorval"> NM </span>
<Button onClick={() => {this.showError('NM')}} type="primary" size="small">
鏌ョ湅
@@ -1730,98 +1773,15 @@
</Row>
<Row gutter={24}>
<Col offset={6} span={6}>
- <Form.Item label={'鎻愮ず缂栫爜'}>
- <span className="errorval"> -1 </span>
- 涓嶆彁绀�
+ <Form.Item label="鎻愮ず缂栫爜">
+ <span className="errorval"> -2 </span>
+ 鎵ц澶辫触鏃犳彁绀�
</Form.Item>
</Col>
</Row>
</Form>
</TabPane>
</Tabs>
- <Modal
- wrapClassName="model-custom-scripts-modal"
- title="鑷畾涔夎剼鏈�"
- visible={visible}
- width={'95vw'}
- maskClosable={false}
- destroyOnClose
- >
- <img className="unfull-scripts" src={MinView} onClick={() => this.setState({visible: false, scriptId: ''})} alt=""/>
- <div className="script-table-wrap">
- {verify.scripts.map(item => {
- let title = item.sql.match(/^\s*\/\*.+\*\//)
- title = title && title[0] ? title[0] : ''
- let _text = title ? item.sql.replace(title, '') : item.sql
-
- let position = null
- if (item.position === 'init') {
- position = <span style={{color: 'orange'}}>鍒濆鍖�</span>
- } else if (item.position === 'front') {
- position = <span style={{color: '#26C281'}}>sql鍓�</span>
- } else {
- position = <span style={{color: '#1890ff'}}>sql鍚�</span>
- }
-
- if (item.status === 'false') {
- return (
- <div className="script-item" key={item.uuid}>
- <div style={{cursor: 'not-allowed'}}>
- {title ? <div style={{color: '#a50', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{title}</div> : null}
- <Paragraph copyable={{ text: item.sql }} ellipsis={{ rows: 4 }}>{_text}</Paragraph>
- <div>{position}
- <span style={{color: '#ff4d4f', marginLeft: '20px'}}>
- 绂佺敤
- <StopOutlined style={{marginLeft: '5px'}} />
- </span>
- </div>
- </div>
- <div style={{height: '24px'}}></div>
- </div>
- )
- } else {
- return (
- <div className={'script-item ' + (this.state.scriptId === item.uuid ? 'active' : '') } key={item.uuid}>
- <div style={{cursor: 'pointer'}} onClick={() => {
- this.scriptsFullForm.edit(item)
- this.setState({scriptId: item.uuid})
- }}>
- {title ? <div style={{color: '#a50', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{title}</div> : null}
- <Paragraph copyable={{ text: item.sql }} ellipsis={{ rows: 4 }}>{_text}</Paragraph>
- <div>{position}
- <span style={{color: '#26C281', marginLeft: '20px'}}>
- 鍚敤
- <CheckCircleOutlined style={{marginLeft: '5px'}}/>
- </span>
- </div>
- </div>
- <div style={{textAlign: 'right'}}>
- <span className="operation-btn" onClick={() => this.handleStatus(item, 'scripts')} style={{color: '#8E44AD'}}><SwapOutlined /></span>
- <Popconfirm
- overlayClassName="popover-confirm"
- title="纭畾鍒犻櫎鍚�?"
- onConfirm={() => this.handleDelete(item, 'scripts')
- }>
- <span className="operation-btn" style={{color: '#ff4d4f'}}><DeleteOutlined /></span>
- </Popconfirm>
- </div>
- </div>
- )
- }
- })}
- </div>
- <CustomScript
- type="fullscreen"
- btn={this.props.card}
- initsql={this.state.initsql}
- customScripts={verify.scripts}
- defaultsql={this.state.defaultsql}
- usefulfields={this.state.usefulfields}
- systemScripts={this.state.systemScripts}
- scriptsChange={this.scriptsChange}
- wrappedComponentRef={(inst) => this.scriptsFullForm = inst}
- />
- </Modal>
</div>
)
}
--
Gitblit v1.8.0