amis 1.5.6-beta.4 → 1.5.8-beta.2

package/src/renderers/Form/TabsTransfer.tsx

@@ -6,51 +6,19 @@ import {
 import React from 'react';
 import {Api} from '../../types';
 import Spinner from '../../components/Spinner';
-import {BaseTransferRenderer} from './Transfer';
+import {BaseTransferRenderer, TransferControlSchema} from './Transfer';
 import TabsTransfer from '../../components/TabsTransfer';
-import {SchemaApi} from '../../Schema';
+import {SchemaApi, SchemaObject} from '../../Schema';
+import {autobind, createObject} from '../../utils/helper';
+import {BaseSelection, ItemRenderStates} from '../../components/Selection';
 
 /**
  * TabsTransfer
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tabs-transfer
  */
-export interface TabsTransferControlSchema extends FormOptionsControl {
+export interface TabsTransferControlSchema
+  extends Omit<TransferControlSchema, 'type'> {
   type: 'tabs-transfer';
-
-  /**
-   * 是否显示剪头
-   */
-  showArrow?: boolean;
-
-  /**
-   * 可排序？
-   */
-  sortable?: boolean;
-
-  /**
-   * 搜索结果展示模式
-   */
-  searchResultMode?: 'table' | 'list' | 'tree' | 'chained';
-
-  /**
-   * 可搜索？
-   */
-  searchable?: boolean;
-
-  /**
-   * 搜索 API
-   */
-  searchApi?: SchemaApi;
-
-  /**
-   * 左侧的标题文字
-   */
-  selectTitle?: string;
-
-  /**
-   * 右侧结果的标题文字
-   */
-  resultTitle?: string;
 }
 
 export interface TabsTransferProps
@@ -68,6 +36,26 @@ export interface TabsTransferProps
   type: 'tabs-transfer'
 })
 export class TabsTransferRenderer extends BaseTransferRenderer<TabsTransferProps> {
+  @autobind
+  optionItemRender(option: any, states: ItemRenderStates) {
+    const {menuTpl, render, data} = this.props;
+    const ctx = arguments[2] || {};
+
+    if (menuTpl) {
+      return render(`item/${states.index}`, menuTpl, {
+        data: createObject(
+          createObject(data, {
+            ...states,
+            ...ctx
+          }),
+          option
+        )
+      });
+    }
+
+    return BaseSelection.itemRender(option, states);
+  }
+
   render() {
     const {
       className,
@@ -100,6 +88,8 @@ export class TabsTransferRenderer extends BaseTransferRenderer<TabsTransferProps
           onDeferLoad={deferLoad}
           selectTitle={selectTitle}
           resultTitle={resultTitle}
+          optionItemRender={this.optionItemRender}
+          resultItemRender={this.resultItemRender}
         />
 
         <Spinner overlay key="info" show={loading} />

package/src/renderers/Form/TabsTransferPicker.tsx

@@ -4,60 +4,21 @@ import {
   FormOptionsControl
 } from './Options';
 import React from 'react';
-import {Api} from '../../types';
 import Spinner from '../../components/Spinner';
 import {BaseTransferRenderer} from './Transfer';
-import TabsTransfer from '../../components/TabsTransfer';
-import {SchemaApi} from '../../Schema';
-import TransferPicker from '../../components/TransferPicker';
+import {SchemaApi, SchemaObject} from '../../Schema';
 import TabsTransferPicker from '../../components/TabsTransferPicker';
+import {TabsTransferControlSchema} from './TabsTransfer';
+import {autobind, createObject} from '../../utils/helper';
+import {BaseSelection, ItemRenderStates} from '../../components/Selection';
 
 /**
  * TabsTransferPicker 穿梭器的弹框形态
  * 文档：https://baidu.gitee.io/amis/docs/components/form/tabs-transfer-picker
  */
-export interface TabsTransferPickerControlSchema extends FormOptionsControl {
+export interface TabsTransferPickerControlSchema
+  extends Omit<TabsTransferControlSchema, 'type'> {
   type: 'tabs-transfer-picker';
-
-  /**
-   * 是否显示剪头
-   */
-  showArrow?: boolean;
-
-  /**
-   * 可排序？
-   */
-  sortable?: boolean;
-
-  /**
-   * 搜索结果展示模式
-   */
-  searchResultMode?: 'table' | 'list' | 'tree' | 'chained';
-
-  /**
-   * 可搜索？
-   */
-  searchable?: boolean;
-
-  /**
-   * 搜索 API
-   */
-  searchApi?: SchemaApi;
-
-  /**
-   * 左侧的标题文字
-   */
-  selectTitle?: string;
-
-  /**
-   * 右侧结果的标题文字
-   */
-  resultTitle?: string;
-
-  /**
-   * 弹窗大小
-   */
-  pickerSize?: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'full';
 }
 
 export interface TabsTransferProps
@@ -75,6 +36,26 @@ export interface TabsTransferProps
   type: 'tabs-transfer-picker'
 })
 export class TabsTransferPickerRenderer extends BaseTransferRenderer<TabsTransferProps> {
+  @autobind
+  optionItemRender(option: any, states: ItemRenderStates) {
+    const {menuTpl, render, data} = this.props;
+    const ctx = arguments[2] || {};
+
+    if (menuTpl) {
+      return render(`item/${states.index}`, menuTpl, {
+        data: createObject(
+          createObject(data, {
+            ...states,
+            ...ctx
+          }),
+          option
+        )
+      });
+    }
+
+    return BaseSelection.itemRender(option, states);
+  }
+
   render() {
     const {
       className,
@@ -91,7 +72,6 @@ export class TabsTransferPickerRenderer extends BaseTransferRenderer<TabsTransfe
       selectTitle,
       resultTitle,
       pickerSize,
-      columns,
       leftMode,
       leftOptions
     } = this.props;
@@ -114,6 +94,8 @@ export class TabsTransferPickerRenderer extends BaseTransferRenderer<TabsTransfe
           size={pickerSize}
           leftMode={leftMode}
           leftOptions={leftOptions}
+          optionItemRender={this.optionItemRender}
+          resultItemRender={this.resultItemRender}
         />
 
         <Spinner overlay key="info" show={loading} />

package/src/renderers/Form/Transfer.tsx

@@ -5,20 +5,28 @@ import {
 } from './Options';
 import React from 'react';
 import Transfer from '../../components/Transfer';
-import {Option} from './Options';
+import type {Option} from './Options';
 import {
   autobind,
   filterTree,
   string2regExp,
   createObject,
-  findTree
+  findTree,
+  findTreeIndex,
+  getTree,
+  spliceTree
 } from '../../utils/helper';
 import {Api} from '../../types';
 import Spinner from '../../components/Spinner';
 import find from 'lodash/find';
 import {optionValueCompare} from '../../components/Select';
 import {resolveVariable} from '../../utils/tpl-builtin';
-import {SchemaApi} from '../../Schema';
+import {SchemaApi, SchemaObject} from '../../Schema';
+import {BaseSelection, ItemRenderStates} from '../../components/Selection';
+import {
+  ItemRenderStates as ResultItemRenderStates,
+  ResultList
+} from '../../components/ResultList';
 
 /**
  * Transfer
@@ -91,6 +99,16 @@ export interface TransferControlSchema extends FormOptionsControl {
    * 右侧结果的标题文字
    */
   resultTitle?: string;
+
+  /**
+   * 用来丰富选项展示
+   */
+  menuTpl?: SchemaObject;
+
+  /**
+   * 用来丰富值的展示
+   */
+  valueTpl?: SchemaObject;
 }
 
 export interface BaseTransferProps
@@ -103,7 +121,6 @@ export interface BaseTransferProps
       | 'descriptionClassName'
       | 'inputClassName'
     > {
-  optionItemRender?: (option: Option) => JSX.Element;
   resultItemRender?: (option: Option) => JSX.Element;
 }
 
@@ -111,7 +128,7 @@ export class BaseTransferRenderer<
   T extends OptionsControlProps = BaseTransferProps
 > extends React.Component<T> {
   @autobind
-  handleChange(value: Array<Option>) {
+  handleChange(value: Array<Option>, optionModified?: boolean) {
     const {
       onChange,
       joinValues,
@@ -125,30 +142,37 @@ export class BaseTransferRenderer<
     let newOptions = options.concat();
 
     if (Array.isArray(value)) {
-      if (joinValues || extractValue) {
-        newValue = value.map(item => {
-          const resolved = findTree(
-            options,
-            optionValueCompare(
-              item[(valueField as string) || 'value'],
-              (valueField as string) || 'value'
-            )
-          );
+      newValue = value.map(item => {
+        const indexes = findTreeIndex(
+          options,
+          optionValueCompare(
+            item[(valueField as string) || 'value'],
+            (valueField as string) || 'value'
+          )
+        );
 
-          if (!resolved) {
-            newOptions.push(item);
-          }
+        if (!indexes) {
+          newOptions.push(item);
+        } else if (optionModified) {
+          const origin = getTree(newOptions, indexes);
+          newOptions = spliceTree(newOptions, indexes, 1, {
+            ...origin,
+            ...item
+          });
+        }
 
-          return item[(valueField as string) || 'value'];
-        });
-      }
+        return joinValues || extractValue
+          ? item[(valueField as string) || 'value']
+          : item;
+      });
 
       if (joinValues) {
         newValue = newValue.join(delimiter || ',');
       }
     }
 
-    newOptions.length > options.length && setOptions(newOptions, true);
+    (newOptions.length > options.length || optionModified) &&
+      setOptions(newOptions, true);
     onChange(newValue);
   }
 
@@ -220,6 +244,33 @@ export class BaseTransferRenderer<
     }
   }
 
+  @autobind
+  optionItemRender(option: Option, states: ItemRenderStates) {
+    const {menuTpl, render, data} = this.props;
+
+    if (menuTpl) {
+      return render(`item/${states.index}`, menuTpl, {
+        data: createObject(createObject(data, states), option)
+      });
+    }
+
+    return BaseSelection.itemRender(option, states);
+  }
+
+  @autobind
+  resultItemRender(option: Option, states: ResultItemRenderStates) {
+    const {valueTpl, render, data} = this.props;
+
+    if (valueTpl) {
+      return render(`value/${states.index}`, valueTpl, {
+        onChange: states.onChange,
+        data: createObject(createObject(data, states), option)
+      });
+    }
+
+    return ResultList.itemRender(option);
+  }
+
   @autobind
   renderCell(
     column: {
@@ -264,7 +315,7 @@ export class BaseTransferRenderer<
       disabled,
       selectTitle,
       resultTitle,
-      optionItemRender,
+      menuTpl,
       resultItemRender
     } = this.props;
 
@@ -306,8 +357,8 @@ export class BaseTransferRenderer<
           cellRender={this.renderCell}
           selectTitle={selectTitle}
           resultTitle={resultTitle}
-          optionItemRender={optionItemRender}
-          resultItemRender={resultItemRender}
+          optionItemRender={this.optionItemRender}
+          resultItemRender={this.resultItemRender}
         />
 
         <Spinner overlay key="info" show={loading} />

package/src/renderers/Form/TransferPicker.tsx

@@ -6,57 +6,23 @@ import {
 import React from 'react';
 import {Api} from '../../types';
 import Spinner from '../../components/Spinner';
-import {BaseTransferRenderer} from './Transfer';
+import {BaseTransferRenderer, TransferControlSchema} from './Transfer';
 import TabsTransfer from '../../components/TabsTransfer';
-import {SchemaApi} from '../../Schema';
+import {SchemaApi, SchemaObject} from '../../Schema';
 import TransferPicker from '../../components/TransferPicker';
 
 /**
  * TransferPicker 穿梭器的弹框形态
  * 文档：https://baidu.gitee.io/amis/docs/components/form/transfer-picker
  */
-export interface TransferPickerControlSchema extends FormOptionsControl {
+export interface TransferPickerControlSchema
+  extends Omit<TransferControlSchema, 'type'> {
   type: 'transfer-picker';
   /**
    * 边框模式，全边框，还是半边框，或者没边框。
    */
   borderMode?: 'full' | 'half' | 'none';
 
-  /**
-   * 是否显示剪头
-   */
-  showArrow?: boolean;
-
-  /**
-   * 可排序？
-   */
-  sortable?: boolean;
-
-  /**
-   * 搜索结果展示模式
-   */
-  searchResultMode?: 'table' | 'list' | 'tree' | 'chained';
-
-  /**
-   * 可搜索？
-   */
-  searchable?: boolean;
-
-  /**
-   * 搜索 API
-   */
-  searchApi?: SchemaApi;
-
-  /**
-   * 左侧的标题文字
-   */
-  selectTitle?: string;
-
-  /**
-   * 右侧结果的标题文字
-   */
-  resultTitle?: string;
-
   /**
    * 弹窗大小
    */
@@ -136,6 +102,8 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
           columns={columns}
           leftMode={leftMode}
           leftOptions={leftOptions}
+          optionItemRender={this.optionItemRender}
+          resultItemRender={this.resultItemRender}
         />
 
         <Spinner overlay key="info" show={loading} />

package/src/renderers/Form/TreeSelect.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import Overlay from '../../components/Overlay';
 import PopOver from '../../components/PopOver';
+import PopUp from '../../components/PopUp';
 
 import {
   OptionsControl,
@@ -17,7 +18,7 @@ import {Api} from '../../types';
 import {isEffectiveApi} from '../../utils/api';
 import Spinner from '../../components/Spinner';
 import ResultBox from '../../components/ResultBox';
-import {autobind, getTreeAncestors} from '../../utils/helper';
+import {autobind, getTreeAncestors, isMobile} from '../../utils/helper';
 import {findDOMNode} from 'react-dom';
 import {normalizeOptions} from '../../components/Select';
 
@@ -90,6 +91,7 @@ export interface TreeSelectProps extends OptionsControlProps {
   hideNodePathLabel?: boolean;
   enableNodePath?: boolean;
   pathSeparator?: string;
+  useMobileUI?: boolean;
 }
 
 export interface TreeSelectState {
@@ -502,67 +504,51 @@ export default class TreeSelectControl extends React.Component<
         : options;
 
     return (
-      <Overlay
-        container={popOverContainer || (() => this.container.current)}
-        target={() => this.target}
-        show
-      >
-        <PopOver
-          classPrefix={ns}
-          className={`${ns}TreeSelect-popover`}
-          style={{
-            minWidth: this.target ? this.target.offsetWidth : undefined
-          }}
-          onHide={this.close}
-          overlay
-        >
-          <TreeSelector
-            classPrefix={ns}
-            onlyChildren={onlyChildren}
-            labelField={labelField}
-            valueField={valueField}
-            disabled={disabled}
-            onChange={this.handleChange}
-            joinValues={joinValues}
-            extractValue={extractValue}
-            delimiter={delimiter}
-            placeholder={__(optionsPlaceholder)}
-            options={filtedOptions}
-            highlightTxt={this.state.inputValue}
-            multiple={multiple}
-            initiallyOpen={initiallyOpen}
-            unfoldedLevel={unfoldedLevel}
-            withChildren={withChildren}
-            rootLabel={__(rootLabel)}
-            rootValue={rootValue}
-            showIcon={showIcon}
-            showRadio={showRadio}
-            cascade={cascade}
-            foldedField="collapsed"
-            hideRoot
-            value={value || ''}
-            nodePath={nodePath}
-            enableNodePath={enableNodePath}
-            pathSeparator={pathSeparator}
-            maxLength={maxLength}
-            minLength={minLength}
-            onAdd={onAdd}
-            creatable={creatable}
-            createTip={createTip}
-            rootCreatable={rootCreatable}
-            rootCreateTip={rootCreateTip}
-            onEdit={onEdit}
-            editable={editable}
-            editTip={editTip}
-            removable={removable}
-            removeTip={removeTip}
-            onDelete={onDelete}
-            bultinCUD={!addControls && !editControls}
-            onDeferLoad={deferLoad}
-            onExpandTree={expandTreeOptions}
-          />
-        </PopOver>
-      </Overlay>
+      <TreeSelector
+        classPrefix={ns}
+        onlyChildren={onlyChildren}
+        labelField={labelField}
+        valueField={valueField}
+        disabled={disabled}
+        onChange={this.handleChange}
+        joinValues={joinValues}
+        extractValue={extractValue}
+        delimiter={delimiter}
+        placeholder={__(optionsPlaceholder)}
+        options={filtedOptions}
+        highlightTxt={this.state.inputValue}
+        multiple={multiple}
+        initiallyOpen={initiallyOpen}
+        unfoldedLevel={unfoldedLevel}
+        withChildren={withChildren}
+        rootLabel={__(rootLabel)}
+        rootValue={rootValue}
+        showIcon={showIcon}
+        showRadio={showRadio}
+        cascade={cascade}
+        foldedField="collapsed"
+        hideRoot
+        value={value || ''}
+        nodePath={nodePath}
+        enableNodePath={enableNodePath}
+        pathSeparator={pathSeparator}
+        maxLength={maxLength}
+        minLength={minLength}
+        onAdd={onAdd}
+        creatable={creatable}
+        createTip={createTip}
+        rootCreatable={rootCreatable}
+        rootCreateTip={rootCreateTip}
+        onEdit={onEdit}
+        editable={editable}
+        editTip={editTip}
+        removable={removable}
+        removeTip={removeTip}
+        onDelete={onDelete}
+        bultinCUD={!addControls && !editControls}
+        onDeferLoad={deferLoad}
+        onExpandTree={expandTreeOptions}
+      />
     );
   }
 
@@ -581,9 +567,13 @@ export default class TreeSelectControl extends React.Component<
       autoComplete,
       selectedOptions,
       placeholder,
+      popOverContainer,
+      env,
       translate: __
     } = this.props;
 
+    const {isOpened} = this.state;
+    const {useMobileUI} = env;
     return (
       <div ref={this.container} className={cx(`TreeSelectControl`, className)}>
         <ResultBox
@@ -622,7 +612,34 @@ export default class TreeSelectControl extends React.Component<
         >
           {loading ? <Spinner size="sm" /> : undefined}
         </ResultBox>
-        {this.state.isOpened ? this.renderOuter() : null}
+        {!(useMobileUI && isMobile()) && isOpened ? (
+          <Overlay
+            container={popOverContainer || (() => this.container.current)}
+            target={() => this.target}
+            show
+          >
+            <PopOver
+              classPrefix={ns}
+              className={`${ns}TreeSelect-popover`}
+              style={{
+                minWidth: this.target ? this.target.offsetWidth : undefined
+              }}
+              onHide={this.close}
+              overlay
+            >
+              {this.renderOuter()}
+            </PopOver>
+          </Overlay>
+        ) : null}
+        {useMobileUI && isMobile() && (
+          <PopUp
+            className={cx(`${ns}TreeSelect-popup`)}
+            isShow={isOpened}
+            onHide={this.close}
+          >
+            {this.renderOuter()}
+          </PopUp>
+        )}
       </div>
     );
   }

package/src/renderers/Form/index.tsx

@@ -398,7 +398,8 @@ export default class Form extends React.Component<FormProps, object> {
     'simpleMode',
     'inputOnly',
     'value',
-    'actions'
+    'actions',
+    'multiple'
   ];
 
   hooks: {

package/src/renderers/IFrame.tsx

@@ -161,8 +161,6 @@ export default class IFrame extends React.Component<IFrameProps, object> {
       ...style
     };
 
-    src = dataMapping(src, data);
-
     const finalSrc = src ? buildApi(src, data).url : undefined;
 
     if (

package/src/renderers/Json.tsx

@@ -94,6 +94,11 @@ export class JSONField extends React.Component<JSONProps, object> {
     let data = value;
     if (source !== undefined && isPureVariable(source)) {
       data = resolveVariableAndFilter(source, this.props.data, '| raw');
+    } else if (typeof value === 'string') {
+      // 尝试解析 json
+      try {
+        data = JSON.parse(value);
+      } catch (e) {}
     }
 
     let jsonThemeValue = jsonTheme;

package/src/renderers/Nav.tsx

@@ -415,7 +415,10 @@ export class Navigation extends React.Component<
               />
             ) : hasSub ? (
               <span
-                onClick={() => this.toggleLink(link)}
+                onClick={e => {
+                  this.toggleLink(link);
+                  e.stopPropagation();
+                }}
                 className={cx('Nav-itemToggler', togglerClassName)}
               >
                 <Icon icon="caret" className="icon" />