shineout 3.8.0-beta.46 → 3.8.0-beta.48

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.46'
+  version: '3.8.0-beta.48'
 };

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.46');
+/* harmony default export */ var version = ('3.8.0-beta.48');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -21815,10 +21815,10 @@ var messageStyle = objectSpread2_default()(objectSpread2_default()({
   },
   itemDismissed: {
     ' [data-soui-position="bottom-left"] &': {
-      animation: "$left-out ".concat(message_animationDuration, " ease-in-out")
+      animation: "$left-out ".concat(message_animationDuration, " ease-in-out forwards")
     },
     ' [data-soui-position="bottom-right"] &': {
-      animation: "$right-out ".concat(message_animationDuration, " ease-in-out")
+      animation: "$right-out ".concat(message_animationDuration, " ease-in-out forwards")
     }
   },
   itemShow: {
@@ -30649,26 +30649,11 @@ var usePopup = function usePopup(props) {
     }
     setOpenState(!!props.open);
   }, [props.open]);
-
-  // const getPopUpHeight = () => {
-  //   let height = 0;
-  //   if (popupRef.current) {
-  //     const el = popupRef.current;
-  //     const parent = el?.parentElement;
-  //     let clone = el.cloneNode(true) as HTMLElement;
-  //     clone.style.opacity = '0';
-  //     clone.style.display = '';
-  //     clone.style.visibility = 'visible';
-  //     clone.style.pointerEvents = 'none';
-  //     parent?.appendChild(clone);
-  //     height = clone.offsetHeight;
-  //     parent?.removeChild(clone);
-  //     //@ts-ignore
-  //     clone = null;
-  //   }
-  //   return height;
-  // };
-
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (defaultOpen) {
+      setOpenState(true);
+    }
+  }, []);
   var handleFocus = function handleFocus(delay) {
     if (props.open === undefined) {
       updatePosition();
@@ -43617,7 +43602,9 @@ function useFormControl(props) {
     var errors = arguments.length > 1 ? arguments[1] : undefined;
     var severErrors = arguments.length > 2 ? arguments[2] : undefined;
     if (!name) return;
-    if (isArray(name)) {
+    // 加入defaultValue的判断，让其只对 https://github.com/sheinsight/shineout-next/pull/742 的场景生效
+    // 如果不加入defaultValue的判断，会导致 8ea43144-36a5-403a-9147-59d54087a110 的问题
+    if (isArray(name) && defaultValue !== undefined) {
       var _value = getValue(name, formValue);
       var _error = getError(name, errors, severErrors);
       if (_error !== errorState) {
@@ -43743,8 +43730,27 @@ function useFormControl(props) {
     if (onChangePo) onChangePo.apply(void 0, [v].concat(other));
     if (validateFieldSet) validateFieldSet();
   });
+  var initError = use_persist_fn(function () {
+    var errors = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getErrors();
+    if (isArray(name)) {
+      for (var i = 0; i < name.length; i++) {
+        var n = name[i];
+        var currentErrorInForm = errors === null || errors === void 0 ? void 0 : errors[n];
+        if (currentErrorInForm) {
+          setErrorState(currentErrorInForm);
+          break;
+        }
+      }
+    } else {
+      var _currentErrorInForm = errors === null || errors === void 0 ? void 0 : errors[name];
+      if (_currentErrorInForm) {
+        setErrorState(_currentErrorInForm);
+      }
+    }
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (inForm && controlFunc) {
+      initError();
       if (isArray(name)) {
         var dv = isArray(defaultValue) ? defaultValue : [];
         name.forEach(function (n, index) {
@@ -51144,11 +51150,15 @@ var SchemaBuilder = /*#__PURE__*/function () {
               }
               if (componentElement.props.multiple) {
                 fieldSchemaInfo.type = 'array';
-                fieldSchemaInfo.items = {
-                  type: itemType
-                };
+                if (itemType !== 'undefined') {
+                  fieldSchemaInfo.items = {
+                    type: itemType
+                  };
+                }
               } else {
-                fieldSchemaInfo.type = itemType;
+                if (itemType !== 'undefined') {
+                  fieldSchemaInfo.type = itemType;
+                }
               }
               if (itemType === 'object') {
                 // 对于对象类型，使用 oneOf 而不是 enum
@@ -51689,6 +51699,9 @@ var useForm = function useForm(props) {
       context.removeArr.forEach(function (n) {
         deepRemove(v, n);
         context.removeArr.delete(n);
+        if (context.errors[n]) {
+          delete context.errors[n];
+        }
       });
     });
   };
@@ -51925,9 +51938,6 @@ var useForm = function useForm(props) {
         context.names.delete(n);
         delete context.defaultValues[n];
       }
-      if (context.errors[n]) {
-        delete context.errors[n];
-      }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
       if (!finalReserveAble && !context.removeLock) {
         addRemove(n);
@@ -54546,7 +54556,8 @@ var useNumberFormat = function useNumberFormat(props) {
     _props$step = props.step,
     step = _props$step === void 0 ? 1 : _props$step,
     cancelBlurChange = props.cancelBlurChange,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    coin = props.coin;
   var getStringValue = function getStringValue(value) {
     if (value === undefined) return value;
     if (typeof value === 'number') {
@@ -54665,6 +54676,7 @@ var useNumberFormat = function useNumberFormat(props) {
     numType: numType,
     integerLimit: integerLimit,
     digits: digits,
+    coin: coin,
     onChange: onNumberChange,
     onBlur: onNumberBlur,
     onFocus: props.onFocus,
@@ -54678,7 +54690,7 @@ var useNumberFormat = function useNumberFormat(props) {
 ;// CONCATENATED MODULE: ../base/src/input/input-number.tsx
 
 
-var input_number_excluded = ["jssStyle", "hideArrow", "numType", "integerLimit", "digits", "min", "max", "step", "allowNull"],
+var input_number_excluded = ["jssStyle", "hideArrow", "numType", "integerLimit", "digits", "min", "max", "step", "allowNull", "coin"],
   input_number_excluded2 = ["onMinus", "onPlus"];
 
 
@@ -54700,6 +54712,7 @@ var InputNumber = function InputNumber(props) {
     max = commonProps.max,
     step = commonProps.step,
     allowNull = commonProps.allowNull,
+    coin = commonProps.coin,
     restProps = objectWithoutProperties_default()(commonProps, input_number_excluded);
   var inputStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$input = jssStyle.input) === null || _jssStyle$input === void 0 ? void 0 : _jssStyle$input.call(jssStyle);
   var numberFormatParams = {
@@ -54711,7 +54724,8 @@ var InputNumber = function InputNumber(props) {
     min: min,
     max: max,
     step: step,
-    allowNull: allowNull
+    allowNull: allowNull,
+    coin: coin
   };
   var _useInputNumber = use_input_number(objectSpread2_default()({
       value: commonProps.value,
@@ -73000,7 +73014,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.8.0-beta.46'
+  version: '3.8.0-beta.48'
 });
 }();
 /******/ 	return __webpack_exports__;