amis 1.4.2-beta.11 → 1.4.2-beta.12

package/src/components/PickerColumn.tsx

@@ -20,7 +20,7 @@ import {range} from '../utils/helper';
 import {themeable, ThemeProps} from '../theme';
 import {localeable, LocaleProps} from '../locale';
 import useTouch from '../hooks/use-touch';
-import {Button} from '.';
+import Button from './Button';
 
 export interface PickerColumnProps extends ThemeProps, LocaleProps {
   mobileClassName?: string;

package/src/components/Select.tsx

@@ -770,7 +770,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
       hideSelected,
       renderMenu,
       mobileClassName,
-      useMobileUI = true
+      useMobileUI = false
     } = this.props;
     const {selection} = this.state;
 

package/src/components/Selection.tsx

@@ -42,7 +42,7 @@ export class BaseSelection<
     placeholder: 'placeholder.noOption',
     itemRender: (option: Option) => <span>{option.label}</span>,
     multiple: true,
-    clearable: true
+    clearable: false
   };
 
   static value2array(

package/src/renderers/Form/Select.tsx

@@ -351,7 +351,6 @@ class TransferDropdownRenderer extends BaseTransferRenderer<TransferDropDownProp
     const {
       className,
       classnames: cx,
-      options,
       selectedOptions,
       sortable,
       loading,
@@ -363,11 +362,26 @@ class TransferDropdownRenderer extends BaseTransferRenderer<TransferDropDownProp
       selectTitle,
       selectMode,
       multiple,
-      leftMode,
-      leftOptions,
-      columns
+      columns,
+      leftMode
     } = this.props;
 
+    // 目前 LeftOptions 没有接口可以动态加载
+    // 为了方便可以快速实现动态化，让选项的第一个成员携带
+    // LeftOptions 信息
+    let {options, leftOptions, leftDefaultValue} = this.props;
+    if (
+      selectMode === 'associated' &&
+      options &&
+      options.length === 1 &&
+      options[0].leftOptions &&
+      Array.isArray(options[0].children)
+    ) {
+      leftOptions = options[0].leftOptions;
+      leftDefaultValue = options[0].leftDefaultValue ?? leftDefaultValue;
+      options = options[0].children;
+    }
+
     return (
       <>
         <TransferDropDown

package/src/renderers/Form/Transfer.tsx

@@ -249,7 +249,6 @@ export class BaseTransferRenderer<
     const {
       className,
       classnames: cx,
-      options,
       selectedOptions,
       showArrow,
       sortable,
@@ -260,7 +259,6 @@ export class BaseTransferRenderer<
       searchResultMode,
       searchResultColumns,
       deferLoad,
-      leftOptions,
       leftMode,
       rightMode,
       disabled,
@@ -270,6 +268,22 @@ export class BaseTransferRenderer<
       resultItemRender
     } = this.props;
 
+    // 目前 LeftOptions 没有接口可以动态加载
+    // 为了方便可以快速实现动态化，让选项的第一个成员携带
+    // LeftOptions 信息
+    let {options, leftOptions, leftDefaultValue} = this.props;
+    if (
+      selectMode === 'associated' &&
+      options &&
+      options.length === 1 &&
+      options[0].leftOptions &&
+      Array.isArray(options[0].children)
+    ) {
+      leftOptions = options[0].leftOptions;
+      leftDefaultValue = options[0].leftDefaultValue ?? leftDefaultValue;
+      options = options[0].children;
+    }
+
     return (
       <div className={cx('TransferControl', className)}>
         <Transfer

package/src/renderers/Form/TransferPicker.tsx

@@ -78,7 +78,6 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
     const {
       className,
       classnames: cx,
-      options,
       selectedOptions,
       sortable,
       loading,
@@ -92,12 +91,29 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       pickerSize,
       columns,
       leftMode,
-      leftOptions
+      selectMode
     } = this.props;
 
+    // 目前 LeftOptions 没有接口可以动态加载
+    // 为了方便可以快速实现动态化，让选项的第一个成员携带
+    // LeftOptions 信息
+    let {options, leftOptions, leftDefaultValue} = this.props;
+    if (
+      selectMode === 'associated' &&
+      options &&
+      options.length === 1 &&
+      options[0].leftOptions &&
+      Array.isArray(options[0].children)
+    ) {
+      leftOptions = options[0].leftOptions;
+      leftDefaultValue = options[0].leftDefaultValue ?? leftDefaultValue;
+      options = options[0].children;
+    }
+
     return (
-      <div className={cx('TabsTransferControl', className)}>
+      <div className={cx('TransferControl', className)}>
         <TransferPicker
+          selectMode={selectMode}
           value={selectedOptions}
           disabled={disabled}
           options={options}

package/src/renderers/Form/index.tsx

@@ -202,6 +202,11 @@ export interface FormSchema extends BaseSchema {
    */
   mode?: 'normal' | 'inline' | 'horizontal';
 
+  /**
+   * 表单项显示为几列
+   */
+  columnCount?: number;
+
   /**
    * 如果是水平排版，这个属性可以细化水平排版的左右宽度占比。
    */
@@ -347,6 +352,7 @@ export default class Form extends React.Component<FormProps, object> {
       right: 10,
       offset: 2
     },
+    columnCount: 0,
     panelClassName: 'Panel--default',
     messages: {
       fetchFailed: 'fetchFailed',
@@ -367,6 +373,7 @@ export default class Form extends React.Component<FormProps, object> {
     'initFetch',
     'wrapWithPanel',
     'mode',
+    'columnCount',
     'collapsable',
     'horizontal',
     'panelClassName',
@@ -1418,6 +1425,7 @@ export default class Form extends React.Component<FormProps, object> {
       debug,
       $path,
       store,
+      columnCount,
       render
     } = this.props;
 
@@ -1429,7 +1437,13 @@ export default class Form extends React.Component<FormProps, object> {
 
     return (
       <WrapperComponent
-        className={cx(`Form`, `Form--${mode || 'normal'}`, className)}
+        className={cx(
+          `Form`,
+          `Form--${mode || 'normal'}`,
+          {'Form--column': columnCount},
+          `Form--column-${columnCount}`,
+          className
+        )}
         onSubmit={this.handleFormSubmit}
         noValidate
       >

package/src/renderers/Table/index.tsx

@@ -1441,7 +1441,7 @@ export default class Table extends React.Component<TableProps, object> {
   handleColumnToggle(columns: Array<IColumn>) {
     const {store} = this.props;
 
-    store.update({columns});
+    store.updateColumns(columns);
   }
 
   renderAutoFilterForm(): React.ReactNode {
@@ -2155,7 +2155,6 @@ export default class Table extends React.Component<TableProps, object> {
     } = this.props;
     const __ = rest.translate;
     const env = rest.env;
-
     const render = this.props.render;
 
     if (!store.columnsTogglable) {

package/src/store/table.ts

@@ -523,15 +523,6 @@ export const TableStore = iRendererStore
       );
     }
 
-    function getActivedSearchableColumns() {
-      return self.columns.filter(
-        column =>
-          column.searchable &&
-          isObject(column.searchable) &&
-          column.enableSearch
-      );
-    }
-
     return {
       get columnsData() {
         return getColumnsExceptBuiltinTypes();
@@ -765,6 +756,51 @@ export const TableStore = iRendererStore
       }
     }
 
+    function updateColumns(columns: Array<SColumn>) {
+      if (columns && Array.isArray(columns)) {
+        columns = columns.filter(column => column).concat();
+
+        if (!columns.length) {
+          columns.push({
+            type: 'text',
+            label: '空'
+          });
+        }
+
+        columns.unshift({
+          type: '__expandme',
+          toggable: false,
+          className: 'Table-expandCell'
+        });
+
+        columns.unshift({
+          type: '__checkme',
+          fixed: 'left',
+          toggable: false,
+          className: 'Table-checkCell'
+        });
+
+        columns.unshift({
+          type: '__dragme',
+          toggable: false,
+          className: 'Table-dragCell'
+        });
+
+        columns = columns.map((item, index) => ({
+          ...item,
+          index,
+          rawIndex: index - 3,
+          type: item.type || 'plain',
+          pristine: item.pristine || item,
+          toggled: item.toggled !== false,
+          breakpoint: item.breakpoint,
+          isPrimary: index === 3
+        }));
+
+        self.columns.replace(columns as any);
+      }
+    }
+
     function combineCell(arr: Array<SRow>, keys: Array<string>): Array<SRow> {
       if (!keys.length || !arr.length) {
         return arr;
@@ -1228,6 +1264,7 @@ export const TableStore = iRendererStore
 
     return {
       update,
+      updateColumns,
       initRows,
       updateSelected,
       toggleAll,