shineout 3.6.0-beta.29 → 3.6.0-beta.30

package/cjs/index.js

@@ -514,5 +514,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.6.0-beta.29'
+  version: '3.6.0-beta.30'
 };

package/dist/shineout.js

@@ -12139,7 +12139,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.6.0-beta.29');
+/* harmony default export */ var version = ('3.6.0-beta.30');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -29642,6 +29642,11 @@ var usePopup = function usePopup(props) {
       updatePosition();
     }
     setOpenState(!!props.open);
+
+    // 外部传了open时，需要正常的触发onCollapse；触发了onCollapse才能让组件内部的edit状态正确，否则可能会出现弹出层打开了但是用户却无法选择的情况
+    if (props.open !== undefined) {
+      changeOpen(!!props.open);
+    }
   }, [props.open]);
 
   // const getPopUpHeight = () => {
@@ -39609,6 +39614,8 @@ var Result = function Result(props) {
     var dis = info.index === 1 ? disabledRight : disabledLeft;
     var className = classnames_default()(styles === null || styles === void 0 ? void 0 : styles.resultText, info.target && (styles === null || styles === void 0 ? void 0 : styles.placeholder), dis && (styles === null || styles === void 0 ? void 0 : styles.resultTextDisabled), info.index === activeIndex && (styles === null || styles === void 0 ? void 0 : styles.resultTextActive));
     var formFieldId = (fieldId === null || fieldId === void 0 ? void 0 : fieldId.split(separator)) || [];
+    var inputValue = info.target || info.value || '';
+    var displayValue = props.type === 'week' && inputValue ? "".concat(inputValue).concat(getLocale(locale, 'weekShort')) : inputValue;
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: className,
       id: formFieldId[info.index],
@@ -39624,7 +39631,7 @@ var Result = function Result(props) {
           readOnly: !info.inputable,
           open: !!open,
           inputRef: inputRef,
-          value: info.target || info.value || '',
+          value: displayValue,
           placeholder: info.place,
           onChange: function onChange(s) {
             _onChange(s, info.index);
@@ -44166,6 +44173,10 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     if (props.formatResult) {
       if (typeof props.formatResult === 'string') {
         return getFormatValueArr(dateArr, props.formatResult);
+      } else if (typeof props.formatResult === 'function') {
+        return dateArr.map(function (item) {
+          return props.formatResult(item);
+        });
       } else {
         return dateArr.map(function (item) {
           if (!item) return '';
@@ -45100,6 +45111,7 @@ var Day = function Day(props) {
       if (match) format = match[0];
     }
     var showNeedConfirm = props.needConfirm && !props.range;
+    if (props.type !== 'datetime' && props.type !== 'date' && !showNeedConfirm) return null;
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: styles === null || styles === void 0 ? void 0 : styles.pickerFooter,
       dir: direction,
@@ -45129,13 +45141,13 @@ var Day = function Day(props) {
           marginRight: showNeedConfirm ? 'auto' : undefined,
           paddingLeft: showNeedConfirm ? props.type === 'date' ? 22 : 6 : undefined
         },
-        children: [props.showSelNow && props.type === 'date' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
+        children: [props.type === 'date' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
           type: "primary",
           jssStyle: jssStyle,
           className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
           onClick: selNow,
           children: getLocale(locale, 'now')
-        }), props.showSelNow && props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
+        }), props.type === 'datetime' && /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_link_link, {
           type: "primary",
           jssStyle: jssStyle,
           className: styles === null || styles === void 0 ? void 0 : styles.pickerFooterBtn,
@@ -50431,11 +50443,28 @@ var use_form_flow_UseFormItem = function UseFormItem(props) {
 /* harmony default export */ var use_form_flow = (use_form_flow_UseFormItem);
 ;// CONCATENATED MODULE: ../base/src/form/form-flow.tsx
 
+
 var FormFlow = function FormFlow(props) {
+  var _props$names;
   var datum = use_form_flow({
     names: props.names
   });
-  if (isFunc(props.children)) return props.children(datum);
+  var valueOfNames = (_props$names = props.names) === null || _props$names === void 0 ? void 0 : _props$names.map(function (name) {
+    return datum === null || datum === void 0 ? void 0 : datum.get(name);
+  });
+  var memoizedResult = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (!props.strict) return;
+    if (isFunc(props.children)) {
+      return props.children(datum);
+    }
+    return props.children;
+  }, [valueOfNames === null || valueOfNames === void 0 ? void 0 : valueOfNames.toString()]);
+  if (props.strict) {
+    return memoizedResult;
+  }
+  if (isFunc(props.children)) {
+    return props.children(datum);
+  }
   return props.children;
 };
 /* harmony default export */ var form_flow = (FormFlow);
@@ -55600,36 +55629,36 @@ var PaginationJumper = function PaginationJumper(props) {
     total = props.total,
     pageSize = props.pageSize,
     disabled = props.disabled,
-    current = props.current,
     text = props.text,
     onChange = props.onChange;
   var paginationStyle = jssStyle === null || jssStyle === void 0 || (_jssStyle$pagination = jssStyle.pagination) === null || _jssStyle$pagination === void 0 ? void 0 : _jssStyle$pagination.call(jssStyle);
   var rootClasses = classnames_default()(paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.section, paginationStyle === null || paginationStyle === void 0 ? void 0 : paginationStyle.jumper);
   var txt = text.jumper ? text.jumper.split('{input}') : [];
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(String(current)),
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(''),
     _useState2 = slicedToArray_default()(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
   var getMax = function getMax() {
     return Math.ceil(total / pageSize) || 1;
   };
+  var cleatInternalState = function cleatInternalState() {
+    setValue('');
+  };
   var handleKeyDown = function handleKeyDown(e) {
     if (e.key === 'Enter' || e.keyCode === 13) {
-      var _current = parseInt(e.target.value, 10);
-      if (!Number.isFinite(_current)) return;
-      if (_current < 1) _current = 1;
+      var current = parseInt(e.target.value, 10);
+      if (!Number.isFinite(current)) return;
+      if (current < 1) current = 1;
       var max = getMax();
-      if (_current > max) _current = max;
-      onChange(_current);
-      setValue(String(_current));
+      if (current > max) current = max;
+      onChange(current);
+      setValue(String(current));
+      setTimeout(cleatInternalState, 20);
     }
   };
   var handleChange = function handleChange(v) {
     setValue(v || '');
   };
-  var handleBlur = function handleBlur() {
-    setValue(String(current));
-  };
   var renderInput = function renderInput() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_input_input, {
       jssStyle: jssStyle,
@@ -55642,7 +55671,7 @@ var PaginationJumper = function PaginationJumper(props) {
       disabled: disabled,
       onChange: handleChange,
       onKeyDown: handleKeyDown,
-      onBlur: handleBlur
+      onBlur: cleatInternalState
     });
   };
   var renderPrefixText = function renderPrefixText() {
@@ -55657,9 +55686,6 @@ var PaginationJumper = function PaginationJumper(props) {
       children: txt[1]
     }) : undefined;
   };
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    setValue(String(current));
-  }, [current]);
   if (simple) {
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: rootClasses,
@@ -56040,7 +56066,6 @@ var PaginationSimple = function PaginationSimple(props) {
       total: total,
       text: text,
       size: size,
-      current: current,
       pageSize: pageSize,
       onChange: onChange
     });
@@ -56198,7 +56223,6 @@ var Pagination = function Pagination(props) {
           return /*#__PURE__*/(0,jsx_runtime.jsx)(pagination_jumper, objectSpread2_default()(objectSpread2_default()({}, props), {}, {
             text: text,
             total: total,
-            current: current,
             pageSize: pageSize,
             onChange: onChange
           }), i);
@@ -69605,7 +69629,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.29'
+  version: '3.6.0-beta.30'
 });
 }();
 /******/ 	return __webpack_exports__;