Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

 src/menu/components/share/searchcomponent/index.jsx

@@ -115,7 +115,7 @@
    this.setState({
      visible: true,
      card: card,
      formlist: getSearchForm(card, linkableFields)
      formlist: getSearchForm(card, linkableFields, [], 'header')
    })
  }

@@ -223,10 +223,10 @@
          LText: res.dataSource
        }

        param.LText = param.LText.replace(/@\$|\$@/ig, '')
        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 = Utils.formatOptions(param.LText)
        param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
        param.secretkey = Utils.encrypt('', param.timestamp)

        if (window.GLOB.mainSystemApi && res.database === 'sso') {
@@ -289,7 +289,7 @@
    const { dict, searchlist, visible, sqlVerifing } = this.state

    return (
      <div className="model-custom-header-search-list">
      <div className={'model-custom-header-search-list search-length' + (searchlist.length)}>
        <DragElement
          list={searchlist}
          handleList={this.handleList}