acud 0.0.65 → 0.0.68

package/es/upload/utils.js

@@ -23,7 +23,7 @@ export function updateFileList(file, fileList) {
   });
 
   if (fileIndex === -1) {
-    nextFileList.push(file);
+    nextFileList.unshift(file);
   } else {
     nextFileList[fileIndex] = file;
   }

package/lib/breadcrumb/BreadcrumbItem.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { BaseDropdownProps } from '../dropdown/dropdown';
 export interface BreadcrumbItemProps {
     prefixCls?: string;

package/lib/breadcrumb/BreadcrumbItem.js

@@ -11,7 +11,9 @@ exports["default"] = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var React = _interopRequireWildcard(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _acudIcon = require("acud-icon");
 
@@ -45,21 +47,32 @@ var BreadcrumbItem = function BreadcrumbItem(_a) {
       dropdownProps = _a.dropdownProps,
       restProps = __rest(_a, ["prefixCls", "separator", "children", "overlay", "dropdownProps"]);
 
-  var _React$useContext = React.useContext(_configProvider.ConfigContext),
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _React$useContext = _react["default"].useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls;
 
   var prefixCls = getPrefixCls('breadcrumb', customizePrefixCls);
+  var handleVisibleChange = (0, _react.useCallback)(function (visible) {
+    setVisible(visible);
+  }, []);
   /** If overlay is have Wrap a DropDown */
 
   var renderBreadcrumbNode = function renderBreadcrumbNode(breadcrumbItem) {
     if (overlay) {
-      return /*#__PURE__*/React.createElement(_dropdown["default"], (0, _extends2["default"])({
+      return /*#__PURE__*/_react["default"].createElement(_dropdown["default"], (0, _extends2["default"])({
         overlay: overlay,
+        visible: visible,
         placement: "bottomCenter",
         overlayClassName: "".concat(prefixCls, "-dropdown")
-      }, dropdownProps), /*#__PURE__*/React.createElement("span", {
+      }, dropdownProps, {
+        onVisibleChange: handleVisibleChange
+      }), /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(prefixCls, "-overlay-link")
-      }, breadcrumbItem, /*#__PURE__*/React.createElement(_acudIcon.OutlinedDown, null)));
+      }, breadcrumbItem, visible ? /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedUp, null) : /*#__PURE__*/_react["default"].createElement(_acudIcon.OutlinedDown, null)));
     }
 
     return breadcrumbItem;
@@ -68,11 +81,11 @@ var BreadcrumbItem = function BreadcrumbItem(_a) {
   var link;
 
   if ('href' in restProps) {
-    link = /*#__PURE__*/React.createElement("a", (0, _extends2["default"])({
+    link = /*#__PURE__*/_react["default"].createElement("a", (0, _extends2["default"])({
       className: "".concat(prefixCls, "-link")
     }, restProps), children);
   } else {
-    link = /*#__PURE__*/React.createElement("span", (0, _extends2["default"])({
+    link = /*#__PURE__*/_react["default"].createElement("span", (0, _extends2["default"])({
       className: "".concat(prefixCls, "-link")
     }, restProps), children);
   } // wrap to dropDown
@@ -81,7 +94,7 @@ var BreadcrumbItem = function BreadcrumbItem(_a) {
   link = renderBreadcrumbNode(link);
 
   if (children) {
-    return /*#__PURE__*/React.createElement("span", null, link, separator && /*#__PURE__*/React.createElement("span", {
+    return /*#__PURE__*/_react["default"].createElement("span", null, link, separator && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefixCls, "-separator")
     }, separator));
   }

package/lib/button/button.d.ts

@@ -31,6 +31,7 @@ export declare type NativeButtonProps = {
 export declare type ButtonProps = Partial<NativeButtonProps>;
 interface CompoundedComponent extends React.ForwardRefExoticComponent<ButtonProps & React.RefAttributes<HTMLElement>> {
     Group: typeof ButtonGroup;
+    __ACUD_BUTTON: boolean;
 }
 declare const Button: CompoundedComponent;
 export default Button;

package/lib/button/button.js

@@ -133,5 +133,6 @@ var Button = /*#__PURE__*/_react["default"].forwardRef(InternalButton);
 
 Button.displayName = 'Button';
 Button.Group = _buttonGroup["default"];
+Button.__ACUD_BUTTON = true;
 var _default = Button;
 exports["default"] = _default;

package/lib/cascader/index.js

@@ -37,8 +37,6 @@ var _OutlinedRight = _interopRequireDefault(require("acud-icon/lib/icons/Outline
 
 var _OutlinedRefresh = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedRefresh"));
 
-var _OutlinedClose = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedClose"));
-
 var _OutlinedDown = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedDown"));
 
 var _input = _interopRequireDefault(require("../input"));
@@ -47,6 +45,8 @@ var _tag = _interopRequireDefault(require("../tag"));
 
 var _tooltip = _interopRequireDefault(require("../tooltip"));
 
+var _clear = _interopRequireDefault(require("../clear"));
+
 var _Cascader = _interopRequireDefault(require("./Cascader"));
 
 var _renderEmpty = _interopRequireDefault(require("./renderEmpty"));
@@ -174,6 +174,7 @@ var Cascader = function Cascader(props, ref) {
   var cachedRef = (0, _react.useRef)({});
   var measureRef = (0, _react.useRef)();
   var pickerRef = (0, _react.useRef)();
+  var pickerLabelRef = (0, _react.useRef)();
   var tagsRef = (0, _react.useRef)();
 
   var _useState = (0, _react.useState)(props.value || props.defaultValue || []),
@@ -201,6 +202,11 @@ var Cascader = function Cascader(props, ref) {
       popupVisible = _useState10[0],
       setPopupVisible = _useState10[1];
 
+  var _useState11 = (0, _react.useState)(false),
+      _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
+      pickerLabelOverflow = _useState12[0],
+      setPickerLabelOverflow = _useState12[1];
+
   var isMulti = mode === 'multiple';
   var flattenOptions = (0, _react.useMemo)(function () {
     var showSearch = props.showSearch,
@@ -313,6 +319,11 @@ var Cascader = function Cascader(props, ref) {
       e.preventDefault();
     }
   }, []);
+  var handlePickerLabelHover = (0, _react.useCallback)(function () {
+    var ele = pickerLabelRef.current;
+    var overflow = (ele === null || ele === void 0 ? void 0 : ele.scrollWidth) > (ele === null || ele === void 0 ? void 0 : ele.clientWidth);
+    setPickerLabelOverflow(overflow);
+  }, []);
   var handleClick = (0, _react.useCallback)(function (e) {
     if (e.target !== inputRef.current) {
       var isIE = document.body.style.msTouchAction !== undefined;
@@ -530,7 +541,7 @@ var Cascader = function Cascader(props, ref) {
       animation: "spin"
     }));
 
-    var clearIcon = allowClear && !disabled && value.length > 0 || inputValue ? /*#__PURE__*/_react["default"].createElement(_OutlinedClose["default"], {
+    var clearIcon = allowClear && !disabled && value.length > 0 || inputValue ? /*#__PURE__*/_react["default"].createElement(_clear["default"], {
       className: "".concat(prefixCls, "-picker-clear"),
       onClick: handleSelectionClear
     }) : null;
@@ -659,10 +670,14 @@ var Cascader = function Cascader(props, ref) {
       style: style,
       className: pickerCls,
       disabled: disabled
+    }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+      title: pickerLabelOverflow ? label : undefined
     }, /*#__PURE__*/_react["default"].createElement("span", {
+      ref: pickerLabelRef,
       className: "".concat(prefixCls, "-picker-label"),
-      disabled: disabled
-    }, label), /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, inputProps, {
+      disabled: disabled,
+      onMouseOver: handlePickerLabelHover
+    }, label)), /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, inputProps, {
       tabIndex: -1,
       ref: inputRef,
       prefixCls: inputPrefixCls,
@@ -704,7 +719,7 @@ var Cascader = function Cascader(props, ref) {
       onPopupVisibleChange: handlePopupVisibleChange,
       onChange: handleValueChange
     }), input);
-  }, [props, isMulti, label, value, disabledValue, inputValue, inputWidth, inputFocused, popupVisible, blur, focus, getPopupPlacement, generateFilteredOptions, handleClick, handleMouseDown, handleInputClick, handleInputBlur, handleInputFocus, handleInputKeyDown, handleInputChange, handleSelectionClear, handleSelectionItemClear, handleValueChange, handlePopupVisibleChange]);
+  }, [props, isMulti, label, value, disabledValue, pickerLabelOverflow, inputValue, inputWidth, inputFocused, popupVisible, blur, focus, getPopupPlacement, generateFilteredOptions, handleClick, handleMouseDown, handlePickerLabelHover, handleInputClick, handleInputBlur, handleInputFocus, handleInputKeyDown, handleInputChange, handleSelectionClear, handleSelectionItemClear, handleValueChange, handlePopupVisibleChange]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       focus: focus,

package/lib/cascader/style/index.css

@@ -150,64 +150,9 @@
 .acud-cascader-picker-clear {
   position: absolute;
   top: 50%;
-  right: 32px;
+  right: 30px;
   z-index: 2;
-  width: 12px;
-  height: 12px;
-  margin-top: -6px;
-  line-height: 12px;
-  cursor: pointer;
-  border-radius: 50%;
-  text-align: center;
-  transition: color 0.3s ease, opacity 0.15s ease;
-}
-.acud-cascader-picker-clear.acuicon {
-  display: flex;
-  color: #FFFFFF;
-  background-color: #D4D6D9;
-  border-color: transparent;
-}
-.acud-cascader-picker-clear.acuicon:hover {
-  color: #FFFFFF;
-}
-.acud-cascader-picker-clear.acuicon:focus,
-.acud-cascader-picker-clear.acuicon:active {
-  color: #FFFFFF;
-}
-.acud-cascader-picker-clear.acuicon[disabled],
-.acud-cascader-picker-clear.acuicon[disabled]:hover,
-.acud-cascader-picker-clear.acuicon[disabled]:focus,
-.acud-cascader-picker-clear.acuicon[disabled]:active {
-  color: #FFFFFF;
-}
-.acud-cascader-picker-clear.acuicon:hover {
-  background-color: #5C5F66;
-}
-.acud-cascader-picker-clear.acuicon:focus,
-.acud-cascader-picker-clear.acuicon:active {
-  background-color: #303540;
-}
-.acud-cascader-picker-clear.acuicon[disabled],
-.acud-cascader-picker-clear.acuicon[disabled]:hover,
-.acud-cascader-picker-clear.acuicon[disabled]:focus,
-.acud-cascader-picker-clear.acuicon[disabled]:active {
-  background-color: #F2F2F4;
-}
-.acud-cascader-picker-clear.acuicon:hover {
-  border-color: transparent;
-}
-.acud-cascader-picker-clear.acuicon:focus,
-.acud-cascader-picker-clear.acuicon:active {
-  border-color: transparent;
-}
-.acud-cascader-picker-clear.acuicon[disabled],
-.acud-cascader-picker-clear.acuicon[disabled]:hover,
-.acud-cascader-picker-clear.acuicon[disabled]:focus,
-.acud-cascader-picker-clear.acuicon[disabled]:active {
-  border-color: transparent;
-}
-.acud-cascader-picker-clear > svg {
-  transform: scale(0.6);
+  margin-top: -8px;
 }
 .acud-cascader-picker-arrow {
   position: absolute;

package/lib/cascader/style/index.less

@@ -96,26 +96,11 @@
         }
 
         &-clear {
-            &.acuicon {
-                display: flex;
-                .basic-config(@cascader-picker-clear-tp, @cascader-picker-clear-p);
-            }
             position: absolute;
             top: 50%;
-            right: 8 * @P;
+            right: 7.5 * @P;
             z-index: 2;
-            width: 3 * @P;
-            height: 3 * @P;
-            margin-top: -1.5 * @P;
-            line-height: 12px;
-            cursor: pointer;
-            border-radius: 50%;
-            text-align: center;
-            transition: color .3s ease, opacity .15s ease;
-
-            & > svg {
-                transform: scale(.6);
-            }
+            margin-top: -2 * @P;
         }
 
         // arrow

package/lib/clear/index.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @file clear
+ * @author xuemin02
+ */
+import { IconProps } from 'acud-icon/lib/components/interface';
+import './style';
+export interface ClearProps extends IconProps {
+    ref?: any;
+    prefixCls?: string;
+}
+declare const Clear: (props: ClearProps) => JSX.Element;
+export default Clear;

package/lib/clear/index.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _OutlinedCloseBold = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedCloseBold"));
+
+var _configProvider = require("../config-provider");
+
+require("./style");
+
+/**
+ * @file clear
+ * @author xuemin02
+ */
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var Clear = function Clear(props) {
+  var customizePrefixCls = props.prefixCls,
+      className = props.className,
+      otherProps = __rest(props, ["prefixCls", "className"]);
+
+  var _React$useContext = _react["default"].useContext(_configProvider.ConfigContext),
+      getPrefixCls = _React$useContext.getPrefixCls;
+
+  var prefixCls = getPrefixCls('clear', customizePrefixCls);
+  var clearCls = (0, _classnames["default"])(prefixCls, className);
+  return /*#__PURE__*/_react["default"].createElement(_OutlinedCloseBold["default"], (0, _extends2["default"])({
+    className: clearCls
+  }, otherProps));
+};
+
+var _default = Clear;
+exports["default"] = _default;

package/lib/clear/style/css.js

@@ -0,0 +1,5 @@
+"use strict";
+
+require("../../style/index.css");
+
+require("./index.css");

package/lib/clear/style/index.css

@@ -0,0 +1,63 @@
+/* color */
+/* 默认颜色 */
+/* 通用-icon */
+/* 标签 */
+/* 默认颜色 */
+/* 其他颜色 */
+/* 通用 */
+/* 水平 */
+/* 垂直 */
+/* 序号水平 */
+/* 序号垂直 */
+.acud-clear.acudicon {
+  color: #FFFFFF;
+  background-color: #D4D6D9;
+  border-color: transparent;
+  padding: 2px;
+  background-clip: content-box;
+  border-radius: 50%;
+  font-size: 12px;
+  transition: color 0.3s ease, opacity 0.15s ease;
+}
+.acud-clear.acudicon:hover {
+  color: #FFFFFF;
+}
+.acud-clear.acudicon:focus,
+.acud-clear.acudicon:active {
+  color: #FFFFFF;
+}
+.acud-clear.acudicon[disabled],
+.acud-clear.acudicon[disabled]:hover,
+.acud-clear.acudicon[disabled]:focus,
+.acud-clear.acudicon[disabled]:active {
+  color: #FFFFFF;
+}
+.acud-clear.acudicon:hover {
+  background-color: #5C5F66;
+}
+.acud-clear.acudicon:focus,
+.acud-clear.acudicon:active {
+  background-color: #303540;
+}
+.acud-clear.acudicon[disabled],
+.acud-clear.acudicon[disabled]:hover,
+.acud-clear.acudicon[disabled]:focus,
+.acud-clear.acudicon[disabled]:active {
+  background-color: #F2F2F4;
+}
+.acud-clear.acudicon:hover {
+  border-color: transparent;
+}
+.acud-clear.acudicon:focus,
+.acud-clear.acudicon:active {
+  border-color: transparent;
+}
+.acud-clear.acudicon[disabled],
+.acud-clear.acudicon[disabled]:hover,
+.acud-clear.acudicon[disabled]:focus,
+.acud-clear.acudicon[disabled]:active {
+  border-color: transparent;
+}
+.acud-clear.acudicon > svg {
+  transform: scale(0.66666);
+}

package/lib/clear/style/index.d.ts

@@ -0,0 +1,2 @@
+import '../../style/index.less';
+import './index.less';

package/lib/clear/style/index.js

@@ -0,0 +1,5 @@
+"use strict";
+
+require("../../style/index.less");
+
+require("./index.less");

package/lib/clear/style/index.less

@@ -0,0 +1,18 @@
+@import '../../style/themes/index';
+@import '../../style/mixins/index';
+
+@clear-prefix-cls: ~'@{acud-prefix}-clear';
+
+.@{clear-prefix-cls}.acudicon {
+    .basic-config(@clear-tp, @clear-p);
+
+    padding: .5 * @P;
+    background-clip: content-box;
+    border-radius: 50%;
+    font-size: 12px;
+    transition: color .3s ease, opacity .15s ease;
+
+    & > svg {
+        transform: scale(.66666);
+    }
+}

package/lib/date-picker/generatePicker/generateRangePicker.js

@@ -29,8 +29,6 @@ var _OutlinedCalendar = _interopRequireDefault(require("acud-icon/lib/icons/Outl
 
 var _MultiToneClear = _interopRequireDefault(require("acud-icon/lib/icons/MultiToneClear"));
 
-var _FilledError = _interopRequireDefault(require("acud-icon/lib/icons/FilledError"));
-
 var _OutlinedTime = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedTime"));
 
 var _OutlinedMinus = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedMinus"));
@@ -55,6 +53,8 @@ var _LocaleReceiver = _interopRequireDefault(require("../../locale-provider/Loca
 
 var _util = require("../util");
 
+var _clear = _interopRequireDefault(require("../../clear"));
+
 var _ = require(".");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -143,7 +143,7 @@ function generateRangePicker(generateConfig) {
             ref: _this.pickerRef,
             placeholder: (0, _util.getRangePlaceholder)(picker, locale, placeholder),
             suffixIcon: picker === 'time' ? /*#__PURE__*/React.createElement(_OutlinedTime["default"], null) : /*#__PURE__*/React.createElement(_OutlinedCalendar["default"], null),
-            clearIcon: picker === 'time' ? /*#__PURE__*/React.createElement(_FilledError["default"], null) : /*#__PURE__*/React.createElement(_MultiToneClear["default"], null),
+            clearIcon: picker === 'time' ? /*#__PURE__*/React.createElement(_clear["default"], null) : /*#__PURE__*/React.createElement(_MultiToneClear["default"], null),
             allowClear: true,
             transitionName: "".concat(rootPrefixCls, "-slide-up")
           }, restProps, additionalOverrideProps, {

package/lib/date-picker/generatePicker/generateSinglePicker.js

@@ -31,8 +31,6 @@ var _OutlinedTime = _interopRequireDefault(require("acud-icon/lib/icons/Outlined
 
 var _MultiToneClear = _interopRequireDefault(require("acud-icon/lib/icons/MultiToneClear"));
 
-var _FilledError = _interopRequireDefault(require("acud-icon/lib/icons/FilledError"));
-
 var _OutlinedLeft = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedLeft"));
 
 var _OutlinedRight = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedRight"));
@@ -55,6 +53,8 @@ var _LocaleReceiver = _interopRequireDefault(require("../../locale-provider/Loca
 
 var _SizeContext = _interopRequireDefault(require("../../config-provider/SizeContext"));
 
+var _clear = _interopRequireDefault(require("../../clear"));
+
 var _ = require(".");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -146,7 +146,7 @@ function generatePicker(generateConfig) {
               ref: _this.pickerRef,
               placeholder: (0, _util.getPlaceholder)(mergedPicker, locale, placeholder),
               suffixIcon: mergedPicker === 'time' ? /*#__PURE__*/React.createElement(_OutlinedTime["default"], null) : /*#__PURE__*/React.createElement(_OutlinedCalendar["default"], null),
-              clearIcon: mergedPicker === 'time' ? /*#__PURE__*/React.createElement(_FilledError["default"], null) : /*#__PURE__*/React.createElement(_MultiToneClear["default"], null),
+              clearIcon: mergedPicker === 'time' ? /*#__PURE__*/React.createElement(_clear["default"], null) : /*#__PURE__*/React.createElement(_MultiToneClear["default"], null),
               allowClear: true,
               transitionName: "".concat(rootPrefixCls, "-slide-up")
             }, additionalProps, restProps, additionalOverrideProps, {

package/lib/date-picker/src/PickerPanel.js

@@ -127,6 +127,7 @@ function PickerPanel(props) {
       defaultOpenValue = panelContext.defaultOpenValue;
 
   var _React$useContext = React.useContext(_RangeContext["default"]),
+      inRange = _React$useContext.inRange,
       panelPosition = _React$useContext.panelPosition,
       rangedValue = _React$useContext.rangedValue,
       hoverRangedValue = _React$useContext.hoverRangedValue;
@@ -444,7 +445,9 @@ function PickerPanel(props) {
   return /*#__PURE__*/React.createElement(_PanelContext["default"].Provider, {
     value: (0, _extends2["default"])((0, _extends2["default"])({}, panelContext), {
       mode: mergedMode,
-      hideHeader: 'hideHeader' in props ? hideHeader : panelContext.hideHeader
+      hideHeader: 'hideHeader' in props ? hideHeader : panelContext.hideHeader,
+      hidePrevBtn: inRange && panelPosition === 'right',
+      hideNextBtn: inRange && panelPosition === 'left'
     })
   }, /*#__PURE__*/React.createElement("div", {
     tabIndex: tabIndex,

package/lib/date-picker/src/utils/uiUtil.js

@@ -177,15 +177,15 @@ function getDefaultFormat(format, picker, showTime, use12Hours) {
         break;
 
       case "week":
-        mergedFormat = "gggg.wo";
+        mergedFormat = "gggg-wo";
         break;
 
       case "month":
-        mergedFormat = "YYYY.MM";
+        mergedFormat = "YYYY-MM";
         break;
 
       case "quarter":
-        mergedFormat = "YYYY.[Q]Q";
+        mergedFormat = "YYYY-[Q]Q";
         break;
 
       case "year":
@@ -193,7 +193,7 @@ function getDefaultFormat(format, picker, showTime, use12Hours) {
         break;
 
       default:
-        mergedFormat = showTime ? "YYYY.MM.DD HH:mm:ss" : "YYYY.MM.DD";
+        mergedFormat = showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
     }
   }