p96170835
/
amis
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-03-24 11:31:19 +08:00
parent d5f2cbecc1 742355daa2
commit 41908a65ba
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/renderers/Form/Form.md
View File

@ -39,8 +39,8 @@
| messages | `Object` | | 消息提示覆写，默认消息读取的是 API 返回的消息，但是在此可以覆写它。 |
| messages.fetchSuccess | `string` | | 获取成功时提示 |
| messages.fetchFailed | `string` | | 获取失败时提示 |
| messages.saveFailed | `string` | | 保存成功时提示 |
| messages.saveSuccess | `string` | | 保存失败时提示 |
| messages.saveSuccess | `string` | | 保存成功时提示 |
| messages.saveFailed | `string` | | 保存失败时提示 |
| wrapWithPanel | `boolean` | `true` | 是否让 Form 用 panel 包起来，设置为 false 后，actions 将无效。 |
| panelClassName | `boolean` | `true` | 是否让 Form 用 panel 包起来，设置为 false 后，actions 将无效。 |
| [api](#api) | [Api](../Types.md#api) | | Form 用来保存数据的 api。 |

3
docs/style.md
View File

@ -239,6 +239,9 @@ amis 集成了 [fontawesome](http://fontawesome.io/icons/)，所以关于图标
.text-u-c { text-transform: uppercase; }
.text-l-t { text-decoration: line-through; }
.text-u-l { text-decoration: underline; }
.text-left { text-align: left; }
.text-center { text-align: center; }
.text-right { text-align: right; }
```

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "amis",
"version": "1.0.9",
"version": "1.0.10",
"description": "一种MIS页面生成工具",
"main": "lib/index.js",
"scripts": {

2
src/renderers/CRUD.tsx
View File

@ -1576,6 +1576,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
classnames: cx,
keepItemSelectionOnPageChange,
onAction,
popOverContainer,
...rest
} = this.props;
@ -1642,6 +1643,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
query: store.query,
orderBy: store.query.orderBy,
orderDir: store.query.orderDir,
popOverContainer,
onAction: this.handleAction,
onSave: this.handleSave,
onSaveOrder: this.handleSaveOrder,

12
src/renderers/Drawer.tsx
View File

@ -4,7 +4,7 @@ import {Renderer, RendererProps} from '../factory';
import {SchemaNode, Schema, Action} from '../types';
import {default as DrawerContainer} from '../components/Drawer';
import findLast from 'lodash/findLast';
import {guid, isVisible} from '../utils/helper';
import {guid, isVisible, autobind} from '../utils/helper';
import {reaction} from 'mobx';
import {findDOMNode} from 'react-dom';
import {IModalStore, ModalStore} from '../store/modal';
@ -252,6 +252,13 @@ export default class Drawer extends React.Component<DrawerProps, object> {
store.reset();
}
@autobind
getPopOverContainer() {
return (findDOMNode(this) as HTMLElement).querySelector(
`.${this.props.classPrefix}Drawer-content`
);
}
renderBody(body: SchemaNode, key?: any): React.ReactNode {
let {render, store} = this.props;
@ -264,7 +271,8 @@ export default class Drawer extends React.Component<DrawerProps, object> {
key,
disabled: store.loading,
onAction: this.handleAction,
onFinished: this.handleChildFinished
onFinished: this.handleChildFinished,
popOverContainer: this.getPopOverContainer
};
if (schema.type === 'form') {

13
src/renderers/Table.tsx
View File

@ -94,6 +94,9 @@ export interface TableProps extends RendererProps {
buildItemProps?: (item: any, index: number) => any;
checkOnItemClick?: boolean;
hideCheckToggler?: boolean;
rowClassName?: string;
rowClassNameExpr?: string;
popOverContainer?: any;
}
export default class Table extends React.Component<TableProps, object> {
@ -125,7 +128,10 @@ export default class Table extends React.Component<TableProps, object> {
'combineNum',
'items',
'valueField',
'saveImmediately'
'saveImmediately',
'rowClassName',
'rowClassNameExpr',
'popOverContainer'
];
static defaultProps: Partial<TableProps> = {
className: '',
@ -1171,7 +1177,8 @@ export default class Table extends React.Component<TableProps, object> {
env,
classPrefix: ns,
classnames: cx,
checkOnItemClick
checkOnItemClick,
popOverContainer
} = this.props;
if (column.name && item.rowSpans[column.name] === 0) {
@ -1249,7 +1256,7 @@ export default class Table extends React.Component<TableProps, object> {
btnDisabled: store.dragging,
data: item.locals,
value: column.name ? resolveVariable(column.name, item.data) : undefined,
popOverContainer: this.getPopOverContainer,
popOverContainer: popOverContainer || this.getPopOverContainer,
rowSpan: item.rowSpans[column.name as string],
quickEditFormRef: this.subFormRef,
prefix,