From 8d7c3eed8bdac1e77c8de90a3227d801708c358e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 15 五月 2023 21:12:56 +0800 Subject: [PATCH] 2023-05-15 --- src/menu/components/table/edit-table/columns/editColumn/index.jsx | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 100 insertions(+), 9 deletions(-) diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx index ba7f32b..0f479c0 100644 --- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx +++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx @@ -1,9 +1,12 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Modal, notification } from 'antd' +import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Modal, notification, Popover } from 'antd' import { QuestionCircleOutlined } from '@ant-design/icons' +import moment from 'moment' +import Api from '@/api' +import Utils from '@/utils/utils.js' import { getColumnForm } from './formconfig' import { formRule } from '@/utils/option.js' import CodeMirror from '@/templates/zshare/codemirror' @@ -14,12 +17,12 @@ const { TextArea } = Input const columnTypeOptions = { text: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'prefix', 'postfix', 'textFormat', 'editable', 'initval', 'blacklist'], - number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'editable', 'initval', 'sum', 'blacklist'], + number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'editable', 'initval', 'sum', 'blacklist', 'noValue'], textarea: ['label', 'field', 'type', 'Align', 'Hide', 'Width', 'prefix', 'initval', 'postfix', 'blacklist'], custom: ['label', 'type', 'Align', 'Width', 'blacklist'], colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'], action: ['label', 'type', 'Align', 'Width'], - formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist'], + formula: ['label', 'type', 'Align', 'Hide', 'Width', 'prefix', 'postfix', 'eval', 'formula', 'blacklist', 'noValue'], index: ['label', 'type', 'Align', 'Width'] } @@ -35,6 +38,7 @@ state = { visible: false, + loading: false, formlist: null, transfield: {} } @@ -107,6 +111,11 @@ formlist: formlist.map(item => { item.hidden = !_options.includes(item.key) + if (item.key === 'formula') { + item.fields = this.props.fields.map(col => col.field) + item.fields = item.fields.join(', ') + } + return item }) }) @@ -128,6 +137,11 @@ if (key === 'type') { let _options = this.getOptions() + let _field = '' + if (value === 'formula') { + _field = this.props.form.getFieldValue('field') || '' + } + this.setState({ formlist: this.state.formlist.map(item => { item.initVal = this.column[item.key] || item.initVal @@ -136,8 +150,14 @@ return item }) }, () => { - if (value === 'action' || value === 'colspan') { + if (value === 'colspan') { this.props.form.setFieldsValue({Align: 'center'}) + } else if (value === 'formula' && _field) { + this.props.form.setFieldsValue({formula: '@' + _field + '@'}) + } else if (value === 'action') { + this.props.form.setFieldsValue({Align: 'center', label: '鎿嶄綔'}) + } else if (value === 'index') { + this.props.form.setFieldsValue({label: '搴忓彿'}) } }) } else if (key === 'field') { @@ -314,6 +334,28 @@ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' } ] + if (item.key === 'formula') { + fields.push( + <Col span={span} key={index}> + <Form.Item className={className} extra={extra} label={item.tooltip ? + <Tooltip placement="topLeft" title={item.tooltip}> + <QuestionCircleOutlined className="mk-form-tip" /> + {item.label} + </Tooltip> : item.label + }> + {getFieldDecorator(item.key, { + initialValue: initVal, + rules: rules + })(<TextArea rows={item.rows || 2}/>)} + </Form.Item> + <Popover overlayClassName="formula-fields" placement="topLeft" title="" content={<div>{item.fields}</div>} trigger="click"> + <span className="formula-icon">瀛楁闆�</span> + </Popover> + </Col> + ) + return + } + content = <TextArea rows={item.rows || 2}/> } else if (item.type === 'codemirror') { rules = [ @@ -367,22 +409,70 @@ return } } - this.setState({visible: false, formlist: null}) - this.props.submitCol(values) - this.column = null + if (values.dataSource && /\s/.test(values.dataSource)) { + let error = Utils.verifySql(values.dataSource) + + if (error) { + notification.warning({ + top: 92, + message: '鏁版嵁婧愪腑涓嶅彲浣跨敤' + error, + duration: 5 + }) + return + } + + this.setState({ + loading: true + }) + + let param = { + func: 's_debug_sql', + exec_type: 'y', + LText: `declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) + ${values.dataSource}` + } + + param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') + param.LText = param.LText.replace(/@\$|\$@/ig, '').replace(/@(BID|ID|LoginUID|SessionUid|UserID|Appkey|time_id)@/ig, `'${param.timestamp}'`) + param.LText = param.LText.replace(/\n/g, ' ') + + param.LText = Utils.formatOptions(param.LText) + param.secretkey = Utils.encrypt('', param.timestamp) + + if (window.GLOB.mainSystemApi && values.database === 'sso') { + param.rduri = window.GLOB.mainSystemApi + } + + Api.genericInterface(param).then(result => { + if (result.status) { + this.setState({visible: false, loading: false, formlist: null}) + this.props.submitCol(values) + this.column = null + } else { + this.setState({loading: false}) + Modal.error({ + title: result.message + }) + } + }) + } else { + this.setState({visible: false, formlist: null}) + this.props.submitCol(values) + this.column = null + } } }) } editModalCancel = () => { - this.setState({visible: false, formlist: null}) + this.setState({visible: false, loading: false, formlist: null}) this.props.cancelCol() } render() { - const { visible } = this.state + const { visible, loading } = this.state const formItemLayout = { labelCol: { xs: { span: 24 }, @@ -403,6 +493,7 @@ maskClosable={false} onOk={this.handleSubmit} onCancel={this.editModalCancel} + confirmLoading={loading} destroyOnClose > <Form {...formItemLayout} className="commontable-column-form" id="edit-table-column-winter"> -- Gitblit v1.8.0