2020-07-14

king

2020-07-14 f36141f3075edf9d41928d64f759ad6bd1b1ac60

 src/templates/sharecomponent/searchcomponent/index.jsx

@@ -77,10 +77,22 @@
   * @description 搜索条件编辑，获取搜索条件表单信息
   */
  handleSearch = (card) => {
    const { searchlist } = this.state
    let linkableFields = []

    searchlist.forEach(item => {
      if (item.uuid !== card.uuid && (item.type === 'select' || item.type === 'link')) {
        linkableFields.push({
          value: item.field,
          text: item.label
        })
      }
    })

    this.setState({
      visible: true,
      card: card,
      formlist: getSearchForm(card, this.props.sysRoles)
      formlist: getSearchForm(card, this.props.sysRoles, linkableFields)
    })
  }

@@ -246,7 +258,7 @@
    confirm({
      content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} ？`,
      okText: dict['model.confirm'],
      cancelText: this.state.dict['header.cancel'],
      cancelText: this.state.dict['model.cancel'],
      onOk() {
        let _searchlist = fromJS(_this.state.searchlist).toJS()