shineout 3.7.0-beta.22 → 3.7.0-beta.23

package/cjs/index.js

@@ -522,5 +522,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.7.0-beta.22'
+  version: '3.7.0-beta.23'
 };

package/cjs/tag/tag.type.d.ts

@@ -2,7 +2,7 @@ import { TagProps as UnStyledTagProps, TagInputProps as UnStyledTagInputProps }
 /**
  * @title Tag
  */
-export type TagProps = Omit<UnStyledTagProps, 'jssStyle' | 'inlineStyle'>;
+export type TagProps = Omit<UnStyledTagProps, 'jssStyle' | 'inlineStyle' | 'onMouseDown'>;
 /**
  * @title Tag.Input
  */

package/dist/shineout.js

@@ -12226,7 +12226,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.7.0-beta.22');
+/* harmony default export */ var version = ('3.7.0-beta.23');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -17380,6 +17380,7 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     display: 'flex',
     flex: '1',
     minWidth: 0,
+    height: '100%',
     alignItems: 'center',
     lineHeight: src.lineHeightDynamic
   },
@@ -23183,6 +23184,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
   result: {
     display: 'flex',
     flex: '1',
+    height: '100%',
     minWidth: 0,
     alignItems: 'center',
     lineHeight: src.lineHeightDynamic
@@ -28561,6 +28563,7 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     display: 'flex',
     flex: '1',
     minWidth: 0,
+    height: '100%',
     alignItems: 'center',
     lineHeight: src.lineHeightDynamic
   },
@@ -29940,6 +29943,8 @@ var getPosition = function getPosition(target) {
 
 
 var defaultContext = {
+  addParent: function addParent(_ref) {},
+  removeParent: function removeParent(_ref) {},
   bindChild: function bindChild(_ref) {},
   removeChild: function removeChild(_ref) {}
 };
@@ -29970,21 +29975,32 @@ var usePopup = function usePopup(props) {
     setOpenState = _useState2[1];
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(popup_context),
     bindChild = _useContext.bindChild,
-    removeChild = _useContext.removeChild;
+    removeChild = _useContext.removeChild,
+    addParent = _useContext.addParent,
+    removeParent = _useContext.removeParent;
   var targetRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var popupRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    bindChild(popupRef);
-    return function () {
-      removeChild(popupRef);
-    };
-  }, []);
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       triggerTimer: null,
       // 记录所有的子popup 点击子 popup 不关闭弹窗
       chain: [targetRef, popupRef]
     }),
     context = _useRef.current;
+  var handleAddParent = function handleAddParent(elRef) {
+    context.chain.push(elRef);
+
+    // 继续向上添加当前的 popupRef 到父级
+    addParent(elRef);
+  };
+  var handleRemoveParent = function handleRemoveParent(elRef) {
+    var index = context.chain.findIndex(function (item) {
+      return item === elRef;
+    });
+    if (index > -1) {
+      context.chain.splice(index, 1);
+      removeParent(elRef);
+    }
+  };
   var open = openState;
   var changeOpen = function changeOpen(openIn, delay) {
     if (context.triggerTimer) clearTimeout(context.triggerTimer);
@@ -30014,11 +30030,6 @@ var usePopup = function usePopup(props) {
       updatePosition();
     }
     setOpenState(!!props.open);
-
-    // 外部传了open时，需要正常的触发onCollapse；触发了onCollapse才能让组件内部的edit状态正确，否则可能会出现弹出层打开了但是用户却无法选择的情况
-    if (props.open !== undefined) {
-      changeOpen(!!props.open);
-    }
   }, [props.open]);
 
   // const getPopUpHeight = () => {
@@ -30123,8 +30134,13 @@ var usePopup = function usePopup(props) {
   });
   var providerValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return {
+      addParent: handleAddParent,
+      removeParent: handleRemoveParent,
       bindChild: function bindChild(elRef) {
-        context.chain.push(elRef);
+        if (elRef.current) {
+          addParent(elRef);
+          context.chain.push(elRef);
+        }
       },
       removeChild: function removeChild(elRef) {
         var index = context.chain.findIndex(function (item) {
@@ -30132,10 +30148,19 @@ var usePopup = function usePopup(props) {
         });
         if (index > -1) {
           context.chain.splice(index, 1);
+          removeParent(elRef);
         }
       }
     };
   }, []);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+    if (open) {
+      bindChild(popupRef);
+    }
+    return function () {
+      removeChild(popupRef);
+    };
+  }, [open]);
   return {
     open: open,
     position: position,
@@ -40354,7 +40379,7 @@ var TagInput = function TagInput(props) {
 
 
 
-var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress", "closable"];
+var tag_excluded = ["jssStyle", "className", "type", "color", "size", "disabled", "mode", "shape", "children", "onClick", "onClose", "style", "backgroundColor", "inlineStyle", "onKeyUp", "onCompleted", "onEnterPress", "closable", "onMouseDown"];
 
 
 
@@ -40385,6 +40410,7 @@ var Tag = function Tag(props) {
     onCompleted = props.onCompleted,
     onEnterPress = props.onEnterPress,
     closable = props.closable,
+    onMouseDown = props.onMouseDown,
     rest = objectWithoutProperties_default()(props, tag_excluded);
   if (props.type) {
     tag_devUseWarning.deprecated('type', 'color', 'Tag');
@@ -40458,6 +40484,7 @@ var Tag = function Tag(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: tagStyle.closeIcon,
       onClick: handleClose,
+      onMouseDown: onMouseDown,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
         className: tagStyle.closeIconWrapper,
         children: icons_config.tag.Close
@@ -40612,10 +40639,6 @@ var More = function More(props) {
         className: compressedClassName,
         visible: visible,
         onVisibleChange: setVisible,
-        getPopupContainer: function getPopupContainer() {
-          var _props$morePopoverCon;
-          return (_props$morePopoverCon = props.morePopoverContainer) === null || _props$morePopoverCon === void 0 ? void 0 : _props$morePopoverCon.current;
-        },
         children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: styles.moreWrapper,
           onClick: function onClick(e) {
@@ -40709,6 +40732,7 @@ var result_Result = function Result(props) {
   var render = useRender();
   var resultRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var prevMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(more);
+  var removeLock = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var showInput = allowOnFilter;
   var mounted = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var styles = props.classes;
@@ -40784,6 +40808,12 @@ var result_Result = function Result(props) {
       })
     }, 'input');
   };
+  var handleCloseMouseDown = function handleCloseMouseDown() {
+    removeLock.current = true;
+    setTimeout(function () {
+      removeLock.current = false;
+    }, 0);
+  };
   var renderResultItem = function renderResultItem(item, index, nodes, v) {
     var handleClose = function handleClose() {
       onRemove === null || onRemove === void 0 || onRemove(item, v);
@@ -40824,6 +40854,7 @@ var result_Result = function Result(props) {
       className: classnames_default()(styles.tag, more === 1 && styles.tagOnly, resultClassName),
       closable: closeable && 'only',
       onClose: closeable && handleClose,
+      onMouseDown: closeable ? handleCloseMouseDown : undefined,
       onClick: handleClick,
       jssStyle: jssStyle,
       inlineStyle: true
@@ -40910,8 +40941,7 @@ var result_Result = function Result(props) {
     compressed: compressed,
     renderCompressed: renderCompressed,
     compressedClassName: compressedClassName,
-    showNum: moreNumber,
-    morePopoverContainer: props.morePopoverContainer
+    showNum: moreNumber
   }, 'more');
   var renderResult = function renderResult() {
     if (empty) {
@@ -40940,6 +40970,7 @@ var result_Result = function Result(props) {
   var handleResetMore = function handleResetMore() {
     if (!compressed) return;
     if (isCompressedBound()) return;
+    if (removeLock.current) return;
     setMore(-1);
     setShouldResetMore(true);
   };
@@ -41465,8 +41496,7 @@ var Cascader = function Cascader(props0) {
         onResultItemClick: handleResultItemClick,
         checkUnMatched: checkUnMatched,
         getDataByValues: getDataByValues,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -41639,6 +41669,9 @@ var Cascader = function Cascader(props0) {
     datum.setValue(value);
     if (!open) return;
     updatePathByValue();
+    if (props.renderOptionList) {
+      updatePath();
+    }
   }, [value, open]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (filterText !== undefined) {
@@ -46988,7 +47021,7 @@ var DatePicker = function DatePicker(props0) {
     if (props.open) {
       func.startEdit();
     }
-  }, []);
+  }, [props.open]);
   var _usePopup = use_popup({
       open: props.open,
       onCollapse: onCollapse,
@@ -47720,7 +47753,8 @@ var Modal = function Modal(props) {
       renderEd: false,
       isMask: false,
       mouseDownTarget: null,
-      mouseUpTarget: null
+      mouseUpTarget: null,
+      content: null
     }),
     context = _useRef.current;
   var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.visible || props.autoShow),
@@ -47963,6 +47997,14 @@ var Modal = function Modal(props) {
   if (props.moveable && !props.fullScreen) {
     panelStyle.transform = "translate(".concat(moveInfo.pos.x, "px, ").concat(moveInfo.pos.y, "px)");
   }
+  var renderContent = function renderContent() {
+    if (!props.visible && context.content !== null) return context.content;
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
+      children: [renderHeader(), renderBody(), renderFooter(), renderResize()]
+    });
+  };
+  var content = renderContent();
+  context.content = content;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(FormFooterProvider, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       onClick: function onClick(e) {
@@ -47981,11 +48023,11 @@ var Modal = function Modal(props) {
         onMouseUp: handleMaskMouseUp,
         onClick: handleMaskClick,
         onAnimationStart: updateOrigin,
-        children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           ref: panelRef,
           className: classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.panel, props.className),
           style: panelStyle,
-          children: [renderHeader(), renderBody(), renderFooter(), renderResize()]
+          children: content
         })
       }))
     })
@@ -49892,7 +49934,11 @@ var useForm = function useForm(props) {
     fullKeyPaths.forEach(function (key) {
       delete context.serverErrors[key];
     });
-    update(fullKeyPaths);
+    if (option.forceUpdate) {
+      update();
+    } else {
+      update(fullKeyPaths);
+    }
   });
   var updateDefaultValue = function updateDefaultValue() {
     if (!context.mounted) return;
@@ -55895,8 +55941,7 @@ function Select(props0) {
         checkUnMatched: checkUnMatched,
         onRemove: handleRemove,
         classes: styles,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -62298,6 +62343,7 @@ var useTableGroup = function useTableGroup(props) {
       last.colSpan += colSpan;
       if (col.fixed) last.fixed = col.fixed;
       if (col.lastFixed) last.lastFixed = true;
+      if (col.groupProps) last.groupProps = col.groupProps;
     } else {
       var sub = [];
       colSpan = setColumns(sub, col, level + 1, index);
@@ -62310,7 +62356,8 @@ var useTableGroup = function useTableGroup(props) {
         fixed: col.fixed,
         firstFixed: col.firstFixed,
         index: index,
-        columns: sub
+        columns: sub,
+        groupProps: col.groupProps
       };
       columns.push(groupCol);
     }
@@ -62772,6 +62819,7 @@ var thead_toNum = toNum;
     };
   };
   var createTh = function createTh(trs, col, level, isLast, columnIndex) {
+    var _colTemp2$groupProps, _colTemp2$groupProps2;
     var colTemp = col;
     var colTemp2 = col;
     var fixedStyle = getFixedStyle(col.fixed, col.index, colTemp2.colSpan || 1, level);
@@ -62826,8 +62874,11 @@ var thead_toNum = toNum;
     var style = typeof colTemp2.name === 'string' ? fixedStyle : objectSpread2_default()({
       padding: 0
     }, fixedStyle);
+    if (colTemp2 !== null && colTemp2 !== void 0 && (_colTemp2$groupProps = colTemp2.groupProps) !== null && _colTemp2$groupProps !== void 0 && _colTemp2$groupProps.style) {
+      style = objectSpread2_default()(objectSpread2_default()({}, style), colTemp2.groupProps.style);
+    }
     trs[level].push( /*#__PURE__*/(0,jsx_runtime.jsx)("th", {
-      className: classnames_default()(cellClassName, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellGroup),
+      className: classnames_default()(cellClassName, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellGroup, colTemp2 === null || colTemp2 === void 0 || (_colTemp2$groupProps2 = colTemp2.groupProps) === null || _colTemp2$groupProps2 === void 0 ? void 0 : _colTemp2$groupProps2.className),
       style: style,
       colSpan: colTemp2.colSpan,
       dir: config.direction,
@@ -66833,8 +66884,7 @@ var TreeSelect = function TreeSelect(props0) {
         getDataByValues: getResultByValue,
         onRemove: handleRemove,
         classes: styles,
-        setInputText: setInputText,
-        morePopoverContainer: targetRef
+        setInputText: setInputText
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -70683,7 +70733,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.22'
+  version: '3.7.0-beta.23'
 });
 }();
 /******/ 	return __webpack_exports__;