shineout 3.3.0-beta.11 → 3.3.0-beta.12

package/cjs/drawer/drawer.type.d.ts

@@ -1,8 +1,9 @@
 import { ModalProps } from '../modal/modal.type';
+import { type } from '../utils';
 /**
  * @title Drawer
  */
-export interface DrawerProps extends Omit<ModalProps, 'moveable'> {
+interface DrawerPropsOrgin extends Omit<ModalProps, 'moveable'> {
     /** *
      * @en 弹出位置
      * @cn Pop-up position
@@ -22,3 +23,5 @@ export interface DrawerProps extends Omit<ModalProps, 'moveable'> {
      */
     height?: number | string;
 }
+export type DrawerProps = type.RequireAWithB<DrawerPropsOrgin, 'type', 'title'>;
+export {};

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.3.0-beta.11'
+  version: '3.3.0-beta.12'
 };

package/cjs/utils/index.d.ts

@@ -17,8 +17,9 @@ import normalizeWheel from './dom/normalizeWheel';
 import * as position from './dom/popover';
 import ready from './dom/ready';
 import isJson from './validate/isJson';
+import * as type from './type';
 import accept from './accept';
 declare const validate: () => void;
 declare const cssAccessors: {};
 declare const cssInject: {};
-export { classname, clone, color, flat, func, hash, is, number, objects, shallowEqual, string, tree, detect, doc, element, normalizeWheel, position, ready, isJson, validate, cssAccessors, cssInject, accept, };
+export { classname, clone, color, flat, func, hash, is, number, objects, shallowEqual, string, tree, detect, doc, element, normalizeWheel, position, ready, isJson, validate, cssAccessors, cssInject, type, accept, };

package/cjs/utils/index.js

@@ -49,7 +49,7 @@ Object.defineProperty(exports, "shallowEqual", {
     return _shallowEqual.default;
   }
 });
-exports.validate = exports.tree = exports.string = void 0;
+exports.validate = exports.type = exports.tree = exports.string = void 0;
 var _classname = _interopRequireDefault(require("./classname"));
 var clone = _interopRequireWildcard(require("./clone"));
 exports.clone = clone;
@@ -82,6 +82,8 @@ var position = _interopRequireWildcard(require("./dom/popover"));
 exports.position = position;
 var _ready = _interopRequireDefault(require("./dom/ready"));
 var _isJson = _interopRequireDefault(require("./validate/isJson"));
+var type = _interopRequireWildcard(require("./type"));
+exports.type = type;
 var _accept = _interopRequireDefault(require("./accept"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/cjs/utils/type.d.ts

@@ -0,0 +1,3 @@
+export type RequireAWithB<T, A extends keyof T, B extends keyof T> = (Omit<T, A> & {
+    [K in A]?: never;
+}) | (T & Required<Pick<T, B>>) | (T & Required<Pick<T, A | B>>);

package/cjs/utils/type.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/shineout.js

@@ -338,6 +338,13 @@ return /******/ (function() { // webpackBootstrap
 
 
 
+/***/ }),
+
+/***/ 514:
+/***/ (function() {
+
+
+
 /***/ }),
 
 /***/ 4689:
@@ -6568,6 +6575,7 @@ __webpack_require__.d(src_utils_namespaceObject, {
   shallowEqual: function() { return utils_shallowEqual; },
   string: function() { return strings_namespaceObject; },
   tree: function() { return src_utils_tree_namespaceObject; },
+  type: function() { return type; },
   validate: function() { return src_utils_validate; }
 });
 
@@ -11960,7 +11968,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.3.0-beta.11');
+/* harmony default export */ var version = ('3.3.0-beta.12');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -20668,10 +20676,6 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({}, animationSt
     display: 'flex',
     marginBottom: src.modalPanelGap
   },
-  headerEmptyTitle: {
-    marginBottom: 0,
-    height: 0
-  },
   headerIcon: {
     '$wrapper &': {
       marginRight: src.modalHeaderIconMarginEnd,
@@ -20683,6 +20687,9 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({}, animationSt
       alignItems: 'center'
     }
   },
+  emptyIcon: {
+    position: 'absolute'
+  },
   headerTitle: {
     flex: '1',
     minWidth: 0,
@@ -20717,6 +20724,16 @@ var modalStyle = objectSpread2_default()(objectSpread2_default()({}, animationSt
       })
     }
   },
+  emptyClose: {
+    position: 'absolute',
+    top: 12,
+    right: 12,
+    marginTop: 0,
+    '$wrapperDrawer &': {
+      top: 4,
+      right: 4
+    }
+  },
   body: {
     flex: '1 1 auto',
     minHeight: '1px',
@@ -43270,24 +43287,34 @@ var Modal = function Modal(props) {
   }, []);
 
   // render
-
-  var renderIcon = function renderIcon() {
+  var renderIcon = function renderIcon(isEmptyTitle) {
+    var iconRoot = classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerIcon, isEmptyTitle && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.emptyIcon));
     return /*#__PURE__*/(0,jsx_runtime.jsx)(alert_icon, {
       jssStyle: props.jssStyle,
       type: props.type,
-      className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerIcon
+      className: iconRoot
     });
   };
   var renderHeader = function renderHeader() {
-    var showCloseIcon = maskCloseAble === null || !!maskCloseAble;
+    var showCloseIcon = (maskCloseAble === null || !!maskCloseAble) && !props.hideClose;
     var isEmptyTitle = !props.title && props.title !== 0;
+    if (isEmptyTitle) {
+      var closeRoot = classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerClose, modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.emptyClose);
+      return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+        children: [renderIcon(isEmptyTitle), showCloseIcon && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          className: closeRoot,
+          onClick: handleClose,
+          children: icons_config.modal.Close
+        })]
+      });
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-      className: classnames_default()(modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.header, isEmptyTitle && (modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerEmptyTitle)),
+      className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.header,
       onMouseDown: props.moveable ? moveInfo.handleMouseDown : undefined,
       children: [renderIcon(), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerTitle,
         children: props.title
-      }), showCloseIcon && !props.hideClose && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      }), showCloseIcon && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: modalClasses === null || modalClasses === void 0 ? void 0 : modalClasses.headerClose,
         onClick: handleClose,
         children: icons_config.modal.Close
@@ -55269,16 +55296,17 @@ var useTableLayout = function useTableLayout(props) {
       (_cancelFunc = cancelFunc) === null || _cancelFunc === void 0 || _cancelFunc();
     };
   }, [scrollRef.current]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
     if (adjust) {
       getColgroup(adjust === 'drag');
       setAdjust(false);
     } else {
       checkFloat();
-      checkScroll();
+      // checkScroll();
       // 拖拽列会导致 scrollWidth 变化
       syncScrollWidth();
     }
+    checkScroll();
   }, [colgroup]);
   return {
     isScrollX: !!isScrollX,
@@ -55545,7 +55573,6 @@ var useTableTree = function useTableTree(props) {
 
 
 
-
 var useTableVirtual = function useTableVirtual(props) {
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -55563,7 +55590,6 @@ var useTableVirtual = function useTableVirtual(props) {
     _useState8 = slicedToArray_default()(_useState7, 2),
     startIndex = _useState8[0],
     setStartIndex = _useState8[1];
-  var preIndex = usePrevious(startIndex);
   var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
     _useState10 = slicedToArray_default()(_useState9, 2),
     offsetY = _useState10[0],
@@ -55576,7 +55602,8 @@ var useTableVirtual = function useTableVirtual(props) {
       rateTimer: null,
       topTimer: null,
       controlScrollRate: null,
-      heightCallback: null
+      heightCallback: null,
+      preIndex: null
     }),
     context = _useRef.current;
   var getTranslate = usePersistFn(function (left, top) {
@@ -55609,6 +55636,8 @@ var useTableVirtual = function useTableVirtual(props) {
     if (context.shouldUpdateHeight) {
       setHeight(getContentHeight(props.data.length - 1));
     }
+    var preIndex = context.preIndex;
+    // 解决: 从下往上滚 由于高度变化会导致滚动条跳动
     if (preIndex && preIndex > startIndex && startIndex === index) {
       // 发生在顶部
       if (context.heightCallback) return;
@@ -55713,6 +55742,16 @@ var useTableVirtual = function useTableVirtual(props) {
       props.scrollRef.current.scrollTop = beforeHeight;
     }
   });
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    // 记录preIndex
+    context.preIndex = startIndex;
+  }, [startIndex]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    // 数据变化的时候清空掉 preIndex, 如果之前有缓存的index, setRowHeight 会有问题
+    return function () {
+      context.preIndex = null;
+    };
+  }, [props.data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.disabled) return;
     if (offsetY) {
@@ -57219,8 +57258,6 @@ var emptyRef = {
       jssStyle: props.jssStyle,
       colgroup: colgroup
     };
-    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
-    var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper, isScrollY && scrollBarWidth && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
     var fixRightNum = (isRtl ? -1 * maxScrollLeft : maxScrollLeft) - virtualInfo.innerLeft;
     var Wrapper = props.sticky ? src_sticky_sticky : (external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment;
     var sticky = typeof_default()(props.sticky) === 'object' ? props.sticky : {
@@ -57233,7 +57270,10 @@ 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) {
+    var isRenderBaseTable = !virtual && !isScrollY && !props.sticky && ((_props$data3 = props.data) === null || _props$data3 === void 0 ? void 0 : _props$data3.length);
+    var headWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.headWrapper, (isScrollY && scrollBarWidth || isRenderBaseTable) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
+    var footWrapperClass = classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.footWrapper, (isScrollY && scrollBarWidth || isRenderBaseTable) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.scrollY));
+    if (isRenderBaseTable) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         ref: scrollRef,
         className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.bodyWrapper,
@@ -58305,6 +58345,7 @@ src_textarea_textarea_0.displayName = 'ShineoutTextarea';
 
 
 
+var defaultDelay = 0;
 var Tooltip = function Tooltip(props) {
   var _jssStyle$tooltip;
   var _props$trigger = props.trigger,
@@ -58324,11 +58365,13 @@ var Tooltip = function Tooltip(props) {
   var tooltipClasses = jssStyle === null || jssStyle === void 0 || (_jssStyle$tooltip = jssStyle.tooltip) === null || _jssStyle$tooltip === void 0 ? void 0 : _jssStyle$tooltip.call(jssStyle);
   var config = useConfig();
   var childrenProps = /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.isValidElement)(children) ? children === null || children === void 0 ? void 0 : children.props : {};
+  var delay = props.delay || props.mouseEnterDelay || defaultDelay;
   var _usePopup = use_popup({
       position: popsitionProps,
       trigger: trigger,
       autoMode: 'popover',
       priorityDirection: priorityDirection,
+      mouseEnterDelay: delay,
       targetEvents: disabledChild ? {} : childrenProps
     }),
     open = _usePopup.open,
@@ -63137,6 +63180,8 @@ var popover_getPosition = function getPosition(position, el) {
     return false;
   }
 }
+// EXTERNAL MODULE: ./src/utils/type.ts
+var type = __webpack_require__(514);
 ;// CONCATENATED MODULE: ./src/utils/accept.ts
 function accept_attrAccept(file, acceptedFiles) {
   if (file && acceptedFiles) {
@@ -63178,6 +63223,7 @@ function accept_attrAccept(file, acceptedFiles) {
 
 
 
+
 // import validate from './validate';
 
 
@@ -63473,7 +63519,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.0-beta.11'
+  version: '3.3.0-beta.12'
 });
 }();
 /******/ 	return __webpack_exports__;