shineout 3.3.3-beta.8 → 3.3.4

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.3-beta.8'
+  version: '3.3.4'
 };

package/dist/shineout.js

@@ -11968,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.3-beta.8');
+/* harmony default export */ var version = ('3.3.4');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -16813,6 +16813,13 @@ var cascaderStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.cascaderPlaceholderMarginY,
     marginBottom: src.cascaderPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -22136,6 +22143,13 @@ var selectStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.selectPlaceholderMarginY,
     marginBottom: src.selectPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -26537,22 +26551,6 @@ var treeStyle = {
     cursor: 'pointer',
     padding: "0 ".concat(src.treePaddingX),
     borderRadius: src.treeContentBorderRadius,
-    position: 'relative',
-    '&[data-expanded="true"]::before': {
-      content: '""',
-      position: 'absolute',
-      top: 24,
-      bottom: 0,
-      left: -12,
-      width: 1,
-      background: '#ebebeb'
-    },
-    '&[dir=ltr][data-expanded="true"]::before': {
-      left: -12
-    },
-    '&[dir=rtl][data-expanded="true"]::before': {
-      right: -12
-    },
     '$contentDisabled &': {
       '& $text': {
         color: src.treeContentDisabledFontColor
@@ -26583,7 +26581,8 @@ var treeStyle = {
     color: src.treeFontColor,
     fontWeight: src.treeFontWeight,
     paddingTop: src.treeTextPaddingY,
-    paddingBottom: src.treeTextPaddingY
+    paddingBottom: src.treeTextPaddingY,
+    whiteSpace: 'nowrap'
   },
   // textDisabled: {
   //   color: Token.treeItemDisabledFontColor,
@@ -27042,6 +27041,13 @@ var treeSelectStyle = objectSpread2_default()(objectSpread2_default()({
     marginTop: src.treeSelectPlaceholderMarginY,
     marginBottom: src.treeSelectPlaceholderMarginY
   },
+  inputPlaceholder: {
+    pointerEvents: 'none',
+    opacity: 0.5,
+    inset: 0,
+    position: 'absolute',
+    padding: "".concat(src.selectOptionInnerPaddingY, " ").concat(src.selectOptionInnerPaddingX)
+  },
   inputMirror: {
     position: 'absolute',
     left: 0,
@@ -29854,7 +29860,7 @@ var addResizeObserver = function addResizeObserver(el, handler) {
           if (height && lastHeight !== height) {
             debounceHandler(entry);
           }
-        } else if (width && height) {
+        } else if (lastWidth !== width || lastHeight !== height) {
           debounceHandler(entry, {
             x: lastWidth !== width,
             y: lastHeight !== height
@@ -36236,6 +36242,13 @@ var ResultInput = function ResultInput(props) {
     onRef.current = inputRef.current;
     onBindInput === null || onBindInput === void 0 || onBindInput(inputRef.current);
   }, []);
+  var renderResultPlaceholder = function renderResultPlaceholder() {
+    if (inputText || !focus || typeof props.placeholder === 'string') return null;
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: styles.inputPlaceholder,
+      children: props.placeholder
+    });
+  };
   var style = {};
   if (!multiple) {
     style.width = '100%';
@@ -36249,7 +36262,7 @@ var ResultInput = function ResultInput(props) {
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
       onRef: bindInputRef,
       style: style,
-      placeholder: props.placeholder,
+      placeholder: typeof props.placeholder === 'string' ? props.placeholder : undefined,
       value: inputText,
       maxLength: maxLength,
       onChange: onChange,
@@ -36261,7 +36274,7 @@ var ResultInput = function ResultInput(props) {
       className: styles.inputMirror,
       ref: mirrorRef,
       children: inputText || value
-    })]
+    }), renderResultPlaceholder()]
   });
 };
 /* harmony default export */ var result_input = (ResultInput);
@@ -36790,14 +36803,10 @@ var result_Result = function Result(props) {
     onResultItemClick === null || onResultItemClick === void 0 || onResultItemClick(e, item);
   };
   var renderInput = function renderInput() {
-    var placeholder2 = empty ? placeholder : '';
+    var _placeholder = empty ? placeholder : '';
     if (!multiple && valueProp && valueProp !== 0) {
       var _result = getDataByValues(value);
-      // 获取合法的 content
-      var content = renderResultContent(_result[0]);
-      if (typeof content === 'string') {
-        placeholder2 = content;
-      }
+      _placeholder = renderResultContent(_result[0]);
     }
     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, {
@@ -36815,7 +36824,7 @@ var result_Result = function Result(props) {
         convertBr: convertBr,
         onInputBlur: onInputBlur,
         onClearCreatedData: onClearCreatedData,
-        placeholder: placeholder2,
+        placeholder: _placeholder,
         disabled: isFunc(disabled) ? false : !!disabled
       })
     }, 'input');
@@ -48405,13 +48414,11 @@ var ListOption = function ListOption(props) {
 
 
 
-
 var list_List = function List(props) {
   var _jssStyle$select;
   var jssStyle = props.jssStyle,
     data = props.data,
     size = props.size,
-    header = props.header,
     keygen = props.keygen,
     datum = props.datum,
     multiple = props.multiple,
@@ -48419,7 +48426,6 @@ var list_List = function List(props) {
     _props$itemsInView = props.itemsInView,
     itemsInView = _props$itemsInView === void 0 ? 10 : _props$itemsInView,
     lineHeightProp = props.lineHeight,
-    loading = props.loading,
     controlType = props.controlType,
     hideCreateOption = props.hideCreateOption,
     optionListRef = props.optionListRef,
@@ -48521,16 +48527,6 @@ var list_List = function List(props) {
       }
     }
   });
-  var renderLoading = function renderLoading() {
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      children: "loading"
-    });
-  };
-  var renderHeader = function renderHeader() {
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-      children: "header"
-    });
-  };
   var renderItem = function renderItem(item, index, key) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(list_option, {
@@ -48557,7 +48553,6 @@ var list_List = function List(props) {
     });
   };
   var renderList = function renderList() {
-    if (loading) return renderLoading();
     return /*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
       virtualRef: virtualRef,
       data: data,
@@ -48582,9 +48577,9 @@ var list_List = function List(props) {
       };
     }
   }, []);
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+  return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
     className: rootClass,
-    children: [header && renderHeader(), renderList()]
+    children: renderList()
   });
 };
 /* harmony default export */ var select_list = (list_List);
@@ -50478,6 +50473,15 @@ function Select(props0) {
     }
     return /*#__PURE__*/(0,jsx_runtime.jsx)(select_list, objectSpread2_default()({}, listProps));
   };
+  var _useState5 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
+    _useState6 = slicedToArray_default()(_useState5, 2),
+    absoluteListUpdateKey = _useState6[0],
+    setAbsoluteListUpdateKey = _useState6[1];
+  // 当树形数据展开时，需要更新 AbsoluteList 的位置
+  var onExpandWrap = usePersistFn(function (value) {
+    onExpand === null || onExpand === void 0 || onExpand(value);
+    setAbsoluteListUpdateKey(value === null || value === void 0 ? void 0 : value.join(','));
+  });
   var renderTreeList = function renderTreeList() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(list_tree, {
       jssStyle: jssStyle,
@@ -50489,7 +50493,7 @@ function Select(props0) {
       height: height,
       defaultExpandAll: defaultExpandAll,
       defaultExpanded: defaultExpanded,
-      onExpand: onExpand,
+      onExpand: onExpandWrap,
       childrenKey: childrenKey,
       closePop: closePop,
       renderItem: renderItem,
@@ -50577,6 +50581,7 @@ function Select(props0) {
       popupGap: 4,
       popupElRef: popupRef,
       parentElRef: targetRef,
+      updateKey: absoluteListUpdateKey,
       children: /*#__PURE__*/(0,jsx_runtime.jsxs)(animation_list, {
         onRef: popupRef,
         show: open,
@@ -57374,7 +57379,7 @@ var emptyRef = {
     });
   };
   var renderTable = function renderTable() {
-    var _props$summary, _sticky$top, _props$data3, _props$data4;
+    var _props$summary, _sticky$top, _props$data3, _props$style, _props$data4;
     var Group = /*#__PURE__*/(0,jsx_runtime.jsx)(table_colgroup, {
       colgroup: colgroup,
       columns: columns,
@@ -57446,7 +57451,7 @@ var emptyRef = {
       css: sticky === null || sticky === void 0 ? void 0 : sticky.css,
       parent: tableRef === null || tableRef === void 0 ? void 0 : tableRef.current
     };
-    var isRenderBaseTable = !virtual && !isScrollY && !props.sticky && ((_props$data3 = props.data) === null || _props$data3 === void 0 ? 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) && !((_props$style = props.style) !== null && _props$style !== void 0 && _props$style.height) && !props.height;
     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));
     if (isRenderBaseTable) {
@@ -63708,7 +63713,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.3-beta.8'
+  version: '3.3.4'
 });
 }();
 /******/ 	return __webpack_exports__;