diff --git a/components/DataView/filterModal/index.js b/components/DataView/filterModal/index.js deleted file mode 100644 index 4bd71e6cb74dcabb13278996380e23deb8053aa6..0000000000000000000000000000000000000000 --- a/components/DataView/filterModal/index.js +++ /dev/null @@ -1,22 +0,0 @@ -import React from 'react'; -import Modal from '@/ant_components/BIModal'; -import styles from './styles.less'; - - -class FilterModal extends React.Component { - render() { - return ( - -
- -
-
- ) - } -} -export default FilterModal; \ No newline at end of file diff --git a/components/DataView/filterModal/readme.md b/components/DataView/filterModal/readme.md deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/components/DataView/filterModal/styles.less b/components/DataView/filterModal/styles.less deleted file mode 100644 index 1ee0e14f8fb295764e6110e17a41260e525c524a..0000000000000000000000000000000000000000 --- a/components/DataView/filterModal/styles.less +++ /dev/null @@ -1,15 +0,0 @@ -.modalCla{ - :global .ant-modal-body{ - padding: 0; - } - :global .ant-modal-footer{ - display: flex; - justify-content: center; - background:rgba(255,255,255,1); - } - .wrap{ - display: flex; - flex-flow: row; - min-height: 700px; - } -} \ No newline at end of file diff --git a/components/DataView/popoverFilter/hide/index.js b/components/DataView/popoverFilter/hide/index.js deleted file mode 100644 index 731e0bd2f8dac9a79e434fc28506c574cf3e98de..0000000000000000000000000000000000000000 --- a/components/DataView/popoverFilter/hide/index.js +++ /dev/null @@ -1,70 +0,0 @@ -import React, { Component } from 'react'; -import { Switch, Popover } from 'antd'; -import Icon from '@/submodule/components/IconFont'; -import _ from 'lodash'; -import s from './index.less'; -import hideIcon from '@/assets/airTable/hide.png'; -/** - * 操作栏显隐控制 - * 参数 - * @configs 操作栏配置 - * @columns 表头列表配置 - * @onChange 显隐变化回调 - */ -export default class Hide extends Component { - constructor(props) { - super(props); - this.state = { - visible: false, - columnConfig: props.columnConfig, - }; - } - - - - toggleOption = () => { - const { visible } = this.state; - this.setState({ - visible: !visible, - }); - }; - - renderContent = () => { - const { columnConfig = [] } = this.state; - const { conditions } = this.props; - return ( -
-
- {conditions.map((item, i) => { - return ( -
- - {item.label} -
- ); - })} -
-
- ); - }; - - render() { - return ( - - 添加筛选条件 - - ); - } -} diff --git a/components/DataView/popoverFilter/hide/index.less b/components/DataView/popoverFilter/hide/index.less deleted file mode 100644 index a73fb5516cf9df4a16333eb7b0afdf248ae464f3..0000000000000000000000000000000000000000 --- a/components/DataView/popoverFilter/hide/index.less +++ /dev/null @@ -1,86 +0,0 @@ -@import "~@/theme/common"; - -.popover { - :global(.ant-popover-inner-content) { - padding: 0; - } - - :global(.ant-popover-title) { - padding: 14px 16px; - } -} - -.operateContainer { - cursor: pointer; - text-align: center; - padding: 5px 8px; - border-radius: 2px; - - &:hover { - background: #F6F6F6; - } - - .operateIcon { - width: 14px; - height: 12px; - margin-right: 3px; - } - - .operateName { - font-size: 14px; - font-weight: 400; - color: @textPrimaryColor; - } - - &:hover { - background: #F6F6F6; - } - - &.selected { - background: @primaryColor; - } -} - -.optionsModal { - min-width: 174px; - padding-top: 10px; - - .optionList { - max-height: 300px; - overflow: auto; - - .optionItem { - padding: 0 10px; - margin-bottom: 5px; - cursor: pointer; - - .optionName { - margin-left: 10px; - } - } - } - - .btns { - width: 100%; - height: 44px; - background: #F6F6F6; - display: flex; - align-items: center; - justify-content: space-around; - - .btn { - //width: 50%; - font-size: 12px; - color: @textGeneralColor; - cursor: pointer; - - &:last-child { - color: @primaryColor; - } - } - } -} -.addBtn{ - cursor: pointer; - color: @primaryColor; -} diff --git a/components/DataView/popoverFilter/index.js b/components/DataView/popoverFilter/index.js deleted file mode 100644 index 860f1e21bc2ca2312207a1fd23a51f523acd9ce7..0000000000000000000000000000000000000000 --- a/components/DataView/popoverFilter/index.js +++ /dev/null @@ -1,178 +0,0 @@ -import React, { Component } from 'react'; -import { fromJS, Map, List, is } from 'immutable'; -import { Popover, message } from 'antd'; -import Button from '@/ant_components/BIButton'; -import classnamse from 'classnames'; -import SearchView from '@/submodule/components/SearchView'; -import BISelect from '@/ant_components/BISelect'; -import filterIcon from '@/assets/airTable/filter.png'; -import closeIcon from '@/assets/airTable/close.png'; -import SettingPanel from './hide' -import styles from './styles.less'; - -const TransType = ['2', '3', '4', '13', '14']; -/** - * 操作栏过滤条件控制 - * 参数 - * @filterValues 已有的过滤条件 - * @filterColumnConfig 可以过滤的配置项 - * @onChange 变化回调 - * @hideSettingPanel 设置过滤条件 - * @conditions 全量条件数据 - * @openSettingPanel 打开设置变量看板 - * @closeSettingPanel 关闭设置变量看板 - * @selectedConditions 已选择条件数据 - * - */ -export default class Filter extends Component { - constructor(props) { - super(props); - this.state = { - visible: false, - filterConfig: props.filterConfig || [{}], - }; - } - - componentDidMount() { - const { filterConfig = [] } = this.props; - this.setState({ - filterConfig: filterConfig.length > 0 ? filterConfig : [{}], - }); - } - - componentWillReceiveProps(nextProps) { - const { filterConfig } = this.props; - const x1 = fromJS(filterConfig); - const x2 = fromJS(nextProps.filterConfig); - if (!is(x1, x2)) { - this.setState({ - filterConfig: nextProps.filterConfig.length > 0 ? nextProps.filterConfig : [{}], - }); - } - } - - toggleOption = () => { - const { visible } = this.state; - this.setState({ - visible: !visible, - }); - }; - - // 重置 - resetFilterItem = () => { - this.setState({ - filterConfig: [{}], - }); - this.onChange([]); - }; - // 改变筛选条件 - changeFilterKey = (index, value) => { - const { filterConfig } = this.state; - const { filterColumnConfig } = this.props; - const filter = filterColumnConfig.find((item) => { - return item.key === value; - }); - const data = { - colName: value, - colChsName: filter.title, - operationCode: filter.operator && filter.operator[0] && filter.operator[0].id, - colValues: undefined, - }; - const temp = List(filterConfig) - .splice(index, 1, data) - .toJS(); - this.setState({ - filterConfig: temp, - }); - }; - - // 回调表格更改操作栏方法 - onChange = (props, changedValues, allValues) => { - // const { onChange, filterConfig } = this.props; - // const x1 = fromJS(changedConfig); - // const x2 = fromJS(filterConfig); - // if (!is(x1, x2)) { - // if (typeof onChange === 'function') { - // onChange({ type: 'filterConfig', config: changedConfig }); - // } - // } - }; - // 渲染搜索栏 - _renderSearchForm = () => { - const { selectedConditions = [] } = this.props; - const { searchForm = {} } = this.state; - if (selectedConditions === null || selectedConditions.length <= 0) return null; - return ( - - ); - }; - renderContent = () => { - const { hideSettingPanel } = this.props; - return ( -
-
- {this._renderSearchForm()} -
-
- -
- {hideSettingPanel ? null : } -
-
- - -
-
-
- ); - }; - renderOpenBtn = () => { - const { filterValues = [] } = this.props; - if (this.props.renderOpenBtn && typeof this.props.renderOpenBtn === 'function') { - return this.props.renderOpenBtn(); - } - // const len = filterValues.filter((item) => { - // return item.value > 0; - // }).length; - const len = 10 - let background = len > 0 ? 'rgba(247,181,0,0.1)' : ''; - return ( -
- - {len > 0 ? `${len}条筛选` : '筛选'} -
- ) - } - - render() { - return ( - - {this.renderOpenBtn()} - - ); - } -} \ No newline at end of file diff --git a/components/DataView/popoverFilter/styles.less b/components/DataView/popoverFilter/styles.less deleted file mode 100644 index 67cf908980e0d20b2be5e3b8210d207cc8436e70..0000000000000000000000000000000000000000 --- a/components/DataView/popoverFilter/styles.less +++ /dev/null @@ -1,83 +0,0 @@ -@import "~@/theme/common"; - -.popover { - :global(.ant-popover-inner-content) { - padding: 0; - } - - :global(.ant-popover-title) { - padding: 14px 16px; - } -} - -.operateContainer { - cursor: pointer; - text-align: center; - padding: 5px 8px; - border-radius: 2px; - - &:hover { - background: #F6F6F6; - } - - .operateIcon { - width: 14px; - height: 12px; - margin-right: 3px; - } - - .operateName { - font-size: 14px; - font-weight: 400; - color: @textPrimaryColor; - } - - &:hover { - background: #F6F6F6; - } - - &.selected { - background: @primaryColor; - } -} - -.optionsModal { - width: 520px; - padding-top: 10px; -.content{ - min-height: 200px; - padding-right: 16px; -} - .optionList { - max-height: 300px; - overflow: auto; - - .optionItem { - padding: 0 10px; - margin-bottom: 5px; - cursor: pointer; - - .optionName { - margin-left: 10px; - } - } - } - - .btns { - width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - padding: 16px 16px; - border-top: 1px solid #ECECECFF ; - .btn { - width: 80px; - height: 32px; - font-size: 12px; - cursor: pointer; - &:last-child { - margin-left: 16px; - } - } - } -} diff --git a/components/SearchView/index.js b/components/SearchView/index.js index 0784b7966ca85fa286064f0ca1146ba1529d22fd..4fea2ac8574022849137a7612bdb7fbd3788882a 100644 --- a/components/SearchView/index.js +++ b/components/SearchView/index.js @@ -331,9 +331,7 @@ class SearchView extends React.Component { const { getFieldDecorator } = this.props.form; return ( - {type === 'custom' - ? this._renderItem(col) - : getFieldDecorator(key, checkOption)(this._renderItem(col))} + {getFieldDecorator(key, checkOption)(this._renderItem(col))} )