shineout 3.4.5-beta.4 → 3.4.5-beta.5

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.5'
 };

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.5');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -52059,7 +52059,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 +58222,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 +58313,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 +58334,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 +58417,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 +58454,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 +58485,7 @@ var Tr = function Tr(props) {
         }
       }
     }
+    if (isNotExpandableElement(target)) return;
     if (props.rowClickExpand) {
       props.handleExpandClick(props.expandCol, props.rawData, props.rowIndex);
     }
@@ -59222,7 +59237,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 +65411,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.5-beta.4'
+  version: '3.4.5-beta.5'
 });
 }();
 /******/ 	return __webpack_exports__;