shineout 1.10.4 → 1.11.0-rc.4

package/css/AnimationList/LazyList.js

@@ -52,8 +52,10 @@ function (_PureComponent) {
   _proto.getScrollHeight = function getScrollHeight() {
     var _this$props = this.props,
         lineHeight = _this$props.lineHeight,
-        data = _this$props.data;
-    return data.length * lineHeight;
+        data = _this$props.data,
+        colNum = _this$props.colNum;
+    var rows = Math.ceil(data.length / colNum);
+    return rows * lineHeight;
   };
 
   _proto.resetScrollTop = function resetScrollTop() {
@@ -111,7 +113,8 @@ function (_PureComponent) {
         data = _this$props3.data,
         itemsInView = _this$props3.itemsInView,
         renderItem = _this$props3.renderItem,
-        keygen = _this$props3.keygen;
+        keygen = _this$props3.keygen,
+        colNum = _this$props3.colNum;
     var _this$state = this.state,
         currentIndex = _this$state.currentIndex,
         fixed = _this$state.fixed;
@@ -119,11 +122,16 @@ function (_PureComponent) {
     var ms = Object.assign({}, style, height && {
       height: height
     });
-    var items = data.slice(currentIndex, currentIndex + itemsInView).map(function (d, i) {
+    var items = data.slice(currentIndex * colNum, (currentIndex + itemsInView) * colNum).map(function (d, i) {
       return _react.default.createElement(_react.Fragment, {
         key: (0, _uid.getKey)(d, keygen, i)
       }, renderItem(d, i));
     });
+    var fr = Array(colNum).fill('1fr').join(' ');
+    var gridStyle = colNum > 1 ? {
+      display: 'grid',
+      gridTemplateColumns: fr
+    } : {};
     return _react.default.createElement(_Scroll.default, {
       stable: true,
       className: className,
@@ -135,10 +143,12 @@ function (_PureComponent) {
     }, _react.default.createElement("div", {
       ref: function ref(el) {
         _this2.optionInner = el;
-      }
+      },
+      style: gridStyle
     }, _react.default.createElement("div", {
       style: {
-        height: currentIndex * lineHeight
+        height: currentIndex * lineHeight,
+        gridColumnEnd: '-1'
       }
     }), items));
   };
@@ -153,6 +163,7 @@ LazyList.defaultProps = {
 };
 LazyList.propTypes = {
   data: _propTypes.default.array,
+  colNum: _propTypes.default.number,
   itemsInView: _propTypes.default.number,
   lineHeight: _propTypes.default.number,
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),

package/css/DataList/List.js

@@ -134,18 +134,36 @@ function (_Component) {
         fixed = _this$props2.fixed,
         rowsInView = _this$props2.rowsInView,
         lineHeight = _this$props2.lineHeight,
-        value = _this$props2.value;
+        value = _this$props2.value,
+        colNum = _this$props2.colNum;
     if (isEmpty) return _react.default.createElement("div", {
       className: (0, _styles.listClass)('item', 'empty')
     }, empty || (0, _locale.getLocale)('noData'));
-    if (!fixed) return data.map(this.renderItem);
+
+    if (!fixed) {
+      var items = data.map(this.renderItem);
+
+      if (colNum && colNum > 1) {
+        var frs = Array(colNum).fill('1fr').join(' ');
+        return _react.default.createElement("div", {
+          style: {
+            display: 'grid',
+            gridTemplateColumns: frs
+          }
+        }, items);
+      }
+
+      return items;
+    }
+
     return _react.default.createElement(_LazyList.default, {
       lineHeight: lineHeight,
       data: data,
       keygen: keygen,
       renderItem: this.renderItem,
       itemsInView: rowsInView,
-      force: value
+      force: value,
+      colNum: colNum
     });
   };
 
@@ -213,11 +231,13 @@ Index.propTypes = {
   rowsInView: _propTypes.default.number,
   height: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
   lineHeight: _propTypes.default.number,
-  value: _propTypes.default.array
+  value: _propTypes.default.array,
+  colNum: _propTypes.default.number
 };
 Index.defaultProps = {
   size: 'default',
-  loading: false
+  loading: false,
+  colNum: 1
 };
 Index.displayName = 'ShineoutList';
 var _default = Index;

package/css/DataList/index.d.ts

@@ -180,6 +180,15 @@ export interface ListBaseItemProps{
    */
   title?: string;
 
+  /**
+   * Multi-column display
+   *
+   * 多列展示
+   *
+   * default: 1
+   */
+  colNum?: number;
+
 
 }
 

package/css/Select/Select.js

@@ -106,7 +106,7 @@ function (_PureComponent) {
 
     if (prevState.focus !== this.state.focus && !this.state.focus && onFilter) {
       setTimeout(function () {
-        onFilter('');
+        onFilter('', 'blur');
       }, 400);
     }
   };
@@ -271,7 +271,7 @@ function (_PureComponent) {
       }, 10);
     }
 
-    if (emptyAfterSelect && onFilter && filterText) onFilter('');
+    if (emptyAfterSelect && onFilter && filterText) onFilter('', 'select');
   };
 
   _proto.toInputTriggerCollapse = function toInputTriggerCollapse(text) {

package/css/Select/filter.js

@@ -133,9 +133,13 @@ var _default = function _default(Origin) {
       return result;
     };
 
-    _proto.handleFilter = function handleFilter(text) {
+    _proto.handleFilter = function handleFilter(text, from) {
       var _this3 = this;
 
+      if (from === void 0) {
+        from = 'edit';
+      }
+
       var _this$props5 = this.props,
           filterDelay = _this$props5.filterDelay,
           onFilter = _this$props5.onFilter,
@@ -148,7 +152,7 @@ var _default = function _default(Origin) {
           innerData: undefined
         });
         if (this.timer) clearTimeout(this.timer);
-        if (onFilter) onFilter(text);
+        if (onFilter) onFilter(text, from);
         return;
       }
 
@@ -165,7 +169,7 @@ var _default = function _default(Origin) {
       });
       if (this.timer) clearTimeout(this.timer);
       this.timer = setTimeout(function () {
-        var fn = onFilter(text);
+        var fn = onFilter(text, from);
 
         if (typeof fn === 'function') {
           _this3.setState({

package/css/Select/index.d.ts

@@ -195,7 +195,7 @@ Pick<CommonProps, 'absolute' | 'clearable' | 'zIndex'>
    *
    * default: -
    */
-  onFilter?: (text: string) => (((data: Item) => boolean) | void);
+  onFilter?: (text: string, from: string) => (((data: Item) => boolean) | void);
 
   /**
    * Merges selected values, valid only in multiselect mode

package/css/Table/Td.js

@@ -75,8 +75,10 @@ function (_PureComponent) {
         datum = _this$props3.datum,
         treeColumnsName = _this$props3.treeColumnsName,
         treeCheckAll = _this$props3.treeCheckAll,
-        disabled = _this$props3.disabled;
-    return _react.default.createElement(_Checkbox.default, {
+        disabled = _this$props3.disabled,
+        render = _this$props3.render;
+
+    var checkbox = _react.default.createElement(_Checkbox.default, {
       force: datum.check(data),
       data: data,
       index: index,
@@ -84,6 +86,12 @@ function (_PureComponent) {
       disabled: disabled,
       treeColumnsName: treeCheckAll && treeColumnsName
     });
+
+    if (render && typeof render === 'function') {
+      return render(data, index, checkbox);
+    }
+
+    return checkbox;
   };
 
   _proto.renderExpand = function renderExpand(index) {

package/css/Table/index.d.ts

@@ -3,6 +3,7 @@ import * as React from 'react'
 import { StickyProps } from '../Sticky'
 import { PaginationProps } from '../Pagination'
 import { ListItemStandardProps, StandardProps,  RegularAttributes, keyType } from '../@types/common'
+import { ReactComponentElement } from "react"
 
 
 type ReactNode = React.ReactNode;
@@ -13,11 +14,11 @@ export type ColumnOrder = 'asc' | 'desc'
 
 export type ColumnFix = 'left' | 'right'
 
-export type ColumnType = 'expand' | 'row-expand' | 'checkbox'
+export type ColumnType = 'expand' | 'row-expand'
 
 export interface renderSorterParam  {status?: 'asc' | 'desc', triggerAsc: () => void, triggerDesc: () => void}
 
-export interface ColumnItem<T> {
+interface CommonColumn<T> {
   /**
    * cell align \['left', 'center', 'right'\]
    *
@@ -181,6 +182,16 @@ export interface ColumnItem<T> {
   className?: string;
 }
 
+type SomeColumn<T> =  Omit<CommonColumn<T>, 'render' | 'type'>
+
+export interface CheckColumn<T> extends SomeColumn<T>{
+  type: 'checkbox',
+  render?: (rowData: T, index: number,  checkInstance: ReactComponentElement<any>) => any
+}
+
+export type ColumnItem<T> = CommonColumn<T> | CheckColumn<T>
+
+
 export interface RowEvents {
   [propName: string]: any
 }

package/css/TreeSelect/TreeSelect.js

@@ -101,7 +101,7 @@ function (_PureComponent) {
 
     if (prevState.focus !== this.state.focus && !this.state.focus && onFilter) {
       setTimeout(function () {
-        onFilter('');
+        onFilter('', 'blur');
       }, 400);
     }
   };

package/css/TreeSelect/filter.js

@@ -83,9 +83,13 @@ var _default = function _default(Origin) {
       return result;
     };
 
-    _proto.handleFilter = function handleFilter(text) {
+    _proto.handleFilter = function handleFilter(text, from) {
       var _this3 = this;
 
+      if (from === void 0) {
+        from = 'edit';
+      }
+
       var _this$props2 = this.props,
           filterDelay = _this$props2.filterDelay,
           onFilter = _this$props2.onFilter; // not filter
@@ -97,7 +101,7 @@ var _default = function _default(Origin) {
           innerData: undefined
         });
         if (this.timer) clearTimeout(this.timer);
-        if (onFilter) onFilter(text);
+        if (onFilter) onFilter(text, from);
         return;
       }
 
@@ -107,7 +111,7 @@ var _default = function _default(Origin) {
       });
       if (this.timer) clearTimeout(this.timer);
       this.timer = setTimeout(function () {
-        var fn = onFilter(text);
+        var fn = onFilter(text, from);
 
         if (typeof fn === 'function') {
           _this3.setState({

package/css/TreeSelect/index.d.ts

@@ -178,7 +178,7 @@ export interface TreeSelectProps<Value, Data> extends StandardProps,
    *
    * default: -
    */
-  onFilter?: (text: string) => (data: Data) => boolean;
+  onFilter?: (text: string, from: 'string') => (data: Data) => boolean;
 
   /**
    * In the advanced filter mode, you can switch between the filter results and the original data for the current level by pressing the button
@@ -187,7 +187,7 @@ export interface TreeSelectProps<Value, Data> extends StandardProps,
    *
    * default: -
    */
-  onAdvancedFilter?: (text: string) => (data: Data) => boolean;
+  onAdvancedFilter?: (text: string, form: string) => (data: Data) => boolean;
 
   /**
    * When it is a string, return d[string]. When it is a function, return the result of the function.

package/css/TreeSelect/tiled.js

@@ -99,12 +99,12 @@ var _default = (0, _func.curry)(function (options, Origin) {
       }, _react.default.createElement("span", null));
     };
 
-    _proto.handleFilter = function handleFilter(text) {
+    _proto.handleFilter = function handleFilter(text, from) {
       var onFilter = this.props.onFilter;
       if (!text) this.setState({
         tileds: []
       });
-      if (onFilter) onFilter(text);
+      if (onFilter) onFilter(text, from);
     };
 
     _proto.handleToggle = function handleToggle(key, e) {

package/css/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.4' }
+export default { utils, version: '1.11.0-rc.4' }
 export { utils }
 export { setLocale } from './locale'
 export { color, style } from './utils/expose'

package/css/index.js

@@ -224,6 +224,6 @@ exports.Upload = _Upload.default;
 // Created by scripts/src-index.js.
 var _default = {
   utils: utils,
-  version: '1.10.4'
+  version: '1.11.0-rc.4'
 };
 exports.default = _default;