shineout 1.10.2 → 1.11.0-rc.1

package/css/Cascader/styles/cascader.css

@@ -28,7 +28,7 @@
 .so-cascader-result .so-input-placeholder {
   color: var(--input-placeholder-color, #999);
 }
-.so-cascader-result span,
+.so-cascader-result > span,
 .so-cascader-result .so-cascader-item {
   display: inline-block;
   overflow: hidden;
@@ -40,21 +40,21 @@
   text-overflow: ellipsis;
   position: relative;
 }
-.so-cascader-result span:not(.so-input-rtl *),
+.so-cascader-result > span:not(.so-input-rtl *),
 .so-cascader-result .so-cascader-item:not(.so-input-rtl *) {
   margin-right: var(--select-result-padding-horizontal, 4px);
 }
-.so-input-rtl .so-cascader-result span,
+.so-input-rtl .so-cascader-result > span,
 .so-input-rtl .so-cascader-result .so-cascader-item {
   margin-left: var(--select-result-padding-horizontal, 4px);
 }
-.so-cascader-result span-compressed,
+.so-cascader-result > span-compressed,
 .so-cascader-result .so-cascader-item-compressed {
   padding: 0 8px;
   font-size: 80%;
   opacity: 0.9;
 }
-.so-cascader-result span-compressed > span,
+.so-cascader-result > span-compressed > span,
 .so-cascader-result .so-cascader-item-compressed > span {
   letter-spacing: 2px;
   padding: 0;
@@ -62,23 +62,23 @@
   overflow: visible;
   max-width: none;
 }
-.so-cascader-result span:after,
+.so-cascader-result > span:after,
 .so-cascader-result .so-cascader-item:after {
   content: '\feff ';
 }
-.so-cascader-result span.so-cascader-remove-container:not(.so-input-rtl *),
+.so-cascader-result > span.so-cascader-remove-container:not(.so-input-rtl *),
 .so-cascader-result .so-cascader-item.so-cascader-remove-container:not(.so-input-rtl *) {
   padding-right: 16px;
 }
-.so-input-rtl .so-cascader-result span.so-cascader-remove-container,
+.so-input-rtl .so-cascader-result > span.so-cascader-remove-container,
 .so-input-rtl .so-cascader-result .so-cascader-item.so-cascader-remove-container {
   padding-left: 16px;
 }
-.so-cascader-result span.so-cascader-remove-container:after,
+.so-cascader-result > span.so-cascader-remove-container:after,
 .so-cascader-result .so-cascader-item.so-cascader-remove-container:after {
   content: none;
 }
-.so-cascader-result span .so-cascader-single-remove,
+.so-cascader-result > span .so-cascader-single-remove,
 .so-cascader-result .so-cascader-item .so-cascader-single-remove {
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
@@ -87,21 +87,21 @@
   margin: 0;
   padding: 0;
 }
-.so-cascader-result span .so-cascader-single-remove:not(.so-input-rtl *),
+.so-cascader-result > span .so-cascader-single-remove:not(.so-input-rtl *),
 .so-cascader-result .so-cascader-item .so-cascader-single-remove:not(.so-input-rtl *) {
   right: 8px;
   -webkit-transform: translate(50%, -50%);
       -ms-transform: translate(50%, -50%);
           transform: translate(50%, -50%);
 }
-.so-input-rtl .so-cascader-result span .so-cascader-single-remove,
+.so-input-rtl .so-cascader-result > span .so-cascader-single-remove,
 .so-input-rtl .so-cascader-result .so-cascader-item .so-cascader-single-remove {
   left: 8px;
   -webkit-transform: translate(-50%, -50%);
       -ms-transform: translate(-50%, -50%);
           transform: translate(-50%, -50%);
 }
-.so-cascader-result span .so-cascader-single-remove svg,
+.so-cascader-result > span .so-cascader-single-remove svg,
 .so-cascader-result .so-cascader-item .so-cascader-single-remove svg {
   width: 6px;
   height: 6px;
@@ -109,13 +109,13 @@
       -ms-transform: translateY(-1px);
           transform: translateY(-1px);
 }
-.so-cascader-result span .so-cascader-single-remove svg path,
+.so-cascader-result > span .so-cascader-single-remove svg path,
 .so-cascader-result .so-cascader-item .so-cascader-single-remove svg path {
   -webkit-transition: all 0.2s;
   transition: all 0.2s;
   fill: var(--gray-500, #adb5bd);
 }
-.so-cascader-result span .so-cascader-single-remove:hover svg path,
+.so-cascader-result > span .so-cascader-single-remove:hover svg path,
 .so-cascader-result .so-cascader-item .so-cascader-single-remove:hover svg path {
   fill: var(--primary-color, #3399ff);
 }

package/css/DatePicker/Day.js

@@ -221,8 +221,8 @@ function (_PureComponent) {
     return _react.default.createElement("div", (0, _extends2.default)({
       key: date.getTime(),
       className: hoverClass,
-      onClick: isDisabled ? undefined : this.handleDayClick.bind(this, date),
-      onDoubleClick: isDisabled ? undefined : this.handleDayDoubleClick.bind(this, date)
+      onClick: isDisabled ? undefined : this.handleDayClick.bind(this, date, undefined),
+      onDoubleClick: isDisabled ? undefined : this.handleDayDoubleClick.bind(this, date, undefined)
     }, hoverProps), _react.default.createElement("span", {
       className: _styles.datepickerClass.apply(void 0, classList)
     }, date.getDate()));

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/Table/Tbody.js

@@ -57,7 +57,7 @@ function format(columns, data, nextRow, index, expandKeys) {
     if (cell.colSpan < 1) cell.colSpan = 1;
     var rowSpan = col.rowSpan;
 
-    if (rowSpan && nextRow) {
+    if (rowSpan && nextRow && nextRow[i]) {
       if (col.type !== 'checkbox') {
         cell.content = typeof col.render === 'string' ? data[col.render] : col.render(data, index);
       }

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.2' }
+export default { utils, version: '1.11.0-rc.1' }
 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.2'
+  version: '1.11.0-rc.1'
 };
 exports.default = _default;

package/css/utils/dom/element.js

@@ -174,8 +174,17 @@ var focusElement = {
 };
 exports.focusElement = focusElement;
 
-var preventPasteFile = function preventPasteFile(e, beforeHandler) {
-  var text = (e.clipboardData || window.clipboardData).getData('text/plain');
+var preventPasteFile = function preventPasteFile(e, beforeHandler, noLineBreak) {
+  if (noLineBreak === void 0) {
+    noLineBreak = true;
+  }
+
+  var text = (e.clipboardData || window.clipboardData).getData('text/plain'); // 删除复制的换行符号
+
+  if (noLineBreak && text) {
+    text = text.replace(/[\t\n\f\r\v]/g, '');
+  }
+
   e.preventDefault();
 
   if (beforeHandler) {

package/dist/shineout.js

@@ -13446,8 +13446,8 @@ function (_PureComponent) {
         react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", Object.assign({
           key: date.getTime(),
           className: hoverClass,
-          onClick: isDisabled ? undefined : this.handleDayClick.bind(this, date),
-          onDoubleClick: isDisabled ? undefined : this.handleDayDoubleClick.bind(this, date)
+          onClick: isDisabled ? undefined : this.handleDayClick.bind(this, date, undefined),
+          onDoubleClick: isDisabled ? undefined : this.handleDayDoubleClick.bind(this, date, undefined)
         }, hoverProps, {
           __self: this,
           __source: {
@@ -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 =
@@ -44007,7 +44007,7 @@ function format(columns, data, nextRow, index, expandKeys) {
     if (cell.colSpan < 1) cell.colSpan = 1;
     var rowSpan = col.rowSpan;
 
-    if (rowSpan && nextRow) {
+    if (rowSpan && nextRow && nextRow[i]) {
       if (col.type !== 'checkbox') {
         cell.content = typeof col.render === 'string' ? data[col.render] : col.render(data, index);
       }
@@ -44506,24 +44506,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 +44559,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 59,
+            lineNumber: 63,
             columnNumber: 7
           }
         })
@@ -44586,7 +44592,7 @@ function (_PureComponent) {
             __self: this,
             __source: {
               fileName: _jsxFileName,
-              lineNumber: 81,
+              lineNumber: 85,
               columnNumber: 9
             }
           }, content)
@@ -44603,7 +44609,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 87,
+            lineNumber: 91,
             columnNumber: 7
           }
         },
@@ -44615,7 +44621,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 88,
+            lineNumber: 92,
             columnNumber: 9
           }
         }), content)
@@ -44677,7 +44683,7 @@ function (_PureComponent) {
           __self: this,
           __source: {
             fileName: _jsxFileName,
-            lineNumber: 135,
+            lineNumber: 139,
             columnNumber: 7
           }
         }, this.renderContent())
@@ -61288,7 +61294,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   utils: _utils__WEBPACK_IMPORTED_MODULE_0__,
-  version: '1.10.2'
+  version: '1.11.0-rc.1'
 });
 
 
@@ -62649,7 +62655,13 @@ var focusElement = {
   copyBoundingClientRect: copyBoundingClientRect
 };
 var preventPasteFile = function preventPasteFile(e, beforeHandler) {
-  var text = (e.clipboardData || window.clipboardData).getData('text/plain');
+  var noLineBreak = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var text = (e.clipboardData || window.clipboardData).getData('text/plain'); // 删除复制的换行符号
+
+  if (noLineBreak && text) {
+    text = text.replace(/[\t\n\f\r\v]/g, '');
+  }
+
   e.preventDefault();
 
   if (beforeHandler) {