Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add prop renderView #25

Merged
merged 2 commits into from
Dec 20, 2018
Merged

feat: add prop renderView #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87dd14
feat: add prop renderView
samoay Dec 20, 2018
a71aa43
changed: pass label with value to renderView
samoay Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions demo/SelectFormFieldDemo.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,12 @@ class Demo extends React.Component {
jsxlabel="长选项截断"
jsxname="select1"
allowClear
dropdownClassName="select-dropdown-max-width"
multiple
dropdownStyle={{ maxWidth: 500 }}
dropdownMatchSelectWidth={false}
jsxrules={{ validator: Validators.isNotEmpty, errMsg: '不能为空' }}
disabled={false}
showSearch={false}
jsxdata={me.state.jsxdata2}
optionTextRender={(text) => {
let shortText = text;
Expand Down Expand Up @@ -207,6 +209,7 @@ class Demo extends React.Component {
closeOnSelect
onSelect={(...args) => { console.log(...args); }}
jsxname="select5"
jsxtips="使用 renderView 渲染 VIEW 模式"
multiple
jsxfetchUrl="http://suggest.taobao.com/sug"
dataType="jsonp"
Expand All @@ -224,16 +227,20 @@ class Demo extends React.Component {
});
return data;
}}
renderView={(values) => {
return values.map(v => (<a
key={v.value}
href={`https://s.taobao.com/search?q=${v.text}`}
target="_blank"
style={{ margin: 5 }}
>
{v.text}
</a>));
}}
/>
</Form>
<Button onClick={me.handleModeChange.bind(me)}>
切换模式
</Button>&nbsp;
<Button onClick={me.handleOptionChange.bind(me)}>
更改选项
</Button>&nbsp;
<Button onClick={() => { me.handleClear(); }}>
清空值
</Button>
</div>
);
Expand Down
105 changes: 84 additions & 21 deletions src/SelectFormField.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,48 @@ import util from './util';
const { processData, transferDataToObj, getValuePropValue } = util;

const { Option } = Select;
const selectOptions = ['onDeselect', 'getPopupContainer',
'multiple', 'filterOption', 'allowClear', 'combobox', 'searchPlaceholder',
'tags', 'disabled', 'showSearch', 'placeholder', 'optionLabelProp', 'optionFilterProp',
'maxTagTextLength', 'dropdownMatchSelectWidth', 'dropdownClassName', 'dropdownAlign',
'notFoundContent', 'labelInValue', 'defaultActiveFirstOption', 'onFocus', 'onBlur'];
const selectOptions = [
'allowClear',
'autoClearSearchValue',
'autoFocus',
'backfill',
'combobox',
'defaultActiveFirstOption',
'defaultOpen',
'disabled',
'dropdownAlign',
'dropdownClassName',
'dropdownMatchSelectWidth',
'dropdownMenuStyle',
'dropdownRender',
'dropdownStyle',
'filterOption',
'firstActiveValue',
'getInputElement',
'getPopupContainer',
'labelInValue',
'loading',
'maxTagCount',
'maxTagPlaceholder',
'maxTagTextLength',
'menuItemSelectedIcon',
'multiple',
'notFoundContent',
'onBlur',
'onDeselect',
'onFocus',
'onInputKeyDown',
'onPopupScroll',
'open',
'optionFilterProp',
'optionLabelProp',
'placeholder',
'searchPlaceholder',
'showAction',
'showArrow',
'showSearch',
'tags',
];

class SelectFormField extends FormField {
static getDerivedStateFromProps = (props, state) => {
Expand Down Expand Up @@ -64,20 +101,18 @@ class SelectFormField extends FormField {

/**
* select inner method is used, not very reliable
*
* @deprecated
*/
resetSelect() {
const me = this;
const { multiple, closeOnSelect } = me.props;
if (multiple && closeOnSelect) {
if (typeof me.select.setInputValue === 'function') {
me.select.setInputValue('');
} else {
console.warn('select.setInputValue is invalid');
}
if (typeof me.select.setOpenState === 'function') {
me.select.setOpenState(false, false);
} else {
console.warn('select.setOpenState is invalid');
}
}
}
Expand Down Expand Up @@ -290,34 +325,60 @@ class SelectFormField extends FormField {
/* eslint-enable no-underscore-dangle */
} else if (mode === Constants.MODE.VIEW) {
let str = '';
const renderValues = [];
const splitter = ', \u00a0';
if (me.state.value) {
const value = me.processValue();
const values = !Array.isArray(value) ? [value] : value;
// labelInValue mode
if (me.props.jsxfetchUrl || me.props.onSearch || me.props.labelInValue) {
str = values.map(item => (item.label || item.key)).join(splitter);
// labelInValue mode
str = values.map((item) => {
const label = item.label || item.key;

renderValues.push({
value: item.key,
text: label,
});

return label;
}).join(splitter);
} else if (me.props.children) {
// <Option> mode
if (me.props.children) {
me.props.children.forEach((child) => {
const valuePropValue = getValuePropValue(child);
if (values.indexOf(valuePropValue) !== -1) {
str += `${child.props[me.props.optionLabelProp]} `;
}
});
if (str === '') {
str = values.join(splitter);
const optionsLabel = [];
me.props.children.forEach((child) => {
const valuePropValue = getValuePropValue(child);
if (values.indexOf(valuePropValue) !== -1) {
const label = `${child.props[me.props.optionLabelProp]}`;

optionsLabel.push(label);

renderValues.push({
value: valuePropValue,
text: label,
});
}
}
});

str = optionsLabel.length ? optionsLabel.join(splitter) : values.join(splitter);
} else {
// only jsxdata
str = values.map((item) => {
const label = transferDataToObj(me.state.data)[item === '' ? '__all__' : item];

renderValues.push({
value: item,
text: label || item,
});

return label || item;
}).join(splitter);
}
}

if (me.props.renderView) {
str = me.props.renderView(renderValues);
}

arr.push(
<span key="select">
{str}
Expand Down Expand Up @@ -353,6 +414,7 @@ SelectFormField.propTypes = assign({}, FormField.propTypes, {
method: PropTypes.string,
dropdownAlign: PropTypes.object,
optionTextRender: PropTypes.func,
renderView: PropTypes.func,
});

SelectFormField.defaultProps = assign({}, FormField.defaultProps, {
Expand Down Expand Up @@ -386,6 +448,7 @@ SelectFormField.defaultProps = assign({}, FormField.defaultProps, {
},
},
optionTextRender: text => text,
renderView: undefined,
});

export default SelectFormField;
23 changes: 22 additions & 1 deletion tests/SelectFormField.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ describe('SelectFormField', () => {
</Form>,
);
expect(wrapper.find('SelectFormField').find('.view-mode').find('.kuma-uxform-field-core').find('span')
.text()).to.be.equal('北京 ');
.text()).to.be.equal('北京');
done();
});

Expand Down Expand Up @@ -349,4 +349,25 @@ describe('SelectFormField', () => {
expect(fundata.length).to.be.equal(2);
done();
});

it('should support renderView', (done) => {
const data = {
bj: '北京',
sh: '上海',
};

const wrapper = mount(
<Form jsxvalues={{ test: 'bj' }} jsxmode={Constants.MODE.VIEW}>
<SelectFormField
jsxshowSearch
jsxname="test"
jsxlabel="test"
jsxdata={data}
renderView={values => values.map(v => v.text).join(', ')}
/>
</Form>,
);
expect(wrapper.find('.view-mode').find('.kuma-uxform-field-core').find('span').text()).to.be.equal('北京');
done();
});
});