Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-05-13 11:33:56 +08:00
commit 4eb4c70b48
8 changed files with 18 additions and 9 deletions

View File

@ -71,7 +71,7 @@
"redux": "^3.7.2", "redux": "^3.7.2",
"setimmediate": "1.0.5", "setimmediate": "1.0.5",
"sortablejs": "1.10.0", "sortablejs": "1.10.0",
"tinymce": "5.2.1", "tinymce": "5.2.2",
"tslib": "^1.10.0", "tslib": "^1.10.0",
"uncontrollable": "4.1.0", "uncontrollable": "4.1.0",
"video-react": "0.9.4" "video-react": "0.9.4"

View File

@ -48,12 +48,16 @@
text-decoration: none; text-decoration: none;
} }
&.disabled > a:first-child, &.disabled,
&.is-disabled > a:first-child { &.is-disabled {
color: $Tabs-onDisabled-color; cursor: not-allowed;
background-color: transparent;
border-color: transparent; > a:first-child {
pointer-events: none; color: $Tabs-onDisabled-color;
background-color: transparent;
border-color: transparent;
pointer-events: none;
}
} }
&.active > a:first-child, &.active > a:first-child,

View File

@ -12,6 +12,8 @@ export interface ContainerProps extends FormControlProps {}
sizeMutable: false sizeMutable: false
}) })
export class ContainerControlRenderer extends Container<ContainerProps> { export class ContainerControlRenderer extends Container<ContainerProps> {
static propsList: Array<string> = ['onChange'];
renderBody(): JSX.Element | null { renderBody(): JSX.Element | null {
const { const {
renderFormItems, renderFormItems,

View File

@ -20,7 +20,7 @@ const defaultHorizontal = {
sizeMutable: false sizeMutable: false
}) })
export class GridRenderer extends Grid<GridProps> { export class GridRenderer extends Grid<GridProps> {
static propsList: Array<string> = ['columns']; static propsList: Array<string> = ['columns', 'onChange'];
static defaultProps = {}; static defaultProps = {};
renderChild(region: string, node: Schema, key: number, length: number) { renderChild(region: string, node: Schema, key: number, length: number) {

View File

@ -16,7 +16,7 @@ interface HBoxProps extends FormControlProps {
sizeMutable: false sizeMutable: false
}) })
export class HBoxRenderer extends React.Component<HBoxProps, any> { export class HBoxRenderer extends React.Component<HBoxProps, any> {
static propsList: Array<string> = ['columns']; static propsList: Array<string> = ['columns', 'onChange'];
static defaultProps: Partial<HBoxProps> = {}; static defaultProps: Partial<HBoxProps> = {};
renderColumn(column: any, key: number, length: number) { renderColumn(column: any, key: number, length: number) {

View File

@ -10,6 +10,7 @@ import cx from 'classnames';
name: 'panel-control' name: 'panel-control'
}) })
export class PanelRenderer extends Panel { export class PanelRenderer extends Panel {
static propsList: Array<string> = ['onChange'];
renderBody(): JSX.Element | null { renderBody(): JSX.Element | null {
const { const {
render, render,

View File

@ -15,6 +15,7 @@ import {ServiceStore, IServiceStore} from '../../store/service';
name: 'service-control' name: 'service-control'
}) })
export class ServiceRenderer extends BasicService { export class ServiceRenderer extends BasicService {
static propsList: Array<string> = ['onChange'];
static contextType = ScopedContext; static contextType = ScopedContext;
componentWillMount() { componentWillMount() {

View File

@ -14,6 +14,7 @@ export class TabsRenderer extends Tabs {
static defaultProps = { static defaultProps = {
mountOnEnter: false // form 中的不按需渲染 mountOnEnter: false // form 中的不按需渲染
}; };
static propsList: Array<string> = ['onChange', 'tabs'];
renderTab = (tab: any, props: any, key: number) => { renderTab = (tab: any, props: any, key: number) => {
const { const {