fix: rename MixinSetter to MixedSetter

This commit is contained in:
jiulong.hjl 2020-07-15 16:58:30 +08:00
parent d70081ce24
commit 0e9a740406
6 changed files with 24 additions and 17 deletions

View File

@ -4,6 +4,7 @@ import ExpressionSetter from './expression-setter';
import ColorSetter from './color-setter'; import ColorSetter from './color-setter';
import JsonSetter from './json-setter'; import JsonSetter from './json-setter';
import EventsSetter from './events-setter'; import EventsSetter from './events-setter';
import MixedSetter from './mixed-setter';
export const StringSetter = { export const StringSetter = {
component: Input, component: Input,
@ -29,7 +30,12 @@ export const DateYearSetter = DatePicker.YearPicker;
export const DateMonthSetter = DatePicker.MonthPicker; export const DateMonthSetter = DatePicker.MonthPicker;
export const DateRangeSetter = DatePicker.RangePicker; export const DateRangeSetter = DatePicker.RangePicker;
export { ExpressionSetter, EventsSetter }; export {
ExpressionSetter,
EventsSetter,
JsonSetter,
MixedSetter,
};
const builtinSetters: any = { const builtinSetters: any = {
StringSetter, StringSetter,
@ -51,6 +57,7 @@ const builtinSetters: any = {
EventsSetter, EventsSetter,
ColorSetter, ColorSetter,
JsonSetter, JsonSetter,
MixedSetter,
}; };
registerSetter(builtinSetters); registerSetter(builtinSetters);

View File

@ -0,0 +1,13 @@
// mixed
.lowcode-setter-mixed > * {
vertical-align: middle;
}
.lowcode-setter-mixed {
width: 86%;
}
.lowcode-setter-mixed .next-input {
width: 100%;
}
.lowcode-setter-mixed .next-select-trigger {
width: 100%;
}

View File

@ -8,8 +8,8 @@ import { generateI18n } from './locale/utils';
import zhCN from './locale/zh-CN'; import zhCN from './locale/zh-CN';
import './index.scss'; import './index.scss';
export default class Mixin extends PureComponent { export default class Mixed extends PureComponent {
static displayName = 'Mixin'; static displayName = 'Mixed';
static propTypes = { static propTypes = {
locale: PropTypes.string, locale: PropTypes.string,
messages: PropTypes.object, messages: PropTypes.object,
@ -147,7 +147,7 @@ export default class Mixin extends PureComponent {
let TargetNode = this.typeMap[this.state.type]?.component || 'div'; let TargetNode = this.typeMap[this.state.type]?.component || 'div';
let targetProps = this.typeMap[this.state.type]?.props || {}; let targetProps = this.typeMap[this.state.type]?.props || {};
let tarStyle = { position: 'relative', ...style }; let tarStyle = { position: 'relative', ...style };
let classes = classNames(className, 'lowcode-setter-mixin'); let classes = classNames(className, 'lowcode-setter-mixed');
return ( return (
<div style={tarStyle} className={classes} > <div style={tarStyle} className={classes} >

View File

@ -1,13 +0,0 @@
// mixin
.lowcode-setter-mixin > * {
vertical-align: middle;
}
.lowcode-setter-mixin {
width: 86%;
}
.lowcode-setter-mixin .next-input {
width: 100%;
}
.lowcode-setter-mixin .next-select-trigger {
width: 100%;
}