shineout 3.4.5-beta.4 → 3.4.5-beta.6

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.5-beta.4'
+  version: '3.4.5-beta.6'
 };

package/cjs/table/table.js

@@ -24,7 +24,11 @@ var jssStyle = {
   input: _shineoutStyle.useInputStyle,
   button: _shineoutStyle.useButtonStyle,
   empty: _shineoutStyle.useEmptyStyle,
-  select: _shineoutStyle.useSelectStyle
+  select: _shineoutStyle.useSelectStyle,
+  cascader: _shineoutStyle.useCascaderStyle,
+  treeSelect: _shineoutStyle.useTreeSelectStyle,
+  datePicker: _shineoutStyle.useDatePickerStyle,
+  switch: _shineoutStyle.useSwitchStyle
 };
 var _default = exports.default = function _default(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_base.Table, _objectSpread({

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.5-beta.4');
+/* harmony default export */ var version = ('3.4.5-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22280,7 +22280,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       minWidth: 12,
       maxWidth: '100%',
       // flex: 1,
-      width: 12,
+      // width: 12,
       overflow: 'hidden',
       whiteSpace: 'nowrap',
       textOverflow: 'ellipsis',
@@ -32114,72 +32114,6 @@ var card_group_jssStyle = {
     jssStyle: card_group_jssStyle
   }, props));
 });
-;// CONCATENATED MODULE: ../hooks/src/common/use-in-view/use-in-view.ts
-
-
-var useInView = function useInView() {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var elementRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
-    _useState2 = slicedToArray_default()(_useState, 2),
-    isInView = _useState2[0],
-    setIsInView = _useState2[1];
-  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
-    _useState4 = slicedToArray_default()(_useState3, 2),
-    wasInView = _useState4[0],
-    setWasInView = _useState4[1];
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    var element = elementRef.current;
-    if (!element) return;
-    if (typeof window === 'undefined' || !window.IntersectionObserver) {
-      setIsInView(true);
-      setWasInView(true);
-      return;
-    }
-    var observer = new IntersectionObserver(function (_ref) {
-      var _ref2 = slicedToArray_default()(_ref, 1),
-        entry = _ref2[0];
-      var inView = entry.isIntersecting;
-      setIsInView(inView);
-      if (inView) {
-        setWasInView(true);
-        // 如果设置了 once 选项，且元素已经出现过，则取消观察
-        if (options.once) {
-          observer.disconnect();
-        }
-      }
-    }, {
-      root: options.root || null,
-      rootMargin: options.rootMargin || '0px',
-      threshold: options.threshold || 0
-    });
-    observer.observe(element);
-    return function () {
-      observer.disconnect();
-    };
-  }, [options.root, options.rootMargin, options.threshold, options.once]);
-  return {
-    ref: elementRef,
-    isInView: isInView,
-    wasInView: wasInView
-  };
-};
-/* harmony default export */ var use_in_view = (useInView);
-
-// 使用示例
-// const Example = () => {
-//   const { ref, isInView } = useInView({
-//     threshold: 0.5,
-//     rootMargin: '50px',
-//     once: true
-//   });
-
-//   return (
-//     <div ref={ref}>
-//       {isInView ? '元素在视窗中' : '元素不在视窗中'}
-//     </div>
-//   );
-// };
 ;// CONCATENATED MODULE: ../hooks/src/utils/uid.ts
 function generateUUID() {
   var c = crypto || typeof window !== 'undefined' && window.crypto; // 获取加密库
@@ -32266,12 +32200,15 @@ function getObserver(obj, id) {
     container = _obj$container === void 0 ? null : _obj$container,
     offset = obj.offset,
     render = obj.render,
+    offscreen = obj.offscreen,
     noRemove = obj.noRemove;
   var observer = new IntersectionObserver(function (entries) {
     entries.forEach(function (en) {
       if (en.isIntersecting || en.intersectionRatio > 0) {
         render();
         if (!noRemove) removeStack(id);
+      } else {
+        offscreen && offscreen();
       }
     });
   }, {
@@ -32335,7 +32272,7 @@ var Lazyload = function Lazyload(props) {
       lazyload_removeStack(lazyId);
     };
   }, []);
-  if (ready && props.isInView) return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+  if (ready) return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
     children: props.children
   });
   return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -34156,25 +34093,11 @@ var CheckboxWithContext = function CheckboxWithContext(props) {
 
 
 
-
-
 var Item = function Item(props) {
   var _props$jssStyle, _props$jssStyle$cardG;
   var _useContext = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useContext)(CardGroupContext),
     container = _useContext.container;
   var classes = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$cardG = _props$jssStyle.cardGroup) === null || _props$jssStyle$cardG === void 0 ? void 0 : _props$jssStyle$cardG.call(_props$jssStyle);
-  var _useInView = use_in_view({
-      root: container,
-      rootMargin: "".concat(props.lazyLoadOffset || (container === null || container === void 0 ? void 0 : container.clientHeight) || 100, "px")
-    }),
-    itemRef = _useInView.ref,
-    itemIsInView = _useInView.isInView,
-    wasInView = _useInView.wasInView;
-  var isInView = props.placeholder ? itemIsInView : true;
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
-    _useState2 = slicedToArray_default()(_useState, 2),
-    itemHeight = _useState2[0],
-    setItemHeight = _useState2[1];
   var handleChange = usePersistFn(function (_, checked) {
     if (props.onChange) props.onChange(checked, props.value);
   });
@@ -34184,7 +34107,6 @@ var Item = function Item(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(lazyload, {
       container: container,
       placeholder: props.placeholder,
-      isInView: isInView,
       children: content
     });
   };
@@ -34199,26 +34121,9 @@ var Item = function Item(props) {
       className: classes === null || classes === void 0 ? void 0 : classes.checkbox
     })]
   });
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
-    if (isInView) {
-      var _itemRef$current;
-      setItemHeight(((_itemRef$current = itemRef.current) === null || _itemRef$current === void 0 ? void 0 : _itemRef$current.offsetHeight) || 0);
-    }
-  }, [isInView]);
-  var hiddenStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    return !isInView && wasInView && itemHeight ? {
-      height: itemHeight,
-      overflow: 'hidden',
-      visibility: isInView ? 'visible' : 'hidden'
-    } : undefined;
-  }, [isInView, itemHeight]);
-  var itemStyle = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
-    return hiddenStyle ? objectSpread2_default()(objectSpread2_default()({}, props.style), hiddenStyle) : props.style;
-  }, [hiddenStyle, props.style]);
   return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-    ref: itemRef,
     className: cls,
-    style: itemStyle,
+    style: props.style,
     children: renderChildren(content)
   });
 };
@@ -47568,10 +47473,17 @@ var useImage = function useImage() {
           offset: typeof lazy === 'number' ? lazy : 0,
           element: elementRef.current,
           render: markToRender,
+          offscreen: function offscreen() {
+            setStatus(PLACEHOLDER);
+          },
+          noRemove: props.inViewOnly,
           container: typeof container === 'string' ? document.querySelector(container) : container
         });
       }
     }
+    return function () {
+      if (lazyId) removeStack(lazyId);
+    };
   }, [src]);
   return {
     src: src,
@@ -52059,7 +51971,6 @@ var PaginationSizeList = function PaginationSizeList(props) {
     absolute = _ref.absolute,
     position = _ref.position,
     zIndex = _ref.zIndex;
-  console.log('position', position);
   var handleChange = function handleChange(pageSize) {
     var start = (current - 1) * props.pageSize + 1;
     onChange(Math.ceil(start / pageSize), pageSize);
@@ -58223,8 +58134,9 @@ var useTableRow = function useTableRow(props) {
 
 var tr_toNum = toNum;
 var Tr = function Tr(props) {
-  var _props$jssStyle, _props$jssStyle$table, _props$rowClassName;
-  var treeFunc = props.treeFunc;
+  var _props$jssStyle, _props$jssStyle$table, _jssStyle$input, _jssStyle$select, _jssStyle$datePicker, _jssStyle$treeSelect, _jssStyle$switch, _jssStyle$checkbox, _jssStyle$radio, _jssStyle$cascader, _props$rowClassName;
+  var treeFunc = props.treeFunc,
+    jssStyle = props.jssStyle;
   var tableClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$table = _props$jssStyle.table) === null || _props$jssStyle$table === void 0 ? void 0 : _props$jssStyle$table.call(_props$jssStyle);
   var trRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var expandRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
@@ -58313,6 +58225,7 @@ var Tr = function Tr(props) {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper),
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          "data-role": "tree-expand-icon",
           className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandIcon,
           onClick: function onClick() {
             treeFunc.handleTreeExpand(props.rawData, props.rowIndex);
@@ -58333,6 +58246,7 @@ var Tr = function Tr(props) {
         className: classnames_default()(tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.iconWrapper, tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandIconWrapper),
         onClick: clickEvent,
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          "data-role": "expand-icon",
           className: tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.expandIcon,
           children: props.expanded ? icons_config.table.Expand : icons_config.table.Collapse
         })
@@ -58415,6 +58329,7 @@ var Tr = function Tr(props) {
           className: classnames_default()(col.className, col.type === 'checkbox' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellCheckbox), col.fixed === 'left' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLeft), col.fixed === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedRight), col.align === 'center' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignCenter), col.align === 'right' && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellAlignRight), (col.lastFixed || col.firstFixed || last.lastFixed) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellFixedLast), lastRowIndex === i && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellIgnoreBorder), data[i].rowSpan > 1 && props.isCellHover(props.rowIndex, data[i].rowSpan) && (tableClasses === null || tableClasses === void 0 ? void 0 : tableClasses.cellHover)),
           style: getTdStyle(col, data[i].colSpan),
           dir: config.direction,
+          "data-role": col.type === 'checkbox' ? 'checkbox' : undefined,
           onClick: props.onCellClick ? function () {
             return handleCellClick(data[i].data, i);
           } : undefined,
@@ -58451,6 +58366,17 @@ var Tr = function Tr(props) {
       }
     }
   };
+  var preventClasses = [jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$treeSelect = jssStyle.treeSelect) === null || _jssStyle$treeSelect === void 0 ? void 0 : _jssStyle$treeSelect.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$switch = jssStyle.switch) === null || _jssStyle$switch === void 0 ? void 0 : _jssStyle$switch.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$checkbox = jssStyle.checkbox) === null || _jssStyle$checkbox === void 0 ? void 0 : _jssStyle$checkbox.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$radio = jssStyle.radio) === null || _jssStyle$radio === void 0 ? void 0 : _jssStyle$radio.call(jssStyle).wrapper, jssStyle === null || jssStyle === void 0 || (_jssStyle$cascader = jssStyle.cascader) === null || _jssStyle$cascader === void 0 ? void 0 : _jssStyle$cascader.call(jssStyle).wrapper];
+  var isNotExpandableElement = function isNotExpandableElement(el) {
+    var tagName = el.tagName;
+    if (tagName === 'TD' || tagName === 'TR') return false;
+    if (tagName === 'A' || tagName === 'BUTTON' || tagName === 'INPUT') return true;
+    if (preventClasses.find(function (c) {
+      return el.classList.contains(c);
+    })) return true;
+    if (!el.parentElement) return true;
+    return isNotExpandableElement(el.parentElement);
+  };
   var handleRowClick = usePersistFn(function (e) {
     var target = e.target;
     var _props$rowClickAttr = props.rowClickAttr,
@@ -58471,6 +58397,7 @@ var Tr = function Tr(props) {
         }
       }
     }
+    if (isNotExpandableElement(target)) return;
     if (props.rowClickExpand) {
       props.handleExpandClick(props.expandCol, props.rawData, props.rowIndex);
     }
@@ -59222,7 +59149,11 @@ var table_jssStyle = {
   input: useInputStyle,
   button: useButtonStyle,
   empty: useEmptyStyle,
-  select: useSelectStyle
+  select: useSelectStyle,
+  cascader: useCascaderStyle,
+  treeSelect: useTreeSelectStyle,
+  datePicker: useDatePickerStyle,
+  switch: useSwitchStyle
 };
 /* harmony default export */ var src_table_table_0 = (function (props) {
   return /*#__PURE__*/(0,jsx_runtime.jsx)(src_table_table, objectSpread2_default()({
@@ -65392,7 +65323,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.5-beta.4'
+  version: '3.4.5-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;