2020-12-31

king

2020-12-31 eebe63a6727e6495321d1433ebd2779b5a36d45a

 src/templates/sharecomponent/settingcomponent/settingform/index.jsx

@@ -18,7 +18,6 @@
    dict: PropTypes.object,         // 字典项
    menu: PropTypes.object,         // 菜单信息
    config: PropTypes.object,       // 页面配置信息
    permFuncField: PropTypes.array, // 自定义函数可用字段
    search: PropTypes.array         // 搜索条件
  }

@@ -70,10 +69,6 @@
      })
    }

    // 搜索条件，正则替换
    let allSearch = Utils.initMainSearch(search)
    allSearch = Utils.getAllSearchOptions(allSearch)

    // 搜索的where条件
    let _search = this.formatSearch(search)
    _search = Utils.joinMainSearchkey(_search)
@@ -85,7 +80,7 @@
      setting: _setting,
      search: _search,
      arr_field: arr_field.join(','),
      regoptions: allSearch,
      regoptions: Utils.getRegOptions(search), // 搜索条件，正则替换
      columns: columns,
      scripts: _scripts
    })
@@ -100,6 +95,8 @@

    let newsearches = []
    searches.forEach(search => {
      if (!search.field) return
      
      let item = {
        key: search.field,
        match: search.match,
@@ -376,7 +373,7 @@
  }

  render() {
    const { config, menu, dict, permFuncField } = this.props
    const { config, menu, dict } = this.props
    const { loading, activeKey, setting, defaultSql, columns, scripts } = this.state

    return (
@@ -385,17 +382,21 @@
        <Tabs activeKey={activeKey} className="verify-card-box" onChange={this.changeTab}>
          <TabPane tab="数据源" key="setting">
            <DataSource
              type={config.Template === 'CommonTable' ? 'main' : ''}
              menu={menu}
              dict={dict}
              config={config}
              columns={columns}
              setting={setting}
              scripts={scripts}
              permFuncField={permFuncField}
              wrappedComponentRef={(inst) => this.settingForm = inst}
            />
          </TabPane>
          <TabPane tab="自定义脚本" key="scripts">
          <TabPane tab={
            <span>
              自定义脚本
              {scripts.length ? <span className="count-tip">{scripts.length}</span> : null}
            </span>
          } key="scripts">
            <CustomScript
              dict={dict}
              setting={setting}