shineout 3.8.0-beta.26 → 3.8.0-beta.28

package/cjs/index.js

@@ -522,5 +522,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.8.0-beta.26'
+  version: '3.8.0-beta.28'
 };

package/dist/shineout.js

@@ -12386,7 +12386,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.8.0-beta.26');
+/* harmony default export */ var version = ('3.8.0-beta.28');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -52218,6 +52218,27 @@ var FormItem = function FormItem(props) {
     var _labelTipRef$current2;
     labelText += " (tip: ".concat((_labelTipRef$current2 = labelTipRef.current) === null || _labelTipRef$current2 === void 0 ? void 0 : _labelTipRef$current2.textContent, ")");
   }
+  var renderError = function renderError() {
+    if (!showError) return null;
+    var uniqueErrors = errors;
+    if (errors.length > 1) {
+      uniqueErrors = errors.filter(function (error, index, self) {
+        return index === self.findIndex(function (t) {
+          return t.message === error.message;
+        });
+      });
+    }
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.error,
+      children: uniqueErrors.map(function (error, index) {
+        return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          children: error && /*#__PURE__*/(0,jsx_runtime.jsx)(error_trans, {
+            error: error
+          })
+        }, index);
+      })
+    });
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", objectSpread2_default()(objectSpread2_default()({
     className: classnames_default()(className, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()(defineProperty_default()({}, formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelTop, labelAlign === 'top'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalMiddle, labelAlign !== 'top' && labelVerticalAlign === 'middle'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperLabelVerticalBottom, labelAlign !== 'top' && labelVerticalAlign === 'bottom'), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperInline, inline), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperKeepHeight, keepErrorHeight), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperRequired, required), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperHideRequired, required === false), formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.wrapperTip, showError || tip))
   }, attributes), {}, {
@@ -52243,16 +52264,7 @@ var FormItem = function FormItem(props) {
         ref: labelTipRef,
         className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.tip,
         children: tip
-      }), showError && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-        className: formItemClasses === null || formItemClasses === void 0 ? void 0 : formItemClasses.error,
-        children: errors.map(function (error, index) {
-          return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-            children: error && /*#__PURE__*/(0,jsx_runtime.jsx)(error_trans, {
-              error: error
-            })
-          }, index);
-        })
-      })]
+      }), renderError()]
     }))]
   }));
 };
@@ -58633,7 +58645,7 @@ var list_list_List = function List(props) {
     return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: listClasses === null || listClasses === void 0 ? void 0 : listClasses.row,
       style: {
-        height: props.fixed ? lineHeight : 'auto'
+        height: props.fixed && !props.dynamicHeight ? lineHeight : 'auto'
       },
       children: columnData.map(function (item, rowIndex) {
         var index = rowIndex + columnIndex * colNum;
@@ -58641,6 +58653,35 @@ var list_list_List = function List(props) {
       })
     }, columnIndex);
   });
+  var DynamicRow = function DynamicRow(_ref) {
+    var columnData = _ref.columnData,
+      columnIndex = _ref.columnIndex,
+      setRowHeight = _ref.setRowHeight;
+    var rowRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
+    (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useLayoutEffect)(function () {
+      if (rowRef.current && setRowHeight) {
+        var rect = rowRef.current.getBoundingClientRect();
+        if (rect.height > 0) {
+          setRowHeight(columnIndex, rect.height);
+        }
+      }
+    });
+    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      ref: rowRef,
+      className: listClasses === null || listClasses === void 0 ? void 0 : listClasses.row,
+      children: columnData.map(function (item, rowIndex) {
+        var index = rowIndex + columnIndex * colNum;
+        return renderItem(item, index);
+      })
+    });
+  };
+  var renderDynamicColumn = usePersistFn(function (columnData, columnIndex, _relativeIndex, setRowHeight) {
+    return /*#__PURE__*/(0,jsx_runtime.jsx)(DynamicRow, {
+      columnData: columnData,
+      columnIndex: columnIndex,
+      setRowHeight: setRowHeight
+    }, columnIndex);
+  });
   var loadingPosition = props.loadingPosition || 'center';
   var renderCenterLoading = function renderCenterLoading() {
     if (!props.loading || loadingPosition !== 'center') return null;
@@ -58699,27 +58740,30 @@ var list_list_List = function List(props) {
   });
   var renderList = function renderList() {
     if (isEmpty) return null;
-    if (props.fixed) return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
-        data: columnData,
-        renderItem: renderColumn,
-        lineHeight: lineHeight,
-        rowsInView: rowsInView,
-        onScroll: handleVirtualScroll,
-        height: 'auto',
-        style: {
-          flex: '1',
-          minHeight: '0',
-          display: 'flex'
-        },
-        scrollerStyle: {
-          flex: 1,
-          minHeight: 0,
-          minWidth: 0,
-          overflow: 'auto'
-        }
-      }), renderFooter()]
-    });
+    if (props.fixed) {
+      return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)(virtual_scroll_list, {
+          data: columnData,
+          renderItem: props.dynamicHeight ? renderDynamicColumn : renderColumn,
+          lineHeight: lineHeight,
+          rowsInView: rowsInView,
+          onScroll: handleVirtualScroll,
+          height: 'auto',
+          style: {
+            flex: '1',
+            minHeight: '0',
+            display: 'flex'
+          },
+          scrollerStyle: {
+            flex: 1,
+            minHeight: 0,
+            minWidth: 0,
+            overflow: 'auto'
+          },
+          dynamicVirtual: props.dynamicHeight
+        }), renderFooter()]
+      });
+    }
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: listClasses === null || listClasses === void 0 ? void 0 : listClasses.scrollContainer,
       onScroll: handleListScroll,
@@ -72738,7 +72782,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.26'
+  version: '3.8.0-beta.28'
 });
 }();
 /******/ 	return __webpack_exports__;