shineout 3.9.17-beta.2 → 3.9.17-beta.4

package/cjs/index.js

@@ -529,5 +529,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.9.17-beta.2'
+  version: '3.9.17-beta.4'
 };

package/cjs/upload/image.js

@@ -31,8 +31,15 @@ var BaseUploadImage = function BaseUploadImage(props) {
 };
 BaseUploadImage.displayName = 'ShineoutUploadImage';
 var _default = exports.default = function _default(props) {
+  var _props$htmlName;
   var customProps = (0, _useUploadCommon.default)({
     rules: props.rules
   });
-  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), customProps), BaseUploadImage);
+
+  // 同 upload.tsx：useFieldCommon 会把 name 从子组件 props 中移除，
+  // 提前将其作为 htmlName 的 fallback 保存，以兼容 v2 中 name 作为 FormData 键名的行为。
+  var htmlName = (_props$htmlName = props.htmlName) !== null && _props$htmlName !== void 0 ? _props$htmlName : typeof props.name === 'string' ? props.name : undefined;
+  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), {}, {
+    htmlName: htmlName
+  }, customProps), BaseUploadImage);
 };

package/cjs/upload/upload.js

@@ -31,8 +31,16 @@ var BaseUpload = function BaseUpload(props) {
 };
 BaseUpload.displayName = 'ShineoutUpload';
 var _default = exports.default = function _default(props) {
+  var _props$htmlName;
   var customProps = (0, _useUploadCommon.default)({
     rules: props.rules
   });
-  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), customProps), BaseUpload, 'array');
+
+  // useFieldCommon 会把 name 从转发给子组件的 props 中移除（name 被用作 Form 字段 key）。
+  // 但 Upload 的 name 在 v2 中同时作为 FormData 的键名，为了兼容 v2 行为，
+  // 在 name 被移除之前将其作为 htmlName 的 fallback 保存下来。
+  var htmlName = (_props$htmlName = props.htmlName) !== null && _props$htmlName !== void 0 ? _props$htmlName : typeof props.name === 'string' ? props.name : undefined;
+  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), {}, {
+    htmlName: htmlName
+  }, customProps), BaseUpload, 'array');
 };

package/dist/shineout.js

@@ -12327,7 +12327,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.9.17-beta.2');
+/* harmony default export */ var version = ('3.9.17-beta.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -33648,6 +33648,12 @@ var AbsoluteList = function AbsoluteList(props) {
   return styledChild;
 };
 /* harmony default export */ var absolute_list = (AbsoluteList);
+;// CONCATENATED MODULE: ../base/src/common/arrow.ts
+// 弹出层箭头定位常量
+// 垂直方向（bottom-left/top-right 等）：箭头不旋转，中心 = 内边距(8) + 半宽(8) = 16px
+var arrowHCenterOffset = 16;
+// 水平方向（left-top/right-bottom 等）：箭头旋转 90°，中心 = 内边距(8) + 半高(4) = 12px
+var arrowVCenterOffset = 12;
 ;// CONCATENATED MODULE: ../base/src/popover/popover.tsx
 
 
@@ -33658,6 +33664,7 @@ var AbsoluteList = function AbsoluteList(props) {
 
 
 
+
 var emptyEvent = function emptyEvent(e) {
   return e.stopPropagation();
 };
@@ -33678,7 +33685,9 @@ var Popover = function Popover(props) {
     _props$showArrow = props.showArrow,
     showArrow = _props$showArrow === void 0 ? true : _props$showArrow,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 1060 : _props$zIndex;
+    zIndex = _props$zIndex === void 0 ? 1060 : _props$zIndex,
+    _props$pointAtCenter = props.pointAtCenter,
+    pointAtCenter = _props$pointAtCenter === void 0 ? false : _props$pointAtCenter;
   var _React$useRef = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useRef({
       rendered: false,
       hasOpened: false
@@ -33729,6 +33738,25 @@ var Popover = function Popover(props) {
     contentStyle = _React$useState4[0],
     setContentStyle = _React$useState4[1];
   var events = getTargetProps();
+
+  // 计算 pointAtCenter 的偏移量，使箭头指向触发元素的中心，并与用户传入的 offset 合并
+  var mergedOffset = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _targetRef$current, _userOffset$, _userOffset$2;
+    var userOffset = props.offset;
+    if (!pointAtCenter) return userOffset;
+    var rect = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.getBoundingClientRect();
+    if (!rect) return userOffset;
+    var centerOffsetX = 0;
+    var centerOffsetY = 0;
+    // 垂直方向的非居中位置：bottom-left, bottom-right, top-left, top-right
+    if (/^(top|bottom)-(left|right)$/.test(position)) {
+      centerOffsetX = arrowHCenterOffset - rect.width / 2;
+      // 水平方向的非居中位置：left-top, left-bottom, right-top, right-bottom
+    } else if (/^(left|right)-(top|bottom)$/.test(position)) {
+      centerOffsetY = arrowVCenterOffset - rect.height / 2;
+    }
+    return [centerOffsetX + ((_userOffset$ = userOffset === null || userOffset === void 0 ? void 0 : userOffset[0]) !== null && _userOffset$ !== void 0 ? _userOffset$ : 0), centerOffsetY + ((_userOffset$2 = userOffset === null || userOffset === void 0 ? void 0 : userOffset[1]) !== null && _userOffset$2 !== void 0 ? _userOffset$2 : 0)];
+  }, [pointAtCenter, position, targetRef.current, props.offset]);
   var _React$useState5 = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
     _React$useState6 = slicedToArray_default()(_React$useState5, 2),
     updateKey = _React$useState6[0],
@@ -33840,7 +33868,7 @@ var Popover = function Popover(props) {
     adjust: props.adjust,
     onAdjust: props.adjust ? setPositionState : undefined,
     lazy: props.lazy,
-    offset: props.offset,
+    offset: mergedOffset,
     updateKey: updateKey,
     setSizingStyle: props.boundary ? setContentStyle : undefined,
     children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
@@ -34595,6 +34623,7 @@ var List = function List(props) {
 
 
 
+
 var tooltip_devUseWarning = devUseWarning;
 var defaultDelay = 0;
 var Tooltip = function Tooltip(props) {
@@ -34617,7 +34646,9 @@ var Tooltip = function Tooltip(props) {
     _props$position = props.position,
     popsitionProps = _props$position === void 0 ? 'auto' : _props$position,
     _props$popupGap = props.popupGap,
-    popupGap = _props$popupGap === void 0 ? 0 : _props$popupGap;
+    popupGap = _props$popupGap === void 0 ? 0 : _props$popupGap,
+    _props$pointAtCenter = props.pointAtCenter,
+    pointAtCenter = _props$pointAtCenter === void 0 ? false : _props$pointAtCenter;
 
   // Early validation checks BEFORE any hooks
   if (! /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children)) {
@@ -34646,6 +34677,25 @@ var Tooltip = function Tooltip(props) {
     popupRef = _usePopup.popupRef,
     closePop = _usePopup.closePop;
   var events = getTargetProps();
+
+  // 计算 pointAtCenter 的偏移量，使箭头指向触发元素的中心
+  var pointAtCenterOffset = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    var _targetRef$current;
+    if (!pointAtCenter) return undefined;
+    var rect = (_targetRef$current = targetRef.current) === null || _targetRef$current === void 0 ? void 0 : _targetRef$current.getBoundingClientRect();
+    if (!rect) return undefined;
+    // 垂直方向的非居中位置：bottom-left, bottom-right, top-left, top-right
+    // 箭头水平中心 = 内边距(8) + 半宽(8) = 16px
+    if (/^(top|bottom)-(left|right)$/.test(position)) {
+      return [arrowHCenterOffset - rect.width / 2, 0];
+    }
+    // 水平方向的非居中位置：left-top, left-bottom, right-top, right-bottom
+    // 箭头旋转 90° 后，垂直中心 = 内边距(8) + 半高(4) = 12px
+    if (/^(left|right)-(top|bottom)$/.test(position)) {
+      return [0, arrowVCenterOffset - rect.height / 2];
+    }
+    return undefined;
+  }, [pointAtCenter, position, targetRef.current]);
   var _React$useState = external_root_React_commonjs2_react_commonjs_react_amd_react_default().useState(0),
     _React$useState2 = slicedToArray_default()(_React$useState, 2),
     updateKey = _React$useState2[0],
@@ -34725,6 +34775,7 @@ var Tooltip = function Tooltip(props) {
       adjust: popsitionProps === 'auto',
       checkPosition: true,
       updateKey: updateKey,
+      offset: pointAtCenterOffset,
       children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
         className: classnames_default()(className, tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.rootClass, tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapper, open && (tooltipClasses === null || tooltipClasses === void 0 ? void 0 : tooltipClasses.wrapperOpen)),
         style: {
@@ -74498,10 +74549,18 @@ var BaseUpload = function BaseUpload(props) {
 };
 BaseUpload.displayName = 'ShineoutUpload';
 /* harmony default export */ var src_upload_upload_0 = (function (props) {
+  var _props$htmlName;
   var customProps = use_upload_common({
     rules: props.rules
   });
-  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), customProps), BaseUpload, 'array');
+
+  // useFieldCommon 会把 name 从转发给子组件的 props 中移除（name 被用作 Form 字段 key）。
+  // 但 Upload 的 name 在 v2 中同时作为 FormData 的键名，为了兼容 v2 行为，
+  // 在 name 被移除之前将其作为 htmlName 的 fallback 保存下来。
+  var htmlName = (_props$htmlName = props.htmlName) !== null && _props$htmlName !== void 0 ? _props$htmlName : typeof props.name === 'string' ? props.name : undefined;
+  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+    htmlName: htmlName
+  }, customProps), BaseUpload, 'array');
 });
 ;// CONCATENATED MODULE: ../base/src/upload/image.tsx
 
@@ -74539,10 +74598,17 @@ var BaseUploadImage = function BaseUploadImage(props) {
 };
 BaseUploadImage.displayName = 'ShineoutUploadImage';
 /* harmony default export */ var src_upload_image = (function (props) {
+  var _props$htmlName;
   var customProps = use_upload_common({
     rules: props.rules
   });
-  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), customProps), BaseUploadImage);
+
+  // 同 upload.tsx：useFieldCommon 会把 name 从子组件 props 中移除，
+  // 提前将其作为 htmlName 的 fallback 保存，以兼容 v2 中 name 作为 FormData 键名的行为。
+  var htmlName = (_props$htmlName = props.htmlName) !== null && _props$htmlName !== void 0 ? _props$htmlName : typeof props.name === 'string' ? props.name : undefined;
+  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+    htmlName: htmlName
+  }, customProps), BaseUploadImage);
 });
 ;// CONCATENATED MODULE: ../base/src/upload/button.tsx
 
@@ -77075,7 +77141,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.17-beta.2'
+  version: '3.9.17-beta.4'
 });
 }();
 /******/ 	return __webpack_exports__;