amis 1.3.2 → 1.3.3

package/src/compat.ts

@@ -531,7 +531,11 @@ addSchemaFilter(function (schema: Schema, renderer: any, props: any) {
     };
   }
 
-  if (schema?.controls && schema.type !== 'audio') {
+  if (
+    schema?.controls &&
+    schema.type !== 'audio' &&
+    schema.type !== 'carousel'
+  ) {
     schema = {
       ...schema,
       [schema.type === 'combo' ? `items` : 'body']: (Array.isArray(

package/src/components/Overlay.tsx

@@ -290,12 +290,15 @@ export default class Overlay extends React.Component<
 
     // This goes after everything else because it adds a wrapping div.
     if (rootClose) {
-      child = (
-        <RootClose onRootClose={props.onHide}>
-          {(ref: any) => {
-            return <div ref={ref}>{child}</div>;
-          }}
-        </RootClose>
+      return (
+        // @ts-ignore
+        <Portal container={container}>
+          <RootClose onRootClose={props.onHide}>
+            {(ref: any) => {
+              return <div ref={ref}>{child}</div>;
+            }}
+          </RootClose>
+        </Portal>
       );
     }
 

package/src/components/Transfer.tsx

@@ -276,6 +276,7 @@ export class Transfer extends React.Component<TransferProps, TransferState> {
       selectMode,
       noResultsText,
       searchResultColumns,
+      columns,
       classnames: cx,
       value,
       disabled,
@@ -286,12 +287,13 @@ export class Transfer extends React.Component<TransferProps, TransferState> {
     } = this.props;
     const options = this.state.searchResult || [];
     const mode = searchResultMode || selectMode;
+    const resultColumns = searchResultColumns || columns;
 
     return mode === 'table' ? (
       <TableCheckboxes
         placeholder={noResultsText}
         className={cx('Transfer-checkboxes')}
-        columns={searchResultColumns!}
+        columns={resultColumns!}
         options={options}
         value={value}
         disabled={disabled}

package/src/renderers/Carousel.tsx

@@ -120,6 +120,9 @@ const defaultSchema = {
           <Image
             src={data.image}
             title={data.title}
+            href={data.href}
+            blank={data.blank}
+            htmlTarget={data.htmlTarget}
             imageCaption={data.description}
             thumbMode={data.thumbMode ?? thumbMode ?? 'contain'}
             imageMode="original"
@@ -413,7 +416,16 @@ export class Carousel extends React.Component<CarouselProps, CarouselState> {
         {body ? body : placeholder}
 
         {dots ? this.renderDots() : null}
-        {arrows ? this.renderArrows() : null}
+        {arrows ? (
+          <div className={cx('Carousel-leftArrow')} onClick={this.prev}>
+            <Icon icon="left-arrow" className="icon" />
+          </div>
+        ) : null}
+        {arrows ? (
+          <div className={cx('Carousel-rightArrow')} onClick={this.next}>
+            <Icon icon="right-arrow" className="icon" />
+          </div>
+        ) : null}
       </div>
     );
   }

package/src/renderers/Form/Transfer.tsx

@@ -67,6 +67,11 @@ export interface TransferControlSchema extends FormOptionsControl {
    */
   columns?: Array<any>;
 
+  /**
+   * 当 searchResultMode 为 table 时定义表格列信息。
+   */
+  searchResultColumns?: Array<any>;
+
   /**
    * 可搜索？
    */
@@ -252,6 +257,7 @@ export class BaseTransferRenderer<
       loading,
       searchable,
       searchResultMode,
+      searchResultColumns,
       deferLoad,
       leftOptions,
       leftMode,
@@ -275,6 +281,7 @@ export class BaseTransferRenderer<
           showArrow={showArrow}
           selectMode={selectMode}
           searchResultMode={searchResultMode}
+          searchResultColumns={searchResultColumns}
           columns={columns}
           onSearch={searchable ? this.handleSearch : undefined}
           onDeferLoad={deferLoad}

package/src/renderers/Image.tsx

@@ -104,6 +104,21 @@ export interface ImageSchema extends BaseSchema {
    * 预览图比率
    */
   thumbRatio?: '1:1' | '4:3' | '16:9';
+
+  /**
+   * 链接地址
+   */
+  href?: SchemaTpl;
+
+  /**
+   * 是否新窗口打开
+   */
+  blank?: boolean;
+
+  /**
+   * 链接的 target
+   */
+  htmlTarget?: string;
 }
 
 export interface ImageThumbProps
@@ -137,6 +152,9 @@ export class ImageThumb extends React.Component<ImageThumbProps> {
       alt,
       title,
       caption,
+      href,
+      blank = true,
+      htmlTarget,
       onLoad,
       enlargeAble,
       translate: __,
@@ -144,7 +162,7 @@ export class ImageThumb extends React.Component<ImageThumbProps> {
       imageMode
     } = this.props;
 
-    return (
+    let image = (
       <div
         className={cx(
           'Image',
@@ -221,6 +239,21 @@ export class ImageThumb extends React.Component<ImageThumbProps> {
         ) : null}
       </div>
     );
+
+    if (href) {
+      image = (
+        <a
+          href={href}
+          target={htmlTarget || (blank ? '_blank' : '_self')}
+          className={cx('Link', className)}
+          title={title}
+        >
+          {image}
+        </a>
+      );
+    }
+
+    return image;
   }
 }
 const ThemedImageThumb = themeable(localeable(ImageThumb));
@@ -302,6 +335,7 @@ export class ImageField extends React.Component<ImageFieldProps, object> {
       width,
       classnames: cx,
       src,
+      href,
       thumbMode,
       thumbRatio,
       placeholder,
@@ -314,6 +348,8 @@ export class ImageField extends React.Component<ImageFieldProps, object> {
     let value =
       finnalSrc || getPropValue(this.props) || defaultImage || imagePlaceholder;
 
+    const finnalHref = href ? filter(href, data, '| raw') : '';
+
     return (
       <div
         className={cx(
@@ -331,6 +367,7 @@ export class ImageField extends React.Component<ImageFieldProps, object> {
             height={height}
             width={width}
             src={value}
+            href={finnalHref}
             title={filter(title, data)}
             caption={filter(imageCaption, data)}
             thumbMode={thumbMode}