shineout 3.0.0-alpha.30 → 3.0.0-alpha.31

package/cjs/index.js

@@ -478,6 +478,6 @@ exports.TYPE = _TYPE;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var _default = {
-  version: '3.0.0-alpha.30'
+  version: '3.0.0-alpha.31'
 };
 exports.default = _default;

package/dist/shineout.js

@@ -11842,7 +11842,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.0.0-alpha.30');
+/* harmony default export */ var version = ('3.0.0-alpha.31');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -15634,6 +15634,29 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     outline: 'none',
     cursor: 'pointer'
   }, wrapper), {}, {
+    '&$wrapperInnerTitle': {
+      '& $placeholder,$ellipsis,$space,input': {
+        marginTop: 0,
+        marginBottom: 0
+      },
+      '& $tag': {
+        marginTop: 0,
+        paddingTop: 0,
+        paddingBottom: 0,
+        height: src.lineHeightDynamic,
+        border: 'none',
+        '&  *': {
+          lineHeight: src.lineHeightDynamic
+        }
+      },
+      '&$wrapperSmall $tag': {
+        height: 18,
+        marginBottom: 2,
+        '&$tag  *': {
+          lineHeight: '18px'
+        }
+      }
+    },
     '&$wrapperSmall': {
       '& $tag': {
         height: 18,
@@ -15765,6 +15788,9 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
       }
     }
   },
+  multipleResultWrapper: {
+    flexWrap: 'wrap'
+  },
   resultAlignLeft: {
     '& $resultTextWrapper': {
       textAlign: 'left'
@@ -15900,6 +15926,9 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     },
     '& $placeholder': {}
   },
+  multipleCompressedWrapper: {
+    flexWrap: 'nowrap'
+  },
   loading: {
     padding: 10,
     color: src.cascaderPlaceholderColor,
@@ -15925,6 +15954,7 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
       borderRight: "1px solid ".concat(src.cascaderListBorderColor)
     }
   },
+  hideTag: {},
   list: {
     paddingTop: 3,
     paddingBottom: 3,
@@ -15938,7 +15968,10 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     marginRight: 4,
     marginTop: src.cascaderPlaceholderMarginY,
     marginBottom: src.cascaderPlaceholderMarginY,
-    textWrap: 'nowrap'
+    textWrap: 'nowrap',
+    '&$hideTag': {
+      marginRight: 0
+    }
   },
   space: {
     marginTop: src.cascaderPlaceholderMarginY,
@@ -20604,6 +20637,23 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
       '& $placeholder,$ellipsis,$space,input': {
         marginTop: 0,
         marginBottom: 0
+      },
+      '& $tag': {
+        marginTop: 0,
+        paddingTop: 0,
+        paddingBottom: 0,
+        height: src.lineHeightDynamic,
+        border: 'none',
+        '&  *': {
+          lineHeight: src.lineHeightDynamic
+        }
+      },
+      '&$wrapperSmall $tag': {
+        height: 18,
+        marginBottom: 2,
+        '&$tag  *': {
+          lineHeight: '18px'
+        }
       }
     },
     '&$wrapperSmall': {
@@ -24939,6 +24989,29 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     outline: 'none',
     cursor: 'pointer'
   }, tree_select_wrapper), {}, {
+    '&$wrapperInnerTitle': {
+      '& $placeholder,$ellipsis,$space,input': {
+        marginTop: 0,
+        marginBottom: 0
+      },
+      '& $tag': {
+        marginTop: 0,
+        paddingTop: 0,
+        paddingBottom: 0,
+        height: src.lineHeightDynamic,
+        border: 'none',
+        '&  *': {
+          lineHeight: src.lineHeightDynamic
+        }
+      },
+      '&$wrapperSmall $tag': {
+        height: 18,
+        marginBottom: 2,
+        '&$tag  *': {
+          lineHeight: '18px'
+        }
+      }
+    },
     '&$wrapperSmall': {
       '& $tag': {
         height: 18,
@@ -25014,6 +25087,7 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     alignItems: 'center',
     lineHeight: src.lineHeightDynamic
   },
+  hideTag: {},
   resultTextWrapper: {
     display: 'flex',
     flex: '1',
@@ -25225,7 +25299,10 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     marginRight: 4,
     marginTop: src.treeSelectPlaceholderMarginY,
     marginBottom: src.treeSelectPlaceholderMarginY,
-    textWrap: 'nowrap'
+    textWrap: 'nowrap',
+    '&$hideTag': {
+      marginRight: 0
+    }
   },
   space: {
     marginTop: src.treeSelectPlaceholderMarginY,
@@ -34299,9 +34376,7 @@ var Result = function Result(props) {
 
 
 var ResultInput = function ResultInput(props) {
-  var _jssStyle$select;
-  var jssStyle = props.jssStyle,
-    value = props.value,
+  var value = props.value,
     inputText = props.inputText,
     focus = props.focus,
     trim = props.trim,
@@ -34314,7 +34389,7 @@ var ResultInput = function ResultInput(props) {
     onBindInput = props.onBindInput,
     onInputBlur = props.onInputBlur,
     isEmpty = props.isEmpty;
-  var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
+  var styles = props.classes;
   var mirrorRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var bindInputRef = function bindInputRef(ref) {
@@ -34732,18 +34807,18 @@ function getResetMore(onFilter, container, doms) {
   return num;
 }
 var More = function More(props) {
-  var _jssStyle$select;
   var jssStyle = props.jssStyle,
     data = props.data,
     showNum = props.showNum,
     size = props.size,
     compressed = props.compressed,
-    compressedClassName = props.compressedClassName;
+    compressedClassName = props.compressedClassName,
+    classes = props.classes;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
+  var styles = classes;
   var shouldShowMore = showNum < 0 || showNum >= data.length;
   var before = [];
   var after = [];
@@ -34824,7 +34899,6 @@ var result_isObject = is_isObject,
   result_isFunc = isFunc,
   result_isArray = isArray;
 var result_Result = function Result(props) {
-  var _jssStyle$select;
   var jssStyle = props.jssStyle,
     multiple = props.multiple,
     size = props.size,
@@ -34866,7 +34940,7 @@ var result_Result = function Result(props) {
   var prevMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(more);
   var showInput = allowOnFilter;
   var mounted = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
-  var styles = jssStyle === null || jssStyle === void 0 ? void 0 : (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
+  var styles = props.classes;
   var rootClass = classnames_default()(styles.resultTextWrapper, compressed && styles.compressedWrapper, multiple && styles.multipleResultWrapper, multiple && compressed && styles.multipleCompressedWrapper);
   var renderResultContent = function renderResultContent(data, index, nodes) {
     if (checkUnMatched(data)) {
@@ -34910,7 +34984,7 @@ var result_Result = function Result(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(result_input, {
         isEmpty: empty,
-        jssStyle: jssStyle,
+        classes: props.classes,
         value: filterText,
         trim: trim,
         focus: focus,
@@ -35040,7 +35114,7 @@ var result_Result = function Result(props) {
   var moreNumber = getCompressedBound();
   var renderMultipleResultMore = /*#__PURE__*/(0,jsx_runtime.jsx)(result_more, {
     keygen: keygen,
-    jssStyle: jssStyle,
+    classes: props.classes,
     data: result,
     size: size,
     more: moreNumber,
@@ -35521,6 +35595,7 @@ var Cascader = function Cascader(props0) {
         size: size,
         value: value,
         closeable: singleRemove && multiple,
+        classes: styles,
         data: data,
         focus: open,
         keygen: keygen,
@@ -36713,24 +36788,21 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
   var getCheckedStatus = use_persist_fn(function (childrenKey) {
     if (valueArr.length === 0) return false;
     var dataMap = getDataMap(childrenKey);
-    var valueMap = getValueMap();
     var formatValues = Array.from(dataMap, function (_ref) {
       var _ref2 = slicedToArray_default()(_ref, 2),
-        value = _ref2[0],
+        _value = _ref2[0],
         data = _ref2[1];
-      return [value, data];
+      return data;
     });
     var checkedNum = 0;
     var validateNum = 0;
-    formatValues.forEach(function (_ref3) {
-      var _ref4 = slicedToArray_default()(_ref3, 2),
-        value = _ref4[0],
-        data = _ref4[1];
+    for (var i = 0; i < formatValues.length; i++) {
+      var data = formatValues[i];
       if (!disabledCheck(data)) {
         validateNum++;
-        if (valueMap.get(value)) checkedNum++;
+        if (check(data)) checkedNum++;
       }
-    });
+    }
     if (checkedNum === 0) return false;
     if (checkedNum === validateNum) return true;
     return 'indeterminate';
@@ -48002,7 +48074,8 @@ function Select(props0) {
         onClearCreatedData: onClearCreatedData,
         getDataByValues: getDataByValues,
         checkUnMatched: checkUnMatched,
-        onRemove: handleRemove
+        onRemove: handleRemove,
+        classes: styles
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -52727,6 +52800,8 @@ var useTableLayout = function useTableLayout(props) {
     } else {
       checkFloat();
       checkScroll();
+      // 拖拽列会导致 scrollWidth 变化
+      syncScrollWidth();
     }
   }, [colgroup]);
   return {
@@ -57051,7 +57126,8 @@ var TreeSelect = function TreeSelect(props0) {
         checkUnMatched: checkUnMatched,
         onClearCreatedData: onClearCreatedData,
         getDataByValues: getDataByValues,
-        onRemove: handleRemove
+        onRemove: handleRemove,
+        classes: styles
       })
     });
     return /*#__PURE__*/(0,jsx_runtime.jsx)(PopupProvider, {
@@ -60731,7 +60807,7 @@ var upload_interface = __webpack_require__(7818);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.0-alpha.30'
+  version: '3.0.0-alpha.31'
 });
 }();
 /******/ 	return __webpack_exports__;