shineout 3.7.0-beta.36 → 3.7.0-beta.38

package/cjs/date-picker/date-picker.js

@@ -4,8 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _react = require("react");
 var _base = require("@sheinx/base");
 var _shineoutStyle = require("@sheinx/shineout-style");
+var _hooks = require("@sheinx/hooks");
 var _useFieldCommon = _interopRequireDefault(require("../hooks/use-field-common"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,5 +30,30 @@ var BaseDatePicker = function BaseDatePicker(props) {
   }, props));
 };
 var _default = exports.default = function _default(props) {
-  return (0, _useFieldCommon.default)(props, BaseDatePicker);
+  var _useConfig = (0, _base.useConfig)(),
+    locale = _useConfig.locale;
+
+  // datepicker 默认值需要提格式化前处理，否则内部会根据 format 进行格式化并再次触发 onChange，参考 v1 v2 的 value hoc 行为
+  var defaultValue = (0, _react.useMemo)(function () {
+    if (props.defaultValue) {
+      var options = {
+        timeZone: props.timeZone,
+        weekStartsOn: Number((0, _base.getLocale)(locale, 'startOfWeek'))
+      };
+      var type = props.type || 'date';
+      var format = (0, _hooks.getFormat)(props.format, type);
+      var dateArr = (0, _hooks.convertValueToDateArr)(props.defaultValue, format, options);
+      var formattedDefaultValue = (0, _hooks.getFormatValueArr)({
+        dateArr: dateArr,
+        format: format,
+        type: type,
+        options: options
+      });
+      return props.range ? formattedDefaultValue : formattedDefaultValue[0];
+    }
+    return props.defaultValue;
+  }, []);
+  return (0, _useFieldCommon.default)(_objectSpread(_objectSpread({}, props), {}, {
+    defaultValue: defaultValue
+  }), BaseDatePicker);
 };

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.7.0-beta.36'
+  version: '3.7.0-beta.38'
 };

package/dist/shineout.js

@@ -6976,7 +6976,7 @@ var expand = [/*#__PURE__*/(0,jsx_runtime.jsx)("path", {
   clipRule: "evenodd",
   d: "M19.5 2C20.8807 2 22 3.11929 22 4.5V19.5C22 20.8807 20.8807 22 19.5 22H4.5C3.11929 22 2 20.8807 2 19.5V4.5C2 3.11929 3.11929 2 4.5 2H19.5ZM19.5 4H4.5C4.22386 4 4 4.22386 4 4.5V19.5C4 19.7761 4.22386 20 4.5 20H19.5C19.7761 20 20 19.7761 20 19.5V4.5C20 4.22386 19.7761 4 19.5 4ZM16 11C16.5523 11 17 11.4477 17 12C17 12.5128 16.614 12.9355 16.1166 12.9933L16 13C10.701 13 12.6557 13 8 13C7.44772 13 7 12.5523 7 12C7 11.4872 7.38604 11.0645 7.88338 11.0067L8 11C12.5606 11 10.8111 11 16 11Z"
 }, 0)];
-var pcHelpCircleFill = ['M11 0C13.9562 0 16.7292 1.17289 18.7782 3.22183C20.8271 5.27079 22 8.04381 22 11C22 13.9562 20.8271 16.7292 18.7782 18.7782C16.7292 20.8271 13.9562 22 11 22C8.04381 22 5.27079 20.8271 3.22182 18.7782C1.17289 16.7292 0 13.9562 0 11C0 8.04381 1.17289 5.27079 3.22183 3.22182C5.27079 1.17289 8.04381 0 11 0ZM11 15.3125C10.3097 15.3125 9.75 15.8721 9.75 16.5625C9.75 17.2528 10.3097 17.8125 11 17.8125C11.6903 17.8125 12.25 17.2528 12.25 16.5625C12.25 15.8721 11.6903 15.3125 11 15.3125ZM11 4.31245C8.79086 4.31245 7 6.10332 7 8.31245C7 8.86474 7.44772 9.31245 8 9.31245C8.55229 9.31245 9 8.86474 9 8.31245C9 7.20789 9.89543 6.31245 11 6.31245C12.1046 6.31245 13 7.20789 13 8.31245C13 9.41702 12.1046 10.3125 11 10.3125L10.8834 10.3192C10.386 10.3769 10 10.7996 10 11.3125V13.3125L10.0067 13.4291C10.0645 13.9264 10.4872 14.3125 11 14.3125L11.1166 14.3057C11.614 14.248 12 13.8253 12 13.3125V12.185L12.1553 12.1431C13.8012 11.6474 15 10.1199 15 8.31245C15 6.10332 13.2091 4.31245 11 4.31245Z'];
+var pcHelpCircleFill = ['M12 1C14.9562 1 17.7292 2.17289 19.7782 4.22183C21.8271 6.27079 23 9.04381 23 12C23 14.9562 21.8271 17.7292 19.7782 19.7782C17.7292 21.8271 14.9562 23 12 23C9.04381 23 6.27079 21.8271 4.22182 19.7782C2.17289 17.7292 1 14.9562 1 12C1 9.04381 2.17289 6.27079 4.22183 4.22182C6.27079 2.17289 9.04381 1 12 1ZM12 16.3125C11.3097 16.3125 10.75 16.8721 10.75 17.5625C10.75 18.2528 11.3097 18.8125 12 18.8125C12.6903 18.8125 13.25 18.2528 13.25 17.5625C13.25 16.8721 12.6903 16.3125 12 16.3125ZM12 5.31245C9.79086 5.31245 8 7.10332 8 9.31245C8 9.86474 8.44772 10.3125 9 10.3125C9.55229 10.3125 10 9.86474 10 9.31245C10 8.20789 10.8954 7.31245 12 7.31245C13.1046 7.31245 14 8.20789 14 9.31245C14 10.417 13.1046 11.3125 12 11.3125L11.8834 11.3192C11.386 11.3769 11 11.7996 11 12.3125V14.3125L11.0067 14.4291C11.0645 14.9264 11.4872 15.3125 12 15.3125L12.1166 15.3057C12.614 15.248 13 14.8253 13 14.3125V13.185L13.1553 13.1431C14.8012 12.6474 16 11.1199 16 9.31245C16 7.10332 14.2091 5.31245 12 5.31245Z'];
 var pcHelpCircleOutline = /*#__PURE__*/(0,jsx_runtime.jsx)("path", {
   fillRule: "evenodd",
   clipRule: "evenodd",
@@ -12227,7 +12227,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.7.0-beta.36');
+/* harmony default export */ var version = ('3.7.0-beta.38');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -14132,7 +14132,7 @@ var modalTokens = {
   modalPanelRadius: 'Radius-default',
   modalPanelFontSize: 'Font-14',
   modalHeaderIconMarginEnd: 'Spacing-8',
-  modalHeaderIconMarginTop: 'Spacing-4',
+  modalHeaderIconMarginTop: 'Spacing-3',
   modalHeaderIconSize: 'Size-9',
   modalHeaderCloseMarginXStart: 'Spacing-16',
   modalHeaderCloseSize: 'Size-8',
@@ -36690,7 +36690,10 @@ var Carousel = function Carousel(props) {
     _props$indicatorPosit = props.indicatorPosition,
     indicatorPosition = _props$indicatorPosit === void 0 ? 'center' : _props$indicatorPosit,
     _props$indicatorType = props.indicatorType,
-    indicatorType = _props$indicatorType === void 0 ? 'circle' : _props$indicatorType;
+    indicatorType = _props$indicatorType === void 0 ? 'circle' : _props$indicatorType,
+    itemClassName = props.itemClassName,
+    _props$showIndicator = props.showIndicator,
+    showIndicator = _props$showIndicator === void 0 ? true : _props$showIndicator;
   var total = external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.toArray(props.children).length;
   var carouselClasses = (_props$jssStyle = props.jssStyle) === null || _props$jssStyle === void 0 || (_props$jssStyle$carou = _props$jssStyle.carousel) === null || _props$jssStyle$carou === void 0 ? void 0 : _props$jssStyle$carou.call(_props$jssStyle);
   var config = useConfig();
@@ -36712,7 +36715,7 @@ var Carousel = function Carousel(props) {
         height: (_props$style = props.style) === null || _props$style === void 0 ? void 0 : _props$style.height
       },
       children: external_root_React_commonjs2_react_commonjs_react_amd_react_default().Children.map(props.children, function (child, index) {
-        var itemClasses = classnames_default()(carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.item, index === current && (carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.itemCurrent), index === pre && pre !== current && (carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.itemPre));
+        var itemClasses = classnames_default()(carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.item, index === current && (carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.itemCurrent), index === pre && pre !== current && (carouselClasses === null || carouselClasses === void 0 ? void 0 : carouselClasses.itemPre), itemClassName);
         return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: itemClasses,
           children: child
@@ -36752,7 +36755,7 @@ var Carousel = function Carousel(props) {
     });
   };
   var renderIndicator = function renderIndicator() {
-    if (total <= 1) return null;
+    if (total <= 1 && typeof indicatorType !== 'function' || showIndicator === false) return null;
     var content = null;
     if (typeof indicatorType === 'function') {
       content = indicatorType(current, func.moveTo);
@@ -44805,6 +44808,18 @@ var getDefaultMode = function getDefaultMode(type) {
   var mode = getTypeMode(type);
   return [mode, mode];
 };
+var getFormatValueArr = function getFormatValueArr(opts) {
+  var dateArr = opts.dateArr,
+    format = opts.format,
+    clearWithUndefined = opts.clearWithUndefined,
+    options = opts.options,
+    type = opts.type;
+  var fmt = use_datepicker_format_getFormat(format, type);
+  return dateArr.map(function (item) {
+    if (!item) return clearWithUndefined ? undefined : '';
+    return util.format(item, fmt, options);
+  });
+};
 var useDatePickerFormat = function useDatePickerFormat(props) {
   var value = props.value,
     onChange = props.onChange,
@@ -47523,6 +47538,8 @@ var DatePicker = function DatePicker(props0) {
 
 
 
+
+
 var date_picker_jssStyle = {
   datePicker: useDatePickerStyle,
   button: useButtonStyle,
@@ -47536,7 +47553,32 @@ var BaseDatePicker = function BaseDatePicker(props) {
   }, props));
 };
 /* harmony default export */ var src_date_picker_date_picker_0 = (function (props) {
-  return use_field_common(props, BaseDatePicker);
+  var _useConfig = useConfig(),
+    locale = _useConfig.locale;
+
+  // datepicker 默认值需要提格式化前处理，否则内部会根据 format 进行格式化并再次触发 onChange，参考 v1 v2 的 value hoc 行为
+  var defaultValue = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (props.defaultValue) {
+      var options = {
+        timeZone: props.timeZone,
+        weekStartsOn: Number(getLocale(locale, 'startOfWeek'))
+      };
+      var type = props.type || 'date';
+      var format = use_datepicker_format_getFormat(props.format, type);
+      var dateArr = convertValueToDateArr(props.defaultValue, format, options);
+      var formattedDefaultValue = getFormatValueArr({
+        dateArr: dateArr,
+        format: format,
+        type: type,
+        options: options
+      });
+      return props.range ? formattedDefaultValue : formattedDefaultValue[0];
+    }
+    return props.defaultValue;
+  }, []);
+  return use_field_common(objectSpread2_default()(objectSpread2_default()({}, props), {}, {
+    defaultValue: defaultValue
+  }), BaseDatePicker);
 });
 ;// CONCATENATED MODULE: ./src/date-picker/index.ts
 
@@ -49992,7 +50034,8 @@ var useForm = function useForm(props) {
       resetTime: 0,
       mounted: false,
       unmounted: false,
-      removeLock: false
+      removeLock: false,
+      settingMap: {}
     }),
     context = _React$useRef.current;
   var update = function update(name) {
@@ -50229,6 +50272,8 @@ var useForm = function useForm(props) {
         // upload组件返回的可能是函数: (prev) => [...prev, file]
         var valueOfKey = typeof vals[key] === 'function' ? vals[key](getValue(key)) : vals[key];
         deepSet(draft, key, valueOfKey, deepSetOptions);
+        // 设置 settingMap 用于标记该字段正在被设置值
+        context.settingMap[key] = true;
       });
       values.forEach(function (key) {
         if (option.validate) {
@@ -50239,6 +50284,13 @@ var useForm = function useForm(props) {
           });
         }
       });
+
+      // 设置 settingMap 的值为 false，表示该字段设置值完成
+      setTimeout(function () {
+        values.forEach(function (key) {
+          delete context.settingMap[key];
+        });
+      });
     });
 
     // 获取vals的所有key,包括嵌套对象的key
@@ -50419,11 +50471,18 @@ var useForm = function useForm(props) {
       context.updateMap[n].add(updateFn);
       var shouldTriggerResetChange = context.removeArr.has(n);
       context.removeArr.delete(n);
-      var shouldTriggerDefaultChange = df !== undefined && deepGet(context.value, n) === undefined;
+      var currentValue = deepGet(context.value, n);
+      var shouldTriggerDefaultChange = df !== undefined && currentValue === undefined;
       if (shouldTriggerDefaultChange || shouldTriggerResetChange) {
         if (!context.mounted) context.defaultValues[n] = df;
+        var _defaultValue = df;
+
+        // 如果组件是重新 bind ，比如更改了 key 或者通过三元表达式切换了组件但 name 都是相同的情况下，在切换过程中改了 value 的值（比如通过 datum.set），需要阻止 defaultValue 的上位，按照当前的 value 来设置 defaultValue
+        if (shouldTriggerResetChange && context.settingMap[n]) {
+          _defaultValue = currentValue !== undefined ? currentValue : df;
+        }
         onChange(function (v) {
-          deepSet(v, n, df, deepSetOptions);
+          deepSet(v, n, _defaultValue, deepSetOptions);
         });
         update(n);
       }
@@ -54042,6 +54101,7 @@ var TreeCheckbox = function TreeCheckbox(props) {
 
 
 var NodeContent = function NodeContent(props) {
+  var _jssStyle$common;
   var jssStyle = props.jssStyle,
     id = props.id,
     virtual = props.virtual,
@@ -54079,7 +54139,7 @@ var NodeContent = function NodeContent(props) {
   var disabled = isDisabled(id);
   bindUpdate(id, forceUpdate);
   var contentStyle = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.tree()) || {};
-  var commonStyles = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.common()) || {};
+  var commonStyles = (jssStyle === null || jssStyle === void 0 || (_jssStyle$common = jssStyle.common) === null || _jssStyle$common === void 0 ? void 0 : _jssStyle$common.call(jssStyle)) || {};
   var rootClass = classnames_default()(contentStyle.contentWrapper, defineProperty_default()(defineProperty_default()(defineProperty_default()({}, contentStyle.childnode, data[childrenKey] && data[childrenKey].length > 0), contentStyle.inlineContent, inlineNode), contentStyle.contentDisabled, disabled));
   var contentClass = classnames_default()(contentStyle.content, isString(contentClassProp) && contentClassProp, isFunc(contentClassProp) && contentClassProp(data));
   var hasExpandIcons = expandIcons !== undefined;
@@ -62845,33 +62905,17 @@ var FilterSelect = function FilterSelect(props) {
   var config = filter.config;
   var currentFilter = (_props$filterInfo = props.filterInfo) === null || _props$filterInfo === void 0 ? void 0 : _props$filterInfo.get(props.columnKey);
   var treeOptions = (config === null || config === void 0 ? void 0 : config.data) || [];
-  var onReset = function onReset() {
-    setTempValue(undefined);
-    props.onFilterChange(props.columnKey, undefined);
-    setPopoverVisible(false);
-  };
-  var onConfirm = function onConfirm() {
-    props.onFilterChange(props.columnKey, tempValue);
-    setPopoverVisible(false);
-  };
-  var onVisibleChange = function onVisibleChange(visible) {
-    // 关闭popover时就提交筛选条件，包括click away触发的
-    if (!visible) {
-      props.onFilterChange(props.columnKey, tempValue);
-    }
-    setPopoverVisible(visible);
-  };
   var treeKeygen = function treeKeygen(d) {
     return d.value;
   };
   var treeProps = config !== null && config !== void 0 && config.multiple ? {
-    value: currentFilter === null || currentFilter === void 0 ? void 0 : currentFilter.value,
+    value: tempValue,
     onChange: function onChange(v) {
       setTempValue(v);
     },
     renderItem: (config === null || config === void 0 ? void 0 : config.renderItem) || 'label'
   } : {
-    active: currentFilter === null || currentFilter === void 0 ? void 0 : currentFilter.value,
+    active: tempValue,
     setActive: function setActive(v) {
       setTempValue(v);
     },
@@ -62904,7 +62948,24 @@ var FilterSelect = function FilterSelect(props) {
     onFilter = _useFilter.onFilter,
     inputText = _useFilter.inputText,
     setInputText = _useFilter.setInputText;
-  var displayData = filterData || rawData;
+  var onReset = function onReset() {
+    setTempValue(undefined);
+    setInputText('');
+    props.onFilterChange(props.columnKey, undefined);
+    setPopoverVisible(false);
+  };
+  var onConfirm = function onConfirm() {
+    props.onFilterChange(props.columnKey, tempValue);
+    setPopoverVisible(false);
+  };
+  var onVisibleChange = function onVisibleChange(visible) {
+    // 关闭popover时就提交筛选条件，包括click away触发的
+    if (!visible) {
+      props.onFilterChange(props.columnKey, tempValue);
+    }
+    setPopoverVisible(visible);
+  };
+  var displayData = inputText ? filterData || rawData : rawData;
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(base_src_button_button, {
     jssStyle: props.jssStyle,
     shape: "circle",
@@ -71214,7 +71275,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.36'
+  version: '3.7.0-beta.38'
 });
 }();
 /******/ 	return __webpack_exports__;