shineout 3.5.8-beta.15 → 3.5.8-beta.17

package/cjs/index.js

@@ -507,5 +507,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.5.8-beta.15'
+  version: '3.5.8-beta.17'
 };

package/dist/shineout.js

@@ -12115,7 +12115,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.5.8-beta.15');
+/* harmony default export */ var version = ('3.5.8-beta.17');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -13921,15 +13921,15 @@ var menuTokens = {
   menuHeaderPaddingX: 'Spacing-12',
   menuHeaderPaddingY: 'Spacing-12',
   menuDarkFontColor: 'Neutral-text-1',
-  menuDarkItemBackgroundColor: 'Neutral-fill-10',
+  menuDarkItemBackgroundColor: 'Neutral-fill-9',
   menuDarkItemFontColor: 'Neutral-text-1',
   menuDarkItemHoverBackgroundColor: 'Brand-9',
   menuDarkItemHoverFontColor: 'Neutral-text-1',
   menuDarkItemActiveBackgroundColor: 'Brand-6',
   menuDarkItemActiveFontColor: 'Neutral-text-1',
-  menuDarkItemOpenBackgroundColor: 'Neutral-fill-9',
+  menuDarkItemOpenBackgroundColor: 'Neutral-fill-10',
   menuDarkItemOpenFontColor: 'Neutral-text-1',
-  menuDarkItemDisabledBackgroundColor: 'Neutral-fill-10',
+  menuDarkItemDisabledBackgroundColor: 'Neutral-fill-9',
   menuDarkItemDisabledFontColor: 'Neutral-text-4',
   menuDarkItemCollapseActiveBackgroundColor: 'Brand-6',
   menuDarkItemCollapseActiveFontColor: 'Neutral-text-1',
@@ -14374,7 +14374,7 @@ var stepsTokens = {
   stepsLargeTitleFontSize: 'Font-18',
   stepsLargeDescriptionFontSize: 'Font-12',
   stepsWaitFontColor: 'Neutral-text-4',
-  stepsWaitBackgroundColor: 'Neutral-fill-2',
+  stepsWaitBackgroundColor: 'Neutral-fill-4',
   stepsWaitHoverFontColor: 'Brand-6',
   stepsProcessFontColor: 'Neutral-text-1',
   stepsProcessBackgroundColor: 'Brand-6',
@@ -17216,7 +17216,8 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     boxShadow: src.cascaderPanelShadow,
     border: "1px solid ".concat(src.cascaderPanelBorder),
     borderRadius: src.cascaderPanelRadius,
-    transformOrigin: '0 0'
+    transformOrigin: '0 0',
+    cursor: 'initial'
   },
   pickerWrapperShow: {},
   iconWrapper: {
@@ -17989,7 +17990,8 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
     backgroundColor: src.datePickerPanelBackgroundColor,
     boxShadow: src.datePickerPanelShadow,
     borderRadius: src.datePickerPanelRadius,
-    border: "1px solid ".concat(src.datePickerPanelBorder)
+    border: "1px solid ".concat(src.datePickerPanelBorder),
+    cursor: 'initial'
   },
   pickerBox: {
     display: 'flex'
@@ -20888,8 +20890,10 @@ var menuStyle = {
     '& + $titleContent': {
       paddingLeft: src.menuIconMarginX
     },
-    lineHeight: 1,
-    display: 'inline-flex'
+    display: 'inline-flex',
+    alignSelf: 'flex-start',
+    height: src.lineHeightDynamic,
+    alignItems: 'center'
   },
   titleContent: {
     whiteSpace: 'pre-wrap',
@@ -20914,6 +20918,10 @@ var menuStyle = {
       lineHeight: 1,
       width: src.menuExpandSize,
       height: src.menuExpandSize,
+      alignSelf: 'flex-start',
+      alignItems: 'center',
+      display: 'flex',
+      minHeight: "calc(".concat(src.lineHeightDynamic, " + ").concat(src.menuTitlePaddingY, "*2)"),
       '$wrapper:not($wrapperVertical) $itemOpen > $itemContent &': {
         transform: 'rotate(180deg)'
       }
@@ -22880,7 +22888,8 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     boxShadow: src.selectPanelShadow,
     borderRadius: src.selectPanelRadius,
     transformOrigin: '0 0',
-    border: "1px solid ".concat(src.selectPanelBorder)
+    border: "1px solid ".concat(src.selectPanelBorder),
+    cursor: 'initial'
   },
   pickerSmall: {
     '& $optionInner': {
@@ -24646,7 +24655,7 @@ var stepsStyle = {
       backgroundColor: src.stepsErrorBackgroundColor
     },
     '& $title': {
-      fontWeight: 'bold'
+      fontWeight: 500
     }
   },
   icon: {
@@ -27920,7 +27929,8 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     borderRadius: src.treeSelectPanelRadius,
     transformOrigin: '0 0',
     width: 'max-content',
-    maxWidth: '640px'
+    maxWidth: '640px',
+    cursor: 'initial'
   },
   iconWrapper: {
     display: 'flex',
@@ -29869,7 +29879,8 @@ var usePositionStyle = function usePositionStyle(config) {
     popupElRef = _ref.popupElRef,
     scrollElRef = _ref.scrollElRef,
     updateKey = _ref.updateKey,
-    adjust = _ref.adjust;
+    adjust = _ref.adjust,
+    offset = _ref.offset;
   // 初次渲染无样式的时候， 隐藏展示
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(hideStyle),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -29979,6 +29990,9 @@ var usePositionStyle = function usePositionStyle(config) {
     };
     context.containerRect = containerRect;
     context.containerScroll = containerScroll;
+    console.log('======================');
+    console.log('targetPosition: >>', targetPosition);
+    console.log('======================');
     if (verticalPosition.includes(targetPosition)) {
       var _targetPosition$split = targetPosition.split('-'),
         _targetPosition$split2 = slicedToArray_default()(_targetPosition$split, 2),
@@ -30054,11 +30068,11 @@ var usePositionStyle = function usePositionStyle(config) {
         _h = _targetPosition$split4[0],
         _v = _targetPosition$split4[1];
       if (_v === 'top') {
-        style.top = rect.top - containerRect.top + containerScroll.top;
+        style.top = rect.top - containerRect.top + containerScroll.top - (offset ? offset[1] : 0);
         style.transform = '';
         arrayStyle.top = "8px";
       } else if (_v === 'bottom') {
-        style.top = rect.bottom - containerRect.top + containerScroll.top;
+        style.top = rect.bottom - containerRect.top + containerScroll.top + (offset ? offset[1] : 0);
         arrayStyle.bottom = "8px";
         style.transform = 'translateY(-100%)';
       } else {
@@ -30830,6 +30844,7 @@ var AbsoluteList = function AbsoluteList(props) {
     updateKey = props.updateKey,
     popupGap = props.popupGap,
     adjust = props.adjust,
+    offset = props.offset,
     _props$destroy = props.destroy,
     destroy = _props$destroy === void 0 ? false : _props$destroy,
     _props$lazy = props.lazy,
@@ -30871,7 +30886,8 @@ var AbsoluteList = function AbsoluteList(props) {
       popupElRef: popupElRef,
       updateKey: updateKey,
       popupGap: popupGap,
-      adjust: adjust
+      adjust: adjust,
+      offset: offset
     }),
     style = _usePositionStyle.style,
     arrayStyle = _usePositionStyle.arrayStyle;
@@ -31039,6 +31055,7 @@ var Popover = function Popover(props) {
     zIndex: zIndex,
     adjust: props.adjust,
     lazy: props.lazy,
+    offset: props.offset,
     children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()(objectSpread2_default()({
       className: classnames_default()(className, popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.rootClass, popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.wrapper, open && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.wrapperOpen), !showArrow && (popoverStyle === null || popoverStyle === void 0 ? void 0 : popoverStyle.hideArrow)),
       style: colorStyle
@@ -40887,6 +40904,7 @@ function useFormControl(props) {
     var formValue = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var errors = arguments.length > 1 ? arguments[1] : undefined;
     var severErrors = arguments.length > 2 ? arguments[2] : undefined;
+    var names = arguments.length > 3 ? arguments[3] : undefined;
     if (!name) return;
     if (isArray(name)) {
       var _value = getValue(name, formValue);
@@ -40898,7 +40916,7 @@ function useFormControl(props) {
       var dv = isArray(defaultValue) ? defaultValue : [];
       var nextValue = [];
       name.forEach(function (n, index) {
-        if (_value[index] === undefined && dv[index] !== undefined) {
+        if (!names.has(n) && _value[index] === undefined && dv[index] !== undefined) {
           nextValue[index] = dv[index];
         } else {
           nextValue[index] = _value[index];
@@ -40912,7 +40930,7 @@ function useFormControl(props) {
         setErrorState(_error2);
       }
       if (!shallowEqual(_value2, latestInfo.valueState)) {
-        if (_value2 === undefined && defaultValue !== undefined) {
+        if (!names.has(name) && _value2 === undefined && defaultValue !== undefined) {
           setValueState(defaultValue);
         } else {
           setValueState(_value2);
@@ -48221,7 +48239,7 @@ var useForm = function useForm(props) {
       Object.keys(context.updateMap).forEach(function (key) {
         var _context$updateMap$ke;
         (_context$updateMap$ke = context.updateMap[key]) === null || _context$updateMap$ke === void 0 || _context$updateMap$ke.forEach(function (update) {
-          update(context.value, context.errors, context.serverErrors);
+          update(context.value, context.errors, context.serverErrors, context.names);
         });
       });
       Object.keys(context.flowMap).forEach(function (key) {
@@ -48239,12 +48257,12 @@ var useForm = function useForm(props) {
           var _context$updateMap$pa;
           var parentKey = key.split('.')[0];
           (_context$updateMap$pa = context.updateMap[parentKey]) === null || _context$updateMap$pa === void 0 || _context$updateMap$pa.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
+            update(context.value, context.errors, context.serverErrors, context.names);
           });
         } else {
           var _context$updateMap$ke2;
           (_context$updateMap$ke2 = context.updateMap[key]) === null || _context$updateMap$ke2 === void 0 || _context$updateMap$ke2.forEach(function (update) {
-            update(context.value, context.errors, context.serverErrors);
+            update(context.value, context.errors, context.serverErrors, context.names);
           });
         }
         (_context$flowMap$key = context.flowMap[key]) === null || _context$flowMap$key === void 0 || _context$flowMap$key.forEach(function (update) {
@@ -55556,7 +55574,7 @@ var MenuItem = function MenuItem(props) {
         ,
         onClick: close,
         dir: config.direction,
-        children: items.map(function (item, index) {
+        children: items.map(function (item, index, arr) {
           var key = getKey(props.keygen, item, index);
           return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)(MenuItem, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
             mode: mode,
@@ -55567,6 +55585,9 @@ var MenuItem = function MenuItem(props) {
             keyResult: key,
             level: props.level + 1,
             renderIcon: isTitle ? undefined : props.renderIcon
+            // 顶部或底部的menuItem的popover边缘与menu的边缘对齐
+            ,
+            isEdgeItem: index === 0 || index === arr.length - 1
           }));
         })
       });
@@ -55586,6 +55607,7 @@ var MenuItem = function MenuItem(props) {
         showArrow: mode !== 'horizontal',
         position: position,
         lazy: false,
+        offset: isVertical && props.isEdgeItem ? [0, 4] : undefined,
         children: function children(close) {
           return content(close);
         }
@@ -55805,7 +55827,8 @@ var Menu = function Menu(props) {
             scrollRef: scrollRef,
             theme: theme,
             renderIcon: props.renderIcon,
-            collapse: collapse
+            collapse: collapse,
+            isEdgeItem: false
           }, key);
         })
       })
@@ -67800,7 +67823,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.8-beta.15'
+  version: '3.5.8-beta.17'
 });
 }();
 /******/ 	return __webpack_exports__;