shineout 3.1.8 → 3.1.9

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.1.8'
+  version: '3.1.9'
 };

package/dist/shineout.js

@@ -11949,7 +11949,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.1.8');
+/* harmony default export */ var version = ('3.1.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -46603,7 +46603,7 @@ var Scroll = function Scroll(props) {
     position: 'sticky'
   }, isRtl ? 'right' : 'left', 0), "top", 0);
   var placeStyle = defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({
-    marginTop: Math.max(0, scrollHeight - height)
+    marginTop: Math.max(0, Math.floor(scrollHeight - height))
   }, "margin".concat(isRtl ? 'Left' : 'Right'), scrollWidth), "height", 0), "width", 0), "overflow", 'hidden');
   var handleScroll = usePersistFn(function (e) {
     var target = e.currentTarget;
@@ -47630,7 +47630,7 @@ var Node = function Node(props) {
   var children = data[childrenKey];
   var hasChildren = children && children.length > 0;
   var contentStyle = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.tree()) || {};
-  var rootClass = classnames_default()(contentStyle.node, isLeaf() && leafClass, isString(nodeClass) && nodeClass, isFunc(nodeClass) && nodeClass(data), defineProperty_default()({}, contentStyle.leaf, !hasChildren));
+  var rootClass = classnames_default()(contentStyle.node, isLeaf() && (isString(leafClass) ? leafClass : isFunc(leafClass) && leafClass(data)), isString(nodeClass) && nodeClass, isFunc(nodeClass) && nodeClass(data), defineProperty_default()({}, contentStyle.leaf, !hasChildren));
   if (placeElement) {
     placeElement.className = contentStyle.placement;
   }
@@ -48125,6 +48125,10 @@ var Tree = function Tree(props) {
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handleUpdateExpanded(expanded);
   }, [expanded]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (!active) return;
+    handleUpdateActive(active);
+  }, [active]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (getDatum) getDatum(datum);
   }, []);
@@ -53833,7 +53837,8 @@ var useTableLayout = function useTableLayout(props) {
     changeColGroup(newCols, false);
   });
   var checkFloat = use_persist_fn(function () {
-    var scrollEl = scrollRef.current;
+    var scrollEl = scrollRef === null || scrollRef === void 0 ? void 0 : scrollRef.current;
+    if (!scrollEl) return;
     var max = scrollEl.scrollWidth - scrollEl.clientWidth;
     var min = 0;
     var left = scrollEl.scrollLeft;
@@ -55442,10 +55447,12 @@ var Tr = function Tr(props) {
 
 
 
+
 var tfoot_isArray = isArray;
 /* harmony default export */ var tfoot = (function (props) {
   var _props$jssStyle, _props$jssStyle$table;
   var tableClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$table = _props$jssStyle.table) === null || _props$jssStyle$table === void 0 ? void 0 : _props$jssStyle$table.call(_props$jssStyle);
+  var config = useConfig();
   var getFixedStyle = function getFixedStyle(fixed, index, colSpan) {
     var colgroup = props.colgroup;
     if (fixed === 'left') {
@@ -55498,9 +55505,10 @@ var tfoot_isArray = isArray;
       }
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)("td", {
+      dir: config.direction,
       colSpan: colSpan,
       style: getFixedStyle(fixed.fixed, index, colSpan),
-      className: classnames_default()(fixed['fixed'] === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), fixed['fixed'] === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), (fixed.lastFixed || fixed.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder)),
+      className: classnames_default()(fixed['fixed'] === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), fixed['fixed'] === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), fixed.firstFixed && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), fixed.lastFixed && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), (fixed.lastFixed || fixed.firstFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), isLast && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder)),
       children: content
     }, index);
   };
@@ -55565,6 +55573,9 @@ var virtualScrollerStyle = {
   overflow: 'auto',
   width: '100%'
 };
+var table_emptyStyle = objectSpread2_default()(objectSpread2_default()({}, virtualScrollerStyle), {}, {
+  height: 0
+});
 var scrollWrapperStyle = {
   flex: 1,
   minHeight: 0,
@@ -55735,6 +55746,18 @@ var emptyRef = {
     e.preventDefault();
     scrollEl.scrollLeft = Math.min(Math.max(scrollLeft, 0), max);
   });
+  var handleBodyScroll = usePersistFn(function (e) {
+    var target = e.currentTarget;
+    if (!target) return;
+    layoutFunc.checkFloat();
+    if (props.onScroll && typeof props.onScroll === 'function') {
+      var maxWidth = target.scrollWidth - target.clientWidth;
+      var maxHeight = target.scrollHeight - target.clientHeight;
+      var x = Math.min(target.scrollLeft / maxWidth, 1);
+      var y = Math.min(target.scrollTop / maxHeight, 1);
+      props.onScroll(x, y, target.scrollLeft);
+    }
+  });
   var handleVirtualScroll = usePersistFn(function (info) {
     virtualInfo.handleScroll(info);
     layoutFunc.checkFloat();
@@ -55753,7 +55776,7 @@ var emptyRef = {
     });
   };
   var renderTable = function renderTable() {
-    var _props$summary, _sticky$top;
+    var _props$summary, _sticky$top, _props$data3, _props$data4;
     var Group = /*#__PURE__*/(0,jsx_runtime.jsx)(table_colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -55826,6 +55849,20 @@ var emptyRef = {
       css: sticky === null || sticky === void 0 ? void 0 : sticky.css,
       parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
     };
+    if (!virtual && !isScrollY && !props.sticky && (_props$data3 = props.data) !== null && _props$data3 !== void 0 && _props$data3.length) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        ref: scrollRef,
+        className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.bodyWrapper,
+        onScroll: handleBodyScroll,
+        children: /*#__PURE__*/(0,jsx_runtime.jsxs)("table", {
+          style: {
+            width: width
+          },
+          ref: tbodyRef,
+          children: [Group, !props.hideHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(thead, objectSpread2_default()({}, headCommonProps)), /*#__PURE__*/(0,jsx_runtime.jsx)(tbody, objectSpread2_default()({}, bodyCommonProps)), /*#__PURE__*/(0,jsx_runtime.jsx)(tfoot, objectSpread2_default()({}, footCommonProps))]
+        })
+      });
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
       children: [!props.hideHeader && /*#__PURE__*/(0,jsx_runtime.jsx)(Wrapper, objectSpread2_default()(objectSpread2_default()({}, props.sticky ? stickyProps : {}), {}, {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -55844,7 +55881,7 @@ var emptyRef = {
         })
       })), /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_scroll, {
         style: scrollWrapperStyle,
-        scrollerStyle: virtualScrollerStyle,
+        scrollerStyle: (_props$data4 = props.data) !== null && _props$data4 !== void 0 && _props$data4.length ? virtualScrollerStyle : table_emptyStyle,
         wrapperRef: scrollRef,
         scrollWidth: width || 1,
         scrollHeight: virtual ? virtualInfo.scrollHeight : tbodyHeight,
@@ -57846,13 +57883,13 @@ var useTreeSelect = function useTreeSelect(props) {
     }
     if (!multiple && isArray(v)) {
       onChange === null || onChange === void 0 || onChange.apply(void 0, [v[0]].concat(reset));
-    }
-    if (multiple && !isArray(v)) {
+    } else if (multiple && !isArray(v)) {
       if (v === undefined || v === null) {
         onChange === null || onChange === void 0 || onChange.apply(void 0, [[]].concat(reset));
       } else onChange === null || onChange === void 0 || onChange.apply(void 0, [[v]].concat(reset));
+    } else {
+      onChange === null || onChange === void 0 || onChange.apply(void 0, [v].concat(reset));
     }
-    onChange === null || onChange === void 0 || onChange.apply(void 0, [v].concat(reset));
   });
   return {
     value: valueArr,
@@ -58014,6 +58051,7 @@ var TreeSelect = function TreeSelect(props0) {
       data: data,
       unmatch: unmatch,
       disabled: disabled,
+      active: multiple ? undefined : value[0],
       childrenKey: childrenKey,
       keygen: keygen,
       onExpand: onExpand,
@@ -58379,7 +58417,7 @@ var TreeSelect = function TreeSelect(props0) {
     } else {
       treeProps.onClick = handleTreeClick;
       treeProps.renderItem = renderActive;
-      treeProps.active = value;
+      treeProps.active = value[0];
     }
     if ('expanded' in props) {
       treeProps.expanded = expanded;
@@ -58400,6 +58438,7 @@ var TreeSelect = function TreeSelect(props0) {
         keygen: keygen,
         unmatch: unmatch,
         value: value,
+        highlight: true,
         loader: loader,
         onExpand: onExpandTree,
         expanded: controlExpanded,
@@ -62037,7 +62076,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.1.8'
+  version: '3.1.9'
 });
 }();
 /******/ 	return __webpack_exports__;