shineout 2.0.5-beta.4 → 2.0.5-beta.6

package/css/Cascader/Props.d.ts

@@ -307,6 +307,7 @@ export interface ResultItemProps<DataItem> {
     singleRemove?: boolean;
     click: (data: DataItem, isPopover: boolean) => void;
     only: boolean;
+    isDisabled: boolean;
 }
 /** ------ CascaderProps ------ * */
 declare type CascaderPropsWithTableConsumber<Item, Value extends CascaderBaseValue> = GetTableConsumerProps<OriginCascaderProps<Item, Value>>;

package/css/Cascader/Result.js

@@ -55,7 +55,8 @@ function Item(_ref) {
       isPopover = _ref.isPopover,
       singleRemove = _ref.singleRemove,
       click = _ref.click,
-      only = _ref.only;
+      only = _ref.only,
+      isDisabled = _ref.isDisabled;
   var onClose = close ? function (e) {
     close(data, isPopover, e);
   } : undefined;
@@ -64,9 +65,9 @@ function Item(_ref) {
   } : undefined;
   return _react.default.createElement("a", {
     tabIndex: -1,
-    className: (0, _classnames.default)((0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('item'), only && 'item-only'), className),
+    className: (0, _classnames.default)((0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('item'), only && 'item-only', isDisabled && 'item-disabled'), className),
     onClick: onClick
-  }, children, singleRemove && _react.default.createElement("span", {
+  }, children, singleRemove && !isDisabled && _react.default.createElement("span", {
     className: (0, _styles3.cascaderClass)((0, _classname.getDirectionClass)('single-remove')),
     onClick: onClose
   }, _icons.default.Close));
@@ -278,6 +279,7 @@ function (_PureComponent) {
       singleRemove: singleRemove,
       close: this.removeTargetNode,
       isPopover: true,
+      isDisabled: datum.isDisabled(datum.getKey(data)),
       click: this.handleNodeClick
     }), res);
   };

package/css/Cascader/styles/cascader.css

@@ -126,6 +126,10 @@
   font-size: var(--font-size-base, 14px);
   color: var(--gray-700, #495057);
 }
+.so-cascader-result .so-cascader-item-disabled {
+  cursor: not-allowed;
+  color: var(--input-disabled-color, #999DA8);
+}
 .so-cascader-result .so-cascader-input {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;
@@ -246,7 +250,7 @@ div.so-cascader-options {
 }
 .so-input-rtl .so-cascader-no-data,
 .so-list-rtl .so-cascader-no-data {
-  padding: 6px 12px 6px 12px 12;
+  padding: 6px 12px 6px 24px;
 }
 .so-cascader-no-data:hover {
   color: var(--select-item-active-color, #292d32);

package/css/Table/Props.d.ts

@@ -363,7 +363,7 @@ export declare type ColumnItemWithFixed<DataItem> = ColumnItem<DataItem> & {
     index: number;
 };
 /** ------ td ---------- */
-export interface TdProps<DataItem, Value> extends Pick<TrProps<DataItem, Value>, 'originKey' | 'resetFixAuto' | 'onExpand' | 'onTreeExpand' | 'datum' | 'treeColumnsName' | 'treeCheckAll' | 'disabled' | 'treeRoot' | 'treeExpandLevel' | 'treeIndent' | 'treeEmptyExpand'>, Row<DataItem> {
+export interface TdProps<DataItem, Value> extends Pick<TrProps<DataItem, Value>, 'originKey' | 'resetFixAuto' | 'onExpand' | 'onTreeExpand' | 'datum' | 'treeColumnsName' | 'treeCheckAll' | 'disabled' | 'treeRoot' | 'treeExpandLevel' | 'treeIndent' | 'treeEmptyExpand' | 'offsetLeft' | 'offsetRight'>, Row<DataItem> {
     render?: ColumnItem<DataItem>['render'];
     align?: RegularAttributes.Align;
     lastFixed?: boolean;

package/css/Table/Td.js

@@ -7,6 +7,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 exports.__esModule = true;
 exports.default = exports.CLASS_FIXED_RIGHT = exports.CLASS_FIXED_LEFT = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
 var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
 
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -21,6 +23,8 @@ var _styles = require("./styles");
 
 var _Checkbox = _interopRequireDefault(require("./Checkbox"));
 
+var _translate = require("../utils/dom/translate");
+
 var CLASS_FIXED_LEFT = 'fixed-left';
 exports.CLASS_FIXED_LEFT = CLASS_FIXED_LEFT;
 var CLASS_FIXED_RIGHT = 'fixed-right';
@@ -194,15 +198,28 @@ function (_PureComponent) {
         rowSpan = _this$props8.rowSpan,
         colSpan = _this$props8.colSpan,
         fixed = _this$props8.fixed,
-        style = _this$props8.style,
+        _this$props8$style = _this$props8.style,
+        style = _this$props8$style === void 0 ? {} : _this$props8$style,
         firstFixed = _this$props8.firstFixed,
         lastFixed = _this$props8.lastFixed,
         type = _this$props8.type,
         align = _this$props8.align,
-        ignoreBorderRight = _this$props8.ignoreBorderRight;
+        ignoreBorderRight = _this$props8.ignoreBorderRight,
+        offsetLeft = _this$props8.offsetLeft,
+        offsetRight = _this$props8.offsetRight;
     var className = (0, _classnames.default)(this.props.className, (0, _styles.tableClass)(fixed === 'left' && CLASS_FIXED_LEFT, fixed === 'right' && CLASS_FIXED_RIGHT, firstFixed && 'fixed-first', lastFixed && 'fixed-last', (type === 'checkbox' || type === 'expand' || type === 'row-expand') && 'checkbox', align !== 'left' && "align-" + align, ignoreBorderRight && 'ignore-right-border'));
+    var newStyle = (0, _objectSpread2.default)({}, style);
+
+    if (fixed === 'left' && offsetLeft) {
+      newStyle.transform = "translateX(" + (0, _translate.getDirectionX)(offsetLeft + "px") + ")";
+    }
+
+    if (fixed === 'right' && offsetRight) {
+      newStyle.transform = "translateX(" + (0, _translate.getDirectionX)("-" + offsetRight + "px") + ")";
+    }
+
     return _react.default.createElement("td", {
-      style: style,
+      style: newStyle,
       className: className,
       rowSpan: rowSpan,
       colSpan: colSpan

package/css/Table/Tr.js

@@ -23,15 +23,13 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _translate = require("../utils/dom/translate");
-
 var _styles = require("./styles");
 
 var _styles2 = require("../Input/styles");
 
 var _styles3 = require("../Checkbox/styles");
 
-var _Td = _interopRequireWildcard(require("./Td"));
+var _Td = _interopRequireDefault(require("./Td"));
 
 var _Expand = _interopRequireDefault(require("./Expand"));
 
@@ -86,24 +84,6 @@ function (_Component) {
   var _proto = Tr.prototype;
 
   _proto.componentDidMount = function componentDidMount() {
-    var _this$props = this.props,
-        offsetLeft = _this$props.offsetLeft,
-        offsetRight = _this$props.offsetRight;
-
-    if (offsetLeft) {
-      ;
-      [].forEach.call(this.element.querySelectorAll("." + (0, _styles.tableClass)(_Td.CLASS_FIXED_LEFT)), function (td) {
-        (0, _translate.setTranslate)(td, offsetLeft + "px", '0');
-      });
-    }
-
-    if (offsetRight) {
-      ;
-      [].forEach.call(this.element.querySelectorAll("." + (0, _styles.tableClass)(_Td.CLASS_FIXED_RIGHT)), function (td) {
-        (0, _translate.setTranslate)(td, "-" + offsetRight + "px", '0');
-      });
-    }
-
     this.manualExpand = true;
     this.setRowHeight();
   };
@@ -111,11 +91,11 @@ function (_Component) {
   _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
     var _this2 = this;
 
-    var _this$props2 = this.props,
-        hasNotRenderRows = _this$props2.hasNotRenderRows,
-        dataUpdated = _this$props2.dataUpdated,
-        columnResizable = _this$props2.columnResizable,
-        resize = _this$props2.resize;
+    var _this$props = this.props,
+        hasNotRenderRows = _this$props.hasNotRenderRows,
+        dataUpdated = _this$props.dataUpdated,
+        columnResizable = _this$props.columnResizable,
+        resize = _this$props.resize;
 
     if (hasNotRenderRows || dataUpdated || prevProps.resize !== resize) {
       var exec = columnResizable ? setTimeout : function (func) {
@@ -128,11 +108,11 @@ function (_Component) {
   };
 
   _proto.setRowHeight = function setRowHeight(expand) {
-    var _this$props3 = this.props,
-        setRowHeight = _this$props3.setRowHeight,
-        dataUpdated = _this$props3.dataUpdated,
-        datum = _this$props3.datum,
-        lazy = _this$props3.lazy;
+    var _this$props2 = this.props,
+        setRowHeight = _this$props2.setRowHeight,
+        dataUpdated = _this$props2.dataUpdated,
+        datum = _this$props2.datum,
+        lazy = _this$props2.lazy;
     if (!lazy || !setRowHeight || !this.element) return;
 
     var _this$element$getBoun = this.element.getBoundingClientRect(),
@@ -184,16 +164,16 @@ function (_Component) {
   };
 
   _proto.handleRowClick = function handleRowClick(e) {
-    var _this$props4 = this.props,
-        columns = _this$props4.columns,
-        rowData = _this$props4.rowData,
-        index = _this$props4.index,
-        onRowClick = _this$props4.onRowClick,
-        externalExpandRender = _this$props4.externalExpandRender,
-        externalExpandClick = _this$props4.externalExpandClick,
-        onExpand = _this$props4.onExpand,
-        originKey = _this$props4.originKey,
-        expandRender = _this$props4.expandRender;
+    var _this$props3 = this.props,
+        columns = _this$props3.columns,
+        rowData = _this$props3.rowData,
+        index = _this$props3.index,
+        onRowClick = _this$props3.onRowClick,
+        externalExpandRender = _this$props3.externalExpandRender,
+        externalExpandClick = _this$props3.externalExpandClick,
+        onExpand = _this$props3.onExpand,
+        originKey = _this$props3.originKey,
+        expandRender = _this$props3.expandRender;
     var target = e.target; // business needed #row click to modal drawer
 
     var fireAttr = this.isFireElement(target);
@@ -224,9 +204,9 @@ function (_Component) {
   };
 
   _proto.renderExpand = function renderExpand() {
-    var _this$props5 = this.props,
-        expandRender = _this$props5.expandRender,
-        rowData = _this$props5.rowData;
+    var _this$props4 = this.props,
+        expandRender = _this$props4.expandRender,
+        rowData = _this$props4.rowData;
     if (!expandRender) return null;
 
     if (this.lastExpandRender !== expandRender && (0, _is.isFunc)(expandRender)) {
@@ -238,20 +218,20 @@ function (_Component) {
   };
 
   _proto.render = function render() {
-    var _this$props6 = this.props,
-        columns = _this$props6.columns,
-        data = _this$props6.data,
-        rowData = _this$props6.rowData,
-        striped = _this$props6.striped,
-        index = _this$props6.index,
-        expandRender = _this$props6.expandRender,
-        offsetLeft = _this$props6.offsetLeft,
-        offsetRight = _this$props6.offsetRight,
-        hasNotRenderRows = _this$props6.hasNotRenderRows,
-        rowClassName = _this$props6.rowClassName,
-        treeExpandKeys = _this$props6.treeExpandKeys,
-        rowEvents = _this$props6.rowEvents,
-        reset = (0, _objectWithoutPropertiesLoose2.default)(_this$props6, ["columns", "data", "rowData", "striped", "index", "expandRender", "offsetLeft", "offsetRight", "hasNotRenderRows", "rowClassName", "treeExpandKeys", "rowEvents"]);
+    var _this$props5 = this.props,
+        columns = _this$props5.columns,
+        data = _this$props5.data,
+        rowData = _this$props5.rowData,
+        striped = _this$props5.striped,
+        index = _this$props5.index,
+        expandRender = _this$props5.expandRender,
+        offsetLeft = _this$props5.offsetLeft,
+        offsetRight = _this$props5.offsetRight,
+        hasNotRenderRows = _this$props5.hasNotRenderRows,
+        rowClassName = _this$props5.rowClassName,
+        treeExpandKeys = _this$props5.treeExpandKeys,
+        rowEvents = _this$props5.rowEvents,
+        reset = (0, _objectWithoutPropertiesLoose2.default)(_this$props5, ["columns", "data", "rowData", "striped", "index", "expandRender", "offsetLeft", "offsetRight", "hasNotRenderRows", "rowClassName", "treeExpandKeys", "rowEvents"]);
     var other = Object.keys(reset).filter(function (key) {
       return !['format', 'prediction', 'onChange'].includes(key);
     }).reduce(function (r, key) {
@@ -300,7 +280,10 @@ function (_Component) {
           render: render // @ts-ignore  这儿重复了
           ,
           index: index
-        }, data[i]));
+        }, data[i], {
+          offsetLeft: offsetLeft,
+          offsetRight: offsetRight
+        }));
 
         tds.push(td);
         if (data[i].colSpan) skip = data[i].colSpan - 1;

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.5-beta.4'
+  version: '2.0.5-beta.6'
 };
 exports.default = _default;

package/css/utils/dom/translate.d.ts

@@ -1,2 +1,3 @@
+export declare const getDirectionX: (xs: string) => string;
 export declare function setTranslate(el: HTMLElement, x: string, y: string): void;
 export declare function setTranslate3D(el: HTMLElement, x: string, y: string): void;

package/css/utils/dom/translate.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.setTranslate = setTranslate;
 exports.setTranslate3D = setTranslate3D;
+exports.getDirectionX = void 0;
 
 var _detect = require("./detect");
 
@@ -19,6 +20,8 @@ var getDirectionX = function getDirectionX(xs) {
   return result;
 };
 
+exports.getDirectionX = getDirectionX;
+
 function setTranslate(el, x, y) {
   var tn = (0, _detect.getTransformName)();
   el.style[tn] = "translate(" + getDirectionX(x) + "," + y + ")";