shineout 3.4.5 → 3.4.6-beta.2

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'
+  version: '3.4.6-beta.2'
 };

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');
+/* harmony default export */ var version = ('3.4.6-beta.2');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22210,7 +22210,7 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '&:hover': objectSpread2_default()(objectSpread2_default()({}, select_wrapper['&:hover']), {}, {
       cursor: 'pointer',
-      '&$clearable:not($wrapperEmpty)': {
+      '&$clearable:not($wrapperEmpty):not($wrapperDisabled)': {
         '& $clearIcon': {
           display: 'block'
         },
@@ -43683,7 +43683,7 @@ var DatePicker = function DatePicker(props0) {
     }
   }, []);
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({}, getDataAttribute(defineProperty_default()(defineProperty_default()({}, 'input-border', 'true'), "type", type))), {}, {
-    className: classnames_default()(props.className, styles === null || styles === void 0 ? void 0 : styles.wrapper, props.innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), disabledStatus === 'all' && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), range && (styles === null || styles === void 0 ? void 0 : styles.wrapperRange), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!props.underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline)),
+    className: classnames_default()(props.className, styles === null || styles === void 0 ? void 0 : styles.wrapper, props.innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), focused && disabled !== true && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), disabledStatus === 'all' && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), range && (styles === null || styles === void 0 ? void 0 : styles.wrapperRange), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!props.underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline)),
     style: objectSpread2_default()({
       width: props.width
     }, props.style),
@@ -58461,9 +58461,13 @@ var Tr = function Tr(props) {
     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;
+    var isPreventElement = preventClasses.find(function (cl) {
+      var classes = cl === null || cl === void 0 ? void 0 : cl.split(' ');
+      return classes.some(function (c) {
+        return el.classList.contains(c);
+      });
+    });
+    if (isPreventElement) return true;
     if (!el.parentElement) return true;
     return isNotExpandableElement(el.parentElement);
   };
@@ -58487,8 +58491,8 @@ var Tr = function Tr(props) {
         }
       }
     }
-    if (isNotExpandableElement(target)) return;
     if (props.rowClickExpand) {
+      if (isNotExpandableElement(target)) return;
       props.handleExpandClick(props.expandCol, props.rawData, props.rowIndex);
     }
   });
@@ -65413,7 +65417,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.4.5'
+  version: '3.4.6-beta.2'
 });
 }();
 /******/ 	return __webpack_exports__;