mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2026-03-05 09:47:20 +00:00
Merge branch 'fix/setters' into 'release/0.9.0'
修复setter相关的一些问题 按照[规范文档](https://yuque.antfin-inc.com/ali-lowcode/docs/cew856#fsbBH) 1. 把MixedSetter重命名为MixinSetter 2. `@ali/lowcode-editor-setters`默认导出所有14种基础setter 3. 修复了一些边界情况处理 一些别的问题: * 文档中列出的"JSONSetter",但是代码中都是写成"JsonSetter",这个要统一一下 * 文档中"MixinSetter"写成了"MinxinSetter",拼错了 See merge request !892751
This commit is contained in:
commit
ebe895332c
@ -37,9 +37,9 @@ export class Transducer {
|
|||||||
if (Array.isArray(setter)) {
|
if (Array.isArray(setter)) {
|
||||||
setter = setter[0];
|
setter = setter[0];
|
||||||
} else if (isValidElement(setter) && setter.type.displayName === 'MixedSetter') {
|
} else if (isValidElement(setter) && setter.type.displayName === 'MixedSetter') {
|
||||||
setter = setter.props.setters[0];
|
setter = setter.props?.setters?.[0];
|
||||||
} else if (typeof setter === 'object' && setter.componentName === 'MixedSetter') {
|
} else if (typeof setter === 'object' && setter.componentName === 'MixedSetter') {
|
||||||
setter = setter.props.setters?.[0];
|
setter = setter.props?.setters?.[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isSetterConfig(setter)) {
|
if (isSetterConfig(setter)) {
|
||||||
|
|||||||
@ -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);
|
||||||
|
|||||||
13
packages/editor-setters/src/mixed-setter/index.scss
Normal file
13
packages/editor-setters/src/mixed-setter/index.scss
Normal 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%;
|
||||||
|
}
|
||||||
@ -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} >
|
||||||
@ -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%;
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user