shineout 3.4.4-beta.7 → 3.5.0-beta.2

package/cjs/index.js

@@ -492,5 +492,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.4.4-beta.7'
+  version: '3.5.0-beta.2'
 };

package/dist/shineout.js

@@ -11984,7 +11984,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.4.4-beta.7');
+/* harmony default export */ var version = ('3.5.0-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30071,22 +30071,23 @@ var getPopoverPosition = function getPopoverPosition(target) {
     var popupRect = popup === null || popup === void 0 ? void 0 : popup.getBoundingClientRect();
     if (verticalPoint > windowHeight / 2) position = 'top';else position = 'bottom';
 
+    // TODO: 暂时移除，另考虑方案
     // 如果渲染了弹出内容，则根据弹出内容宽度计算是否自动调整位置
-    if (popupRect) {
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > rect.left) {
-        position += '-left';
-      }
-      if ((popupRect === null || popupRect === void 0 ? void 0 : popupRect.width) / 2 > windowWidth - rect.right) {
-        position += '-right';
-      }
-    } else {
-      // 兜底计算
-      if (horizontalPoint > windowWidth * 0.6) {
-        position += '-right';
-      } else if (horizontalPoint < windowWidth * 0.4) {
-        position += '-left';
-      }
+    // if (popupRect && popupRect?.width) {
+    //   if (popupRect?.width / 2 > rect.left) {
+    //     position += '-left';
+    //   }
+    //   if (popupRect?.width / 2 > windowWidth - rect.right) {
+    //     position += '-right';
+    //   }
+    // } else {
+    // 兜底计算
+    if (horizontalPoint > windowWidth * 0.6) {
+      position += '-right';
+    } else if (horizontalPoint < windowWidth * 0.4) {
+      position += '-left';
     }
+    // }
   }
   return position;
 };
@@ -44321,7 +44322,7 @@ var Modal = function Modal(props) {
     }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.header,
-      onMouseDown: props.moveable ? moveInfo.handleMouseDown : undefined,
+      onMouseDown: props.moveable && !props.fullScreen ? moveInfo.handleMouseDown : undefined,
       children: [renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerTitle,
         children: props.title
@@ -44387,7 +44388,7 @@ var Modal = function Modal(props) {
     panelStyle.top = undefined;
     panelStyle.width = undefined;
   }
-  if (props.moveable) {
+  if (props.moveable && !props.fullScreen) {
     panelStyle.transform = "translate(".concat(moveInfo.pos.x, "px, ").concat(moveInfo.pos.y, "px)");
   }
   return /*#__PURE__*/(0,jsx_runtime.jsx)(FormFooterProvider, {
@@ -57260,6 +57261,33 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  var scrollColumnByLeft = usePersistFn(function (targetLeft) {
+    if (targetLeft < 0) return;
+    var scrollEl = props.scrollRef.current;
+    if (!scrollEl) return;
+    // scrollLeft max
+    var max = scrollEl.scrollWidth - scrollEl.clientWidth;
+    var left = Math.min(targetLeft, max);
+    if (left === scrollEl.scrollLeft) return;
+    setLeft(left);
+    scrollEl.scrollLeft = left;
+  });
+  var scrollColumnIntoView = usePersistFn(function (colKey) {
+    if (colKey === undefined) return;
+    var col = props.columns.find(function (col) {
+      return col.key === colKey;
+    });
+    if (!col || col.fixed) return;
+    var left = 0;
+    for (var i = 0, len = col.index; i < len; i++) {
+      if (props.columns[i].fixed) {
+        left = 0;
+      } else {
+        left += props.colgroup[i];
+      }
+    }
+    scrollColumnByLeft(left);
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     var scrollRefHeight = props.scrollRef.current ? props.scrollRef.current.clientHeight : 0;
     var tableRefHeight = props.innerRef.current ? props.innerRef.current.clientHeight : 0;
@@ -57323,7 +57351,9 @@ var useTableVirtual = function useTableVirtual(props) {
     handleScroll: handleScroll,
     setRowHeight: setRowHeight,
     getTranslate: getTranslate,
-    scrollToIndex: scrollToIndex
+    scrollToIndex: scrollToIndex,
+    scrollColumnByLeft: scrollColumnByLeft,
+    scrollColumnIntoView: scrollColumnIntoView
   };
 };
 /* harmony default export */ var use_table_virtual = (useTableVirtual);
@@ -58721,6 +58751,7 @@ var emptyRef = {
     disabled: !virtual,
     data: treeData,
     columns: columns,
+    colgroup: colgroup,
     rowsInView: props.rowsInView || 20,
     rowHeight: props.rowHeight || 40,
     scrollRef: scrollRef,
@@ -59012,7 +59043,9 @@ var emptyRef = {
   };
   var tableFunc = useLatestObj({
     scrollToIndex: virtualInfo.scrollToIndex,
-    getRenderIndexByData: getRenderIndexByData
+    getRenderIndexByData: getRenderIndexByData,
+    scrollColumnIntoView: virtualInfo.scrollColumnIntoView,
+    scrollColumnByLeft: virtualInfo.scrollColumnByLeft
   });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.tableRef) {
@@ -65234,7 +65267,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.4-beta.7'
+  version: '3.5.0-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;