Merge branch 'master' into positec

king

2024-02-20 c0e017668d780c40f85230f227ea0160b5d22d4d

 src/menu/datasource/verifycard/customscript/index.jsx

@@ -6,7 +6,7 @@
import Toast from 'antd-mobile/es/components/toast'
import Dialog from 'antd-mobile/es/components/dialog'

import { checkSQL } from '@/utils/utils-custom.js'
import { checkSQL, getSearchFields } from '@/utils/utils-custom.js'
import CodeMirror from '@/templates/zshare/codemirror'
import MKEmitter from '@/utils/events.js'
import './index.scss'
@@ -33,49 +33,18 @@
  UNSAFE_componentWillMount() {
    const { searches } = this.props

    this.getSearchField(searches)
    this.setState({
      usefulFields: getSearchFields(searches)
    })
  }

  UNSAFE_componentWillReceiveProps (nextProps) {
    if (!is(fromJS(this.props.searches), fromJS(nextProps.searches))) {
      this.getSearchField(nextProps.searches)
    }
  }

  getSearchField = (searches) => {
    let _usefulFields = []
    searches.forEach(item => {
      if (item.type === 'dateweek') {
        _usefulFields.push(item.key)
        _usefulFields.push(item.key + '1')
      } else if (item.type === 'datemonth') {
        if (item.match === '=') {
          _usefulFields.push(item.key)
        } else {
          _usefulFields.push(item.key)
          _usefulFields.push(item.key + '1')
        }
      } else if (item.type === 'daterange') {
        let _skey = item.key
        let _ekey = item.key + '1'

        if (/,/.test(item.key)) {
          _skey = item.key.split(',')[0]
          _ekey = item.key.split(',')[1]
        }
        _usefulFields.push(_skey)
        _usefulFields.push(_ekey)
      } else if (item.type === 'date' && _usefulFields.includes(item.key)) {
        _usefulFields.push(item.key + '1')
      } else {
        _usefulFields.push(item.key)
      }
    })

    this.setState({
      usefulFields: _usefulFields.join(', ')
        usefulFields: getSearchFields(nextProps.searches)
    })
  }
  }

  edit = (record) => {
    this.setState({