amis 1.2.4-beta.16 → 1.3.0

package/src/factory.tsx

@@ -224,7 +224,7 @@ export function loadRenderer(schema: Schema, path: string) {
 
 const defaultOptions: RenderOptions = {
   session: 'global',
-  affixOffsetTop: 50,
+  affixOffsetTop: 0,
   affixOffsetBottom: 0,
   richTextToken: '',
   loadRenderer,

package/src/renderers/CRUD.tsx

@@ -1110,7 +1110,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     if (autoJumpToTopOnPagerChange && this.control) {
       (findDOMNode(this.control) as HTMLElement).scrollIntoView();
       const scrolledY = window.scrollY;
-      const offsetTop = affixOffsetTop ?? env?.affixOffsetTop ?? 50;
+      const offsetTop = affixOffsetTop ?? env?.affixOffsetTop ?? 0;
       scrolledY && window.scroll(0, scrolledY - offsetTop);
     }
   }

package/src/renderers/Form/InputFile.tsx

@@ -356,12 +356,11 @@ export default class FileControl extends React.Component<FileProps, FileState> {
     if (value && value instanceof Blob) {
       files = [value as any];
     } else if (value) {
-      files = (
-        Array.isArray(value)
-          ? value
-          : joinValues
-          ? `${(value as any)[valueField] || value}`.split(delimiter)
-          : [value as any]
+      files = (Array.isArray(value)
+        ? value
+        : joinValues
+        ? `${(value as any)[valueField] || value}`.split(delimiter)
+        : [value as any]
       )
         .map(item => FileControl.valueToFile(item, props) as FileValue)
         .filter(item => item);
@@ -403,12 +402,11 @@ export default class FileControl extends React.Component<FileProps, FileState> {
       let files: Array<FileValue> = [];
 
       if (value) {
-        files = (
-          Array.isArray(value)
-            ? value
-            : joinValues && typeof value === 'string'
-            ? value.split(delimiter)
-            : [value as any]
+        files = (Array.isArray(value)
+          ? value
+          : joinValues && typeof value === 'string'
+          ? value.split(delimiter)
+          : [value as any]
         )
           .map(item => {
             let obj = FileControl.valueToFile(
@@ -884,6 +882,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
 
     qsstringify({...api.data, ...params})
       .split('&')
+      .filter(i => !!i)
       .forEach(item => {
         const parts = item.split('=');
         fd.append(parts[0], decodeURIComponent(parts[1]));

package/src/renderers/Form/index.tsx

@@ -54,6 +54,7 @@ import {
 import {ActionSchema} from '../Action';
 import {ButtonGroupControlSchema} from './ButtonGroupSelect';
 import {DialogSchemaBase} from '../Dialog';
+import Alert from '../../components/Alert2';
 
 export interface FormSchemaHorizontal {
   left?: number;
@@ -1493,6 +1494,8 @@ export default class Form extends React.Component<FormProps, object> {
 
   render() {
     const {
+      $path,
+      $schema,
       wrapWithPanel,
       render,
       title,
@@ -1507,7 +1510,8 @@ export default class Form extends React.Component<FormProps, object> {
       affixFooter,
       lazyLoad,
       translate: __,
-      footer
+      footer,
+      formStore
     } = this.props;
 
     // trace(true);
@@ -1515,7 +1519,20 @@ export default class Form extends React.Component<FormProps, object> {
 
     let body: JSX.Element = this.renderBody();
 
-    if (wrapWithPanel) {
+    // 表单组件限制
+    const isFormInFormActions: boolean = /panel\/action\/form$/.test($path);
+    // props有formStore 说明是嵌套表单 || 不允许在表单的按钮组中再直接套表单
+    if (formStore || isFormInFormActions) {
+      body = (
+        <Alert level="danger">
+          <p>Error: 不允许在表单及表单按钮组中直接嵌套表单</p>
+          <p>Path: {$path}</p>
+          <pre>
+            <code>{JSON.stringify($schema, null, 2)}</code>
+          </pre>
+        </Alert>
+      );
+    } else if (wrapWithPanel) {
       body = render(
         'body',
         {