shineout 2.0.0-rc.5 → 2.0.0-rc.7

package/css/Cascader/Node.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode } from 'react';
 import { CascaderBaseValue, NodeProps } from './Props';
 import { PureComponent } from '../component';
 interface NodeState {
@@ -13,7 +13,7 @@ declare class Node<U, T extends CascaderBaseValue> extends PureComponent<NodePro
     handlePathChange(): void;
     handleChange(_: any, checked: boolean): void;
     handleSelect(e: MouseEvent): void;
-    renderContent(): React.ReactNode;
+    renderContent(): ReactNode;
     render(): JSX.Element;
 }
 export default Node;

package/css/Checkbox/CheckItem.js

@@ -31,6 +31,8 @@ var _is = require("../utils/is");
 
 var _Input = _interopRequireDefault(require("../Input"));
 
+var _Spin = _interopRequireDefault(require("../Spin"));
+
 var _styles = require("./styles");
 
 var _config = require("../config");
@@ -154,11 +156,13 @@ function checkItem(type) {
           size = _this$props5.size,
           children = _this$props5.children,
           inputable = _this$props5.inputable,
-          onClick = _this$props5.onClick;
+          onClick = _this$props5.onClick,
+          loading = _this$props5.loading;
       var rtl = (0, _config.isRTL)();
       var checked = this.getChecked();
       var isSwitch = type === 'switch';
-      var className = (0, _classnames.default)((0, _styles.checkinputClass)('_', disabled && 'disabled', checked === true && 'checked', checked === 'indeterminate' && 'indeterminate', isSwitch && 'switch', type + "-container", rtl && 'rtl', {
+      var ban = disabled || isSwitch && loading;
+      var className = (0, _classnames.default)((0, _styles.checkinputClass)('_', ban && 'disabled', checked === true && 'checked', checked === 'indeterminate' && 'indeterminate', isSwitch && 'switch', loading && 'loading', type + "-container", rtl && 'rtl', {
         large: size === 'large',
         small: size === 'small'
       }), this.props.className);
@@ -180,10 +184,10 @@ function checkItem(type) {
         ref: this.bindRef
         /* @ts-ignore */
         ,
-        disabled: disabled
+        disabled: ban
       }, (0, _getDataset.default)(this.props)), switchChildren, _react.default.createElement("input", {
         id: this.id,
-        disabled: disabled,
+        disabled: ban,
         tabIndex: -1,
         type: isSwitch ? 'checkbox' : type,
         onClick: onClick,
@@ -199,7 +203,11 @@ function checkItem(type) {
         value: value
       }), isSwitch && _react.default.createElement("span", {
         className: (0, _styles.checkinputClass)((0, _classname.getDirectionClass)('switch-indicator'))
-      }));
+      }, loading ? _react.default.createElement(_Spin.default, {
+        size: "auto",
+        color: "none",
+        name: "ring"
+      }) : null));
     };
 
     return CheckItem;

package/css/Checkbox/Group.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode } from 'react';
 import { PureComponent } from '../component';
 import { BaseCheckboxGroupProps, CheckValueType } from './Props';
 declare class CheckboxGroup<DataItem, Value> extends PureComponent<BaseCheckboxGroupProps<DataItem, Value>, {}> {
@@ -8,7 +8,7 @@ declare class CheckboxGroup<DataItem, Value> extends PureComponent<BaseCheckboxG
     constructor(props: BaseCheckboxGroupProps<DataItem, Value>);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getContent(d: DataItem): React.ReactNode;
+    getContent(d: DataItem): ReactNode;
     handleUpdate(): void;
     handleClick(_val: unknown, checked: CheckValueType, index: number): void;
     handleRawChange(value: DataItem, checked: CheckValueType): void;

package/css/Checkbox/Props.d.ts

@@ -6,6 +6,7 @@ import { GetDatumListProps } from '../Datum/Props';
 export declare type CheckValueType = boolean | 'indeterminate';
 export declare type CheckType = 'radio' | 'switch' | 'checkbox';
 export interface CheckItemProps extends StandardProps {
+    children?: ReactNode;
     /**
      * disable checkbox
      *
@@ -14,6 +15,15 @@ export interface CheckItemProps extends StandardProps {
      * default: false
      */
     disabled?: boolean;
+    /**
+     *
+     *  loading
+     *
+     * 加载中
+     *
+     * default: false
+     */
+    loading?: boolean;
     /**
      * if not set, use (value === htmlValue).
      *
@@ -60,14 +70,14 @@ export interface CheckItemProps extends StandardProps {
     size?: 'small' | 'default' | 'large';
     content?: [ReactNode, ReactNode] | [];
 }
-export declare type SimpleCheckProps = Omit<CheckItemProps, 'content' | 'onChange'> & {
+export declare type SimpleCheckProps = Omit<CheckItemProps, 'content' | 'onChange' | 'loading'> & {
     onChange?: ((value: any, checked: CheckValueType, index?: number) => void);
 };
-export declare type SimpleRadioProps = Omit<CheckItemProps, 'content' | 'onChange' | 'onRawChange' | 'inputable' | 'value'> & {
+export declare type SimpleRadioProps = Omit<CheckItemProps, 'content' | 'onChange' | 'onRawChange' | 'inputable' | 'value' | 'loading'> & {
     checked?: boolean | ((htmlValue: any) => boolean);
     onChange?: ((value: any, checked: CheckValueType, index?: number) => void);
 };
-export declare type SimpleSwitchProps = Omit<CheckItemProps, 'onChange' | 'onRawChange' | 'inputable' | 'value'> & {
+export declare type SimpleSwitchProps = Omit<CheckItemProps, 'onChange' | 'onRawChange' | 'inputable' | 'value' | 'children'> & {
     checked?: boolean | ((htmlValue: any) => boolean);
     onChange?: ((value: boolean) => void);
 };
@@ -77,6 +87,7 @@ export interface CheckboxContextProvider {
 }
 export declare type CheckboxProviderProps<U> = Omit<U, 'onRawChange'>;
 export interface BaseCheckboxGroupProps<DataItem, Value> extends StandardProps {
+    children?: ReactNode;
     /**
      * When it is a string, return d[string]. When it is a function, return the result of the function.
      *

package/css/Checkbox/styles/checkinput.css

@@ -393,11 +393,22 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   border-radius: 50%;
   -webkit-box-shadow: 0 1px 4px var(--gray-500, #adb5bd);
           box-shadow: 0 1px 4px var(--gray-500, #adb5bd);
+  font-size: var(--switch-indicator-size, 24px);
+  color: var(--switch-unchecked-bg, #ced4da);
 }
 .so-checkinput-rtl .so-checkinput-switch-indicator {
   left: auto;
   right: var(--switch-indicator-padding-horizontal, 0px);
 }
+.so-checkinput-loading .so-checkinput-switch-indicator .so-spin-ring {
+  position: absolute;
+  top: 12%;
+  left: 12%;
+  right: 12%;
+  bottom: 12%;
+  border-width: 0.12em;
+  border-top-color: currentColor;
+}
 .so-checkinput-switch-children {
   font-size: 12px;
   color: #fff;
@@ -416,6 +427,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   -webkit-box-shadow: var(--switch-checked-box-shadow, 0 1px 4px var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
           box-shadow: var(--switch-checked-box-shadow, 0 1px 4px var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
   background: var(--switch-indicator-checked-bg, var(--primary-color, #3399ff));
+  color: var(--switch-checked-bg, var(--primary-color-fade-50, rgba(51, 153, 255, 0.5)));
 }
 .so-checkinput-checked.so-checkinput-switch .so-checkinput-switch-indicator-ltr {
   left: 100%;
@@ -465,6 +477,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   top: var(--switch-small-indicator-top, -3px);
   padding-left: 8px;
   padding-right: 8px;
+  font-size: var(--switch-small-indicator-size, 16px);
 }
 .so-checkinput-large.so-checkinput-switch {
   min-width: 60px;
@@ -482,6 +495,7 @@ fieldset[disabled] .so-checkinput-button .so-checkinput.so-checkinput-checked:ac
   width: var(--switch-large-indicator-size, 32px);
   height: var(--switch-large-indicator-size, 32px);
   top: var(--switch-large-indicator-top, -5px);
+  font-size: var(--switch-large-indicator-size, 32px);
 }
 .so-checkinput-disabled.so-checkinput-switch {
   opacity: 0.4;

package/css/DataList/List.d.ts

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import { Component, ReactNode } from 'react';
 import { BaseListProps } from './Props';
 declare class Index<U, T> extends Component<BaseListProps<U, T>> {
     static defaultProps: {
@@ -13,7 +13,7 @@ declare class Index<U, T> extends Component<BaseListProps<U, T>> {
     constructor(props: BaseListProps<U, T>);
     componentWillUnmount(): void;
     getItemClassName(value: U, index: number, flag?: boolean): string;
-    getContent(value: U, index: number): React.ReactNode;
+    getContent(value: U, index: number): ReactNode;
     scrollLoading(): void;
     bindNode(node: HTMLDivElement): void;
     bindObserver(node: HTMLDivElement): void;

package/css/Form/Props.d.ts

@@ -210,6 +210,7 @@ export interface FormModeProps {
 /** ----------------form-----------------------* */
 export declare type formStatus = 'disabled' | 'pending' | '';
 export interface SimpleFormProps<Value = ObjectType> extends StandardProps {
+    children?: ReactNode;
     /**
      * Form value
      *
@@ -355,6 +356,7 @@ export interface ItemProps extends StandardProps {
     tip?: React.ReactNode;
     formDatum?: FormDatum<any>;
     labelVerticalAlign?: 'top' | 'middle' | 'bottom';
+    children?: React.ReactNode;
 }
 /** ----------------formButton-----------------------* */
 export interface FormButtonProps extends Omit<ButtonProps, 'htmlType' | 'onRef'> {

package/css/Modal/Props.d.ts

@@ -223,7 +223,7 @@ export interface ModalProps extends StandardProps {
     drawer?: boolean;
     children?: ReactNode;
 }
-export interface ModalPanelProps extends StandardProps, Pick<ModalProps, 'footer' | 'maskCloseAble' | 'noPadding' | 'onClose' | 'padding' | 'position' | 'title' | 'type' | 'width' | 'moveable' | 'resizable' | 'hideClose' | 'zoom' | 'events' | 'fullScreen' | 'top' | 'bodyStyle'> {
+export interface ModalPanelProps extends StandardProps, Pick<ModalProps, 'children' | 'footer' | 'maskCloseAble' | 'noPadding' | 'onClose' | 'padding' | 'position' | 'title' | 'type' | 'width' | 'moveable' | 'resizable' | 'hideClose' | 'zoom' | 'events' | 'fullScreen' | 'top' | 'bodyStyle'> {
     id?: string;
     from?: string;
     container?: Element;
@@ -291,6 +291,7 @@ export interface ModalFunctionOptions extends Omit<ModalProps, 'usePortal' | 'de
      * default: -
      */
     noPadding?: boolean;
+    children?: ReactNode;
 }
 export declare type Options = ModalFunctionOptions & {
     id: string;

package/css/Radio/Group.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { ReactNode } from 'react';
 import { PureComponent } from '../component';
 import { BaseRadioGroupProps } from './Props';
 import { CheckValueType } from '../Checkbox/Props';
@@ -10,7 +10,7 @@ declare class RadioGroup<DataItem, Value> extends PureComponent<BaseRadioGroupPr
     constructor(props: BaseRadioGroupProps<DataItem, Value>);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getContent(d: DataItem, index: number): React.ReactNode;
+    getContent(d: DataItem, index: number): ReactNode;
     handleClick(_val: any, _checked: CheckValueType, index: number): void;
     handleRawChange(value: DataItem): void;
     render(): JSX.Element;

package/css/Radio/Props.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { ReactNode } from 'react';
 import { GetInputableProps } from '../Form/Props';
 import { GetDatumListProps } from '../Datum/Props';
 import { LiteralUnion, RegularAttributes } from '../@types/common';
@@ -6,6 +7,7 @@ import { SimpleRadioProps } from '../Checkbox/Props';
 import { KeygenType, StandardProps } from '../@types/common';
 import ListDatum from '../Datum/List';
 export interface BaseRadioGroupProps<DataItem, Value> extends StandardProps {
+    children?: ReactNode;
     /**
      * When it is a string, return d[string]. When it is a function, return the result of the function.
      *

package/css/Scroll/Props.d.ts

@@ -21,6 +21,7 @@ export interface ScrollProps {
     innerScrollAttr?: string[];
     className?: string;
     style?: CSSProperties;
+    children?: ReactNode;
 }
 /** ------ bar ------ */
 export interface BarProps {
@@ -41,4 +42,5 @@ export interface ScrollIndexProps extends Omit<ScrollProps, 'left' | 'top' | 'sc
     scrollLeft?: number;
     scrollTop?: number;
     scroll?: ScrollFixedType;
+    children?: ReactNode;
 }

package/css/Select/Select.js

@@ -298,7 +298,6 @@ function (_PureComponent) {
   _proto.handleChange = function handleChange(_isActive, data, fromInput) {
     var _this2 = this;
 
-    console.log('fromInput', fromInput);
     var _this$props4 = this.props,
         datum = _this$props4.datum,
         multiple = _this$props4.multiple,

package/css/Table/Props.d.ts

@@ -277,9 +277,10 @@ export declare class Table<DataItem, Value> extends React.Component<TableProps<D
 export declare type TableType = typeof Table;
 /** ------ simpleTable ---------- */
 export interface SimpleTableProps<DataItem, Value> {
+    children?: ReactNode;
     width?: number;
     dataChangeResize?: boolean;
-    externalExpandRender?: (rowData: DataItem, index: number) => ReactNode;
+    externalExpandRender?: (rowData: DataItem, index: number) => () => ReactNode;
     expandKeys?: KeygenResult[];
     keygen: StructKeygenType<DataItem>;
     resetFixAuto: (is?: boolean) => boolean;
@@ -403,7 +404,7 @@ export interface Row<DataItem> {
 }
 /** ------ tr ---------- */
 export interface TrProps<DataItem, Value> extends Omit<TbodyProps<DataItem, Value>, 'data' | 'keygen' | 'sorter' | 'expandKeys' | 'colgroup'> {
-    onExpand: (key: KeygenResult, expanded?: ReactNode) => void;
+    onExpand: (key: KeygenResult, expanded?: () => ReactNode) => void;
     expandRender?: ((rowData: DataItem, index?: number) => ReactNode) | ReactNode;
     rowKey?: string | number;
     rowData: DataItem;

package/css/Table/Tbody.d.ts

@@ -19,7 +19,7 @@ declare class Tbody<DataItem, Value> extends PureComponent<TbodyProps<DataItem,
     componentDidUpdate(prevProps: TbodyProps<DataItem, Value>): void;
     bodyRender(): void;
     bindBody(el: HTMLTableSectionElement): void;
-    handleExpand(key: KeygenResult, render: ReactNode): void;
+    handleExpand(key: KeygenResult, render: () => ReactNode): void;
     findExpandFunc(key: KeygenResult, i: number): React.ReactNode;
     renderTr(row: Row<DataItem>[], i: number): JSX.Element;
     renderPlaceholderTr(): JSX.Element;

package/css/Table/Td.d.ts

@@ -1,18 +1,18 @@
-import React, { PureComponent, ReactNode } from 'react';
+import { PureComponent, ReactNode } from 'react';
 import { TdProps } from './Props';
 export declare const CLASS_FIXED_LEFT = "fixed-left";
 export declare const CLASS_FIXED_RIGHT = "fixed-right";
 declare class Td<DataItem, Value> extends PureComponent<TdProps<DataItem, Value>> {
     static defaultProps: any;
-    cachedRender: ReactNode;
+    cachedRender: () => ReactNode;
     constructor(props: TdProps<DataItem, Value>);
     handleExpandClick(): void;
     handleTreeExpand(): void;
-    renderCheckbox(): React.ReactNode;
+    renderCheckbox(): ReactNode;
     renderExpand(index: number): JSX.Element | null;
     renderTreeExpand(content: ReactNode): JSX.Element;
-    renderResult(): React.ReactNode;
-    renderContent(): React.ReactNode;
+    renderResult(): ReactNode;
+    renderContent(): ReactNode;
     render(): JSX.Element;
 }
 export default Td;

package/css/Transfer/Props.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { ReactNode } from 'react';
 import ListDatum from '../Datum/List';
 import { GetDatumListProps } from '../Datum/Props';
 import { KeygenResult, LiteralUnion, StructKeygenType } from '../@types/common';
@@ -123,7 +124,13 @@ export interface BaseTransferProps<DataItem, Value extends any[]> {
      * default: -
      */
     renderFilter?: (value: filterProps) => React.ReactNode;
-    children?: React.ReactNode;
+    children?: (props: {
+        onSelected: (keys: KeygenResult) => void;
+        direction: 'left' | 'right';
+        selectedKeys: KeygenResult[];
+        value: Value;
+        filterText: string;
+    }) => ReactNode;
 }
 /** ----------- btns ------------*/
 export interface BtnProps<DataItem, Value extends any[]> extends Pick<BaseTransferProps<DataItem, Value>, 'datum' | 'keygen' | 'operationIcon' | 'data' | 'disabled'>, Required<Pick<BaseTransferProps<DataItem, Value>, 'operations' | 'data'>> {

package/css/Tree/Props.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { ComponentType } from 'react';
 import * as CSS from 'csstype';
 import { KeygenResult, LiteralUnion, StandardProps, ValueItem } from '../@types/common';
 import DatumTree, { TreePathType, TreeModeType } from '../Datum/Tree';
 import { GetInputableProps } from '../Form/Props';
+declare type ExpandIconType<Item> = React.ReactNode | ((d: Item) => React.ReactNode);
 /** ------------ Tree -------------- */
 export interface TreeProps<DataItem, Value extends any[]> extends StandardProps {
     /**
@@ -137,7 +137,7 @@ export interface TreeProps<DataItem, Value extends any[]> extends StandardProps
      *
      * default: none
      */
-    expandIcons?: React.ReactNode[];
+    expandIcons?: [ExpandIconType<DataItem>, ExpandIconType<DataItem>];
     /**
      * desc: style when drap images
      *
@@ -269,7 +269,7 @@ export interface NodeProps<DataItem, Value extends any[]> extends Omit<ListProps
     id: KeygenResult;
     data: DataItem;
     index: number;
-    listComponent: ComponentType<ListProps<DataItem, Value>>;
+    listComponent: React.ComponentType<ListProps<DataItem, Value>>;
 }
 /** ------------ Content -------------- */
 export interface ContentProps<DataItem, Value extends any[]> extends Omit<NodeProps<DataItem, Value>, 'listComponent' | 'onDrop' | 'childrenClass' | 'leafClass' | 'nodeClass'> {
@@ -289,3 +289,4 @@ export declare class TreeField<DataItem, Value extends any[]> extends React.Comp
     render: () => JSX.Element;
 }
 export declare type TreeFieldType = typeof TreeField;
+export {};

package/css/Upload/Props.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { ReactNode } from 'react';
 import { ObjectType, StandardProps } from '../@types/common';
 import { PopoverConfirmProps } from '../Popover/Props';
 import { GapProps } from '../Gap/Props';
@@ -445,6 +446,7 @@ export interface DropProps<ValueItem> extends Pick<AcceptUpload<ValueItem>, 'dro
     dropData?: any;
     onDrop?: (files: File[], index: number) => void;
     className?: string;
+    children?: ReactNode;
 }
 export interface FileProps {
     id: string;

package/css/index.js

@@ -220,6 +220,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '2.0.0-rc.5'
+  version: '2.0.0-rc.7'
 };
 exports.default = _default;

package/css/utils/clone.js

@@ -18,6 +18,20 @@ var cloneObject = function cloneObject(source, specialKeys) {
   }
 
   var target = Object.create(Object.getPrototypeOf(source));
+  /* File or Response (non-serializable data) will throw error */
+
+  try {
+    // eslint-disable-next-line guard-for-in
+    for (var key in target) {
+      target[key] = target[key];
+    }
+  } catch (e) {
+    console.error('should not pass non-serializable data', source);
+    console.error(e);
+    target = {};
+  }
+
+  ;
   [].concat(specialKeys, Object.keys(source)).forEach(function (k) {
     // eslint-disable-next-line
     target[k] = deepClone(source[k]);