From 5e871a4164869bac7927ea6884dbadd650b1cadf Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 五月 2023 11:25:28 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/table/base-table/columns/editColumn/index.jsx |  200 +++++++++++++++++++++++++++++++------------------
 1 files changed, 125 insertions(+), 75 deletions(-)

diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index 1311e6e..16ae1ca 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -1,11 +1,10 @@
 import React, {Component} from 'react'
 import PropTypes from 'prop-types'
 import { is, fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal, Checkbox } from 'antd'
+import { Form, Row, Col, Input, Select, InputNumber, Radio, Tooltip, Cascader, Modal, Checkbox, Popover } from 'antd'
 import { QuestionCircleOutlined } from '@ant-design/icons'
 
 import { getColumnForm } from './formconfig'
-import { formRule } from '@/utils/option.js'
 import './index.scss'
 
 const { TextArea } = Input
@@ -25,7 +24,6 @@
 
 class NormalTableColumn extends Component {
   static propTpyes = {
-    visible: PropTypes.bool,
     column: PropTypes.object,
     fields: PropTypes.array,
     submitCol: PropTypes.func,  // 鎻愪氦浜嬩欢
@@ -36,6 +34,8 @@
     visible: false,
     formlist: null
   }
+
+  record = null
 
   UNSAFE_componentWillReceiveProps (nextProps) {
     if (nextProps.column && !is(fromJS(this.props.column), fromJS(nextProps.column))) {
@@ -50,20 +50,26 @@
     })
     
     let formlist = getColumnForm(column, fields)
-    let _options = fromJS(columnTypeOptions[column.type]).toJS()
-    if (column.type === 'text' || column.type === 'number') {
-      if (column.perspective === 'linkmenu') {
-        _options.push('linkmenu', 'linkfields', 'open')
-      } else if (column.perspective === 'linkurl') {
-        _options.push('linkurl', 'linkfields', 'open')
-      }
-    }
+
+    this.record = {}
+
+    formlist.forEach(item => {
+      this.record[item.key] = item.initVal
+    })
+    
+    let _options = this.getOptions()
 
     this.setState({
       visible: true,
-      type: column.type,
       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(', ')
+        } else if (this.record.type === 'formula' && item.key === 'decimal') {
+          item.required = false
+        }
 
         return item
       })
@@ -80,13 +86,41 @@
     }
   }
 
+  getOptions = () => {
+    let _options = fromJS(columnTypeOptions[this.record.type]).toJS()
+
+    if (this.record.type === 'text' || this.record.type === 'number') {
+      if (this.record.perspective === 'linkmenu') {
+        _options.push('linkmenu', 'linkfields', 'open')
+      } else if (this.record.perspective === 'linkurl') {
+        _options.push('linkurl', 'linkfields', 'open')
+      }
+    }
+    
+    if (this.record.type === 'formula' && this.record.eval === 'true') {
+      _options.push('decimal')
+    }
+
+    return _options
+  }
+
   typeChange = (key, value, option) => {
+    const { column } = this.props
+    this.record[key] = value
+
     if (key === 'type') {
-      let _options = fromJS(columnTypeOptions[value]).toJS()
+      let _options = this.getOptions()
 
       this.setState({
-        type: value,
         formlist: this.state.formlist.map(item => {
+          if (item.key === 'decimal') {
+            item.required = !(column.isSub || value === 'formula')
+            if (value === 'formula') {
+              this.record.decimal = ''
+            }
+          }
+
+          item.initVal = this.record[item.key]
           item.hidden = !_options.includes(item.key)
 
           return item
@@ -98,8 +132,6 @@
           this.props.form.setFieldsValue({perspective: ''})
         } else if (value === 'colspan') {
           this.props.form.setFieldsValue({Align: 'center'})
-        } else if (value === 'action') {
-          this.props.form.setFieldsValue({Align: 'center', label: '鎿嶄綔'})
         } else if (value === 'index') {
           this.props.form.setFieldsValue({label: '搴忓彿'})
         }
@@ -117,13 +149,18 @@
         values.type = 'text'
       }
 
-      if (values.type !== this.state.type) {
+      let _type = this.record.type
+      this.record.type = values.type
+
+      if (values.type !== _type) {
         values.perspective = ''
-        let _options = fromJS(columnTypeOptions[values.type]).toJS()
+        this.record.perspective = ''
+
+        let _options = this.getOptions()
 
         this.setState({
-          type: values.type,
           formlist: this.state.formlist.map(item => {
+            item.initVal = this.record[item.key]
             item.hidden = !_options.includes(item.key)
 
             return item
@@ -136,21 +173,12 @@
       }
     } else if (key === 'format' && value === 'percent') {
       this.props.form.setFieldsValue({postfix: '%'})
-    }
-  }
-
-  changeRadio = (key, value) => {
-    if (key === 'perspective') {
-      let _options = fromJS(columnTypeOptions[this.state.type]).toJS()
-
-      if (value === 'linkmenu') {
-        _options.push('linkmenu', 'linkfields', 'open')
-      } else if (value === 'linkurl') {
-        _options.push('linkurl', 'linkfields', 'open')
-      }
+    } else if (['perspective', 'eval'].includes(key)) {
+      let _options = this.getOptions()
 
       this.setState({
         formlist: this.state.formlist.map(item => {
+          item.initVal = this.record[item.key]
           item.hidden = !_options.includes(item.key)
 
           return item
@@ -170,21 +198,6 @@
       if (item.hidden || item.forbid) return
 
       if (item.type === 'text') {
-        let rules = []
-        if (item.key === 'field') {
-          rules = [{
-            pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
-            message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
-          }, {
-            max: formRule.input.max,
-            message: formRule.input.message
-          }]
-        } else if (item.key !== 'linkurl') {
-          rules = [{
-            max: formRule.input.max,
-            message: formRule.input.message
-          }]
-        }
         fields.push(
           <Col span={12} key={index}>
             <Form.Item label={item.tooltip ?
@@ -200,7 +213,7 @@
                     required: !!item.required,
                     message: '璇疯緭鍏�' + item.label + '!'
                   },
-                  ...rules
+                  ...item.rules
                 ]
               })(<Input placeholder="" autoComplete="off" disabled={item.readonly} onPressEnter={this.handleSubmit} />)}
             </Form.Item>
@@ -275,14 +288,10 @@
                   }
                 ]
               })(
-                <Radio.Group onChange={(e) => {this.changeRadio(item.key, e.target.value)}}>
-                  {
-                    item.options.map(option => {
-                      return (
-                        <Radio key={option.value} value={option.value}>{option.text}</Radio>
-                      )
-                    })
-                  }
+                <Radio.Group onChange={(e) => {this.typeChange(item.key, e.target.value)}}>
+                  {item.options.map(option => {
+                    return (<Radio key={option.value} value={option.value}>{option.text}</Radio>)
+                  })}
                 </Radio.Group>
               )}
             </Form.Item>
@@ -350,35 +359,76 @@
           </Col>
         )
       } else if (item.type === 'textarea') {
-        fields.push(
-          <Col span={24} key={index} className="textarea">
-            <Form.Item label={item.tooltip ?
-              <Tooltip placement="topLeft" title={item.tooltip}>
-                <QuestionCircleOutlined className="mk-form-tip" />
-                {item.label}
-              </Tooltip> : item.label
-            }>
-              {getFieldDecorator(item.key, {
-                initialValue: item.initVal || '',
-                rules: [
-                  {
-                    required: !!item.required,
-                    message: '璇疯緭鍏�' + item.label + '!'
-                  }
-                ]
-              })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''}/>)}
-            </Form.Item>
-          </Col>
-        )
+        if (item.key === 'formula') {
+          fields.push(
+            <Col span={24} className="textarea" key={index}>
+              <Form.Item label={item.tooltip ?
+                <Tooltip placement="topLeft" title={item.tooltip}>
+                  <QuestionCircleOutlined className="mk-form-tip" />
+                  {item.label}
+                </Tooltip> : item.label
+              }>
+                {getFieldDecorator(item.key, {
+                  initialValue: item.initVal || '',
+                  rules: [
+                    {
+                      required: !!item.required,
+                      message: '璇疯緭鍏�' + item.label + '!'
+                    }
+                  ]
+                })(<TextArea autoSize={{minRows: 2}} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
+              </Form.Item>
+              <Popover overlayClassName="formula-fields" placement="topLeft" title="" content={<div>{item.fields}</div>} trigger="click">
+                <span className="formula-icon">瀛楁闆�</span>
+              </Popover>
+            </Col>
+          )
+        } else {
+          fields.push(
+            <Col span={24} key={index} className="textarea">
+              <Form.Item label={item.tooltip ?
+                <Tooltip placement="topLeft" title={item.tooltip}>
+                  <QuestionCircleOutlined className="mk-form-tip" />
+                  {item.label}
+                </Tooltip> : item.label
+              }>
+                {getFieldDecorator(item.key, {
+                  initialValue: item.initVal || '',
+                  rules: [
+                    {
+                      required: !!item.required,
+                      message: '璇疯緭鍏�' + item.label + '!'
+                    }
+                  ]
+                })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''}/>)}
+              </Form.Item>
+            </Col>
+          )
+        }
       }
     })
     return fields
   }
 
   handleSubmit = () => {
+    const { fields } = this.props
     // 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
+        // eslint-disable-next-line
+        if (values.type === 'formula' && values.eval !== 'false' && /^[\u4E00-\u9FA50-9a-zA-Z_\s@\+\-\*\/]*$/ig.test(values.formula) && /[\+\-\*\/]/ig.test(values.formula)) {
+          let cols = []
+          fields.forEach(col => {
+            if (/^(Int|Decimal)/ig.test(col.datatype)) {
+              cols.push({reg: new RegExp('@' + col.field + '@', 'ig'), value: `(@${col.field}@)`})
+            }
+          })
+
+          cols.forEach(col => {
+            values.formula = values.formula.replace(col.reg, col.value)
+          })
+        }
+
         this.props.submitCol(values, () => {
           this.setState({visible: false, formlist: null})
         })

--
Gitblit v1.8.0