2020-11-25

king

2020-11-25 42fae277ae5ebe794fc070bf38482a919eb661fc

 src/templates/calendarconfig/index.jsx

@@ -52,7 +52,6 @@
    originConfig: null,      // 原配置
    tabviews: [],            // 所有标签页
    activeKey: '0',          // 默认展开基本信息
    pasteContent: null,      // 粘贴内容
    openEdition: '',         // 编辑版本标记，防止多人操作
    mockdata: [],            // 测试数据
  }
@@ -687,13 +686,12 @@
        config: res.config
      })
    } else if (res.type === 'paste') {
      this.setState({
        pasteContent: res.content
      }, () => {
        this.setState({
          pasteContent: null
        })
      })
      let config = fromJS(this.state.config).toJS()
      if (res.content.copyType === 'search') {
        config.search.push(res.content)
      }

      this.setState({config})
    }
  }

@@ -795,14 +793,11 @@
                config={config}
                MenuID={menu.MenuID}
                tableFields={this.state.tableFields}
                permFuncField={this.props.permFuncField}
                updateConfig={this.updateconfig}
              />
              <SearchComponent
                menu={{MenuID: menu.MenuID, MenuName: config.MenuName}}
                config={config}
                pasteContent={this.state.pasteContent}
                sysRoles={this.props.sysRoles}
                updatesearch={this.updatesearch}
              />
              <div className="calendar-wrap">
@@ -838,8 +833,6 @@

const mapStateToProps = (state) => {
  return {
    sysRoles: state.sysRoles,
    permFuncField: state.permFuncField,
    memberLevel: state.memberLevel
  }
}