shineout 1.10.3 → 1.11.0-rc.2

package/css/Input/Input.js

@@ -39,7 +39,7 @@ function regLength(size) {
 
 function fillNumber(val) {
   return val.replace(/^(-)?(\.\d+)(?!=\.).*/g, '$10$2') // eslint-disable-next-line no-useless-escape
-  .replace(/(-|^)0+(?=0\.?|[^0\.])/g, '$0').replace(/\.$/, '');
+  .replace(/(-|^)0+(?=0\.?|[^0\.])/g, '$1').replace(/\.$/, '');
 }
 
 var Input =

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/index.d.ts

@@ -1,7 +1,7 @@
 // Created by scripts/src-index.js.
 import * as utils from './utils'
 
-export default { utils, version: '1.10.3' }
+export default { utils, version: '1.11.0-rc.2' }
 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.3'
+  version: '1.11.0-rc.2'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -25024,7 +25024,7 @@ function regLength(size) {
 
 function fillNumber(val) {
   return val.replace(/^(-)?(\.\d+)(?!=\.).*/g, '$10$2') // eslint-disable-next-line no-useless-escape
-  .replace(/(-|^)0+(?=0\.?|[^0\.])/g, '$0').replace(/\.$/, '');
+  .replace(/(-|^)0+(?=0\.?|[^0\.])/g, '$1').replace(/\.$/, '');
 }
 
 var Input =
@@ -37816,7 +37816,7 @@ function (_PureComponent) {
 
       if (prevState.focus !== this.state.focus && !this.state.focus && onFilter) {
         setTimeout(function () {
-          onFilter('');
+          onFilter('', 'blur');
         }, 400);
       }
     }
@@ -37996,7 +37996,7 @@ function (_PureComponent) {
         }, 10);
       }
 
-      if (emptyAfterSelect && onFilter && filterText) onFilter('');
+      if (emptyAfterSelect && onFilter && filterText) onFilter('', 'select');
     }
   }, {
     key: "toInputTriggerCollapse",
@@ -38693,6 +38693,7 @@ function _createSuper2(Derived) {
       value: function handleFilter(text) {
         var _this3 = this;
 
+        var from = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'edit';
         var _this$props5 = this.props,
             filterDelay = _this$props5.filterDelay,
             onFilter = _this$props5.onFilter,
@@ -38705,7 +38706,7 @@ function _createSuper2(Derived) {
             innerData: undefined
           });
           if (this.timer) clearTimeout(this.timer);
-          if (onFilter) onFilter(text);
+          if (onFilter) onFilter(text, from);
           return;
         }
 
@@ -38722,7 +38723,7 @@ function _createSuper2(Derived) {
         });
         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({
@@ -44506,24 +44507,30 @@ function (_PureComponent) {
           datum = _this$props3.datum,
           treeColumnsName = _this$props3.treeColumnsName,
           treeCheckAll = _this$props3.treeCheckAll,
-          disabled = _this$props3.disabled;
-      return (
-        /*#__PURE__*/
-        react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_Checkbox__WEBPACK_IMPORTED_MODULE_10__["default"], {
-          force: datum.check(data),
-          data: data,
-          index: index,
-          datum: datum,
-          disabled: disabled,
-          treeColumnsName: treeCheckAll && treeColumnsName,
-          __self: this,
-          __source: {
-            fileName: _jsxFileName,
-            lineNumber: 35,
-            columnNumber: 7
-          }
-        })
-      );
+          disabled = _this$props3.disabled,
+          render = _this$props3.render;
+      var checkbox =
+      /*#__PURE__*/
+      react__WEBPACK_IMPORTED_MODULE_6___default.a.createElement(_Checkbox__WEBPACK_IMPORTED_MODULE_10__["default"], {
+        force: datum.check(data),
+        data: data,
+        index: index,
+        datum: datum,
+        disabled: disabled,
+        treeColumnsName: treeCheckAll && treeColumnsName,
+        __self: this,
+        __source: {
+          fileName: _jsxFileName,
+          lineNumber: 35,
+          columnNumber: 7
+        }
+      });
+
+      if (render && typeof render === 'function') {
+        return render(data, index, checkbox);
+      }
+
+      return checkbox;
     }
   }, {
     key: "renderExpand",
@@ -44553,7 +44560,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 59,
+            lineNumber: 63,
             columnNumber: 7
           }
         })
@@ -44586,7 +44593,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 81,
+              lineNumber: 85,
               columnNumber: 9
             }
           }, content)
@@ -44603,7 +44610,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 87,
+            lineNumber: 91,
             columnNumber: 7
           }
         },
@@ -44615,7 +44622,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 88,
+            lineNumber: 92,
             columnNumber: 9
           }
         }), content)
@@ -44677,7 +44684,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 135,
+            lineNumber: 139,
             columnNumber: 7
           }
         }, this.renderContent())
@@ -61288,7 +61295,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.3'
+  version: '1.11.0-rc.2'
 });