naive-ui 2.23.0 → 2.23.1

package/es/date-picker/src/panel/use-dual-calendar.js

@@ -36,12 +36,13 @@ function useDualCalendar(props, type = 'datetime') {
     const nowRef = ref(Date.now());
     const isSelectingRef = ref(false);
     const memorizedStartDateTimeRef = ref(0);
-    const { value, dateFormat } = props;
+    const mergedDateFormatRef = computed(() => props.dateFormat || localeRef.value.dateFormat);
+    const { value } = props;
     const startDateInput = ref(Array.isArray(value)
-        ? format(value[0], dateFormat, panelCommon.dateFnsOptions.value)
+        ? format(value[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     const endDateInputRef = ref(Array.isArray(value)
-        ? format(value[1], dateFormat, panelCommon.dateFnsOptions.value)
+        ? format(value[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value)
         : '');
     if (Array.isArray(value)) {
         syncCalendarTimeWithValue(value);
@@ -98,9 +99,8 @@ function useDualCalendar(props, type = 'datetime') {
     watch(computed(() => props.value), (value) => {
         if (value !== null && Array.isArray(value)) {
             const [startMoment, endMoment] = value;
-            const { dateFormat } = props;
-            startDateInput.value = format(startMoment, dateFormat, panelCommon.dateFnsOptions.value);
-            endDateInputRef.value = format(endMoment, dateFormat, panelCommon.dateFnsOptions.value);
+            startDateInput.value = format(startMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+            endDateInputRef.value = format(endMoment, mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
             if (!isSelectingRef.value) {
                 syncCalendarTimeWithValue(value);
             }
@@ -318,7 +318,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInput(value) {
-        const date = strictParse(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (!props.value) {
                 const newValue = set(new Date(), {
@@ -343,7 +343,7 @@ function useDualCalendar(props, type = 'datetime') {
     }
     function handleEndDateInput(value) {
         /** strict check when input */
-        const date = strictParse(value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         if (isValid(date)) {
             if (props.value === null) {
                 const newValue = set(new Date(), {
@@ -367,7 +367,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleStartDateInputBlur() {
-        const date = strictParse(startDateInput.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(startDateInput.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if (isValid(date)) {
             if (value === null) {
@@ -392,7 +392,7 @@ function useDualCalendar(props, type = 'datetime') {
         }
     }
     function handleEndDateInputBlur() {
-        const date = strictParse(endDateInputRef.value, props.dateFormat, new Date(), panelCommon.dateFnsOptions.value);
+        const date = strictParse(endDateInputRef.value, mergedDateFormatRef.value, new Date(), panelCommon.dateFnsOptions.value);
         const { value } = props;
         if (isValid(date)) {
             if (value === null) {
@@ -425,12 +425,11 @@ function useDualCalendar(props, type = 'datetime') {
             endDateInputRef.value = '';
             return;
         }
-        const { dateFormat } = props;
         if (times === undefined) {
             times = value;
         }
-        startDateInput.value = format(times[0], dateFormat, panelCommon.dateFnsOptions.value);
-        endDateInputRef.value = format(times[1], dateFormat, panelCommon.dateFnsOptions.value);
+        startDateInput.value = format(times[0], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
+        endDateInputRef.value = format(times[1], mergedDateFormatRef.value, panelCommon.dateFnsOptions.value);
     }
     function handleStartTimePickerChange(value) {
         if (value === null)

package/es/date-picker/src/panel/use-panel-common.d.ts

@@ -2,13 +2,10 @@ import { PropType, ExtractPropTypes } from 'vue';
 import { Value, OnPanelUpdateValue, OnClose, Shortcuts, DefaultTime } from '../interface';
 declare const usePanelCommonProps: {
     readonly active: BooleanConstructor;
-    readonly dateFormat: {
-        readonly type: StringConstructor;
-        readonly default: "yyyy-MM-dd";
-    };
+    readonly dateFormat: StringConstructor;
     readonly timeFormat: {
         readonly type: StringConstructor;
-        readonly default: "HH:mm:ss";
+        readonly value: "HH:mm:ss";
     };
     readonly value: {
         readonly type: PropType<Value | null>;

package/es/date-picker/src/panel/use-panel-common.js

@@ -1,17 +1,13 @@
 import { computed, inject, ref, nextTick } from 'vue';
 import { useKeyboard } from 'vooks';
 import { datePickerInjectionKey } from '../interface';
-const DATE_FORMAT = 'yyyy-MM-dd';
 const TIME_FORMAT = 'HH:mm:ss';
 const usePanelCommonProps = {
     active: Boolean,
-    dateFormat: {
-        type: String,
-        default: DATE_FORMAT
-    },
+    dateFormat: String,
     timeFormat: {
         type: String,
-        default: TIME_FORMAT
+        value: TIME_FORMAT
     },
     value: {
         type: [Array, Number],

package/es/dialog/src/Dialog.d.ts

@@ -1107,27 +1107,27 @@ declare const _default: import("vue").DefineComponent<{
     handleNegativeClick: (e: MouseEvent) => void;
     handleCloseClick: () => void;
     cssVars: import("vue").ComputedRef<{
-        '--font-size': string;
-        '--icon-color': string;
-        '--bezier': string;
-        '--close-margin': string;
-        '--icon-margin': string;
-        '--icon-size': string;
-        '--close-size': string;
-        '--close-color': string;
-        '--close-color-hover': string;
-        '--close-color-pressed': string;
-        '--color': string;
-        '--text-color': string;
-        '--border-radius': string;
-        '--padding': string;
-        '--line-height': string;
-        '--border': string;
-        '--content-margin': string;
-        '--title-font-size': string;
-        '--title-font-weight': string;
-        '--title-text-color': string;
-        '--action-space': string;
+        '--n-font-size': string;
+        '--n-icon-color': string;
+        '--n-bezier': string;
+        '--n-close-margin': string;
+        '--n-icon-margin': string;
+        '--n-icon-size': string;
+        '--n-close-size': string;
+        '--n-close-color': string;
+        '--n-close-color-hover': string;
+        '--n-close-color-pressed': string;
+        '--n-color': string;
+        '--n-text-color': string;
+        '--n-border-radius': string;
+        '--n-padding': string;
+        '--n-line-height': string;
+        '--n-border': string;
+        '--n-content-margin': string;
+        '--n-title-font-size': string;
+        '--n-title-font-weight': string;
+        '--n-title-text-color': string;
+        '--n-action-space': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     icon?: unknown;

package/es/dialog/src/Dialog.js

@@ -83,27 +83,27 @@ export default defineComponent({
                 const { type, iconPlacement } = props;
                 const { common: { cubicBezierEaseInOut }, self: { fontSize, lineHeight, border, titleTextColor, textColor, color, closeColor, closeColorHover, closeColorPressed, borderRadius, titleFontWeight, titleFontSize, padding, iconSize, actionSpace, contentMargin, closeSize, [iconPlacement === 'top' ? 'iconMarginIconTop' : 'iconMargin']: iconMargin, [iconPlacement === 'top' ? 'closeMarginIconTop' : 'closeMargin']: closeMargin, [createKey('iconColor', type)]: iconColor } } = themeRef.value;
                 return {
-                    '--font-size': fontSize,
-                    '--icon-color': iconColor,
-                    '--bezier': cubicBezierEaseInOut,
-                    '--close-margin': closeMargin,
-                    '--icon-margin': iconMargin,
-                    '--icon-size': iconSize,
-                    '--close-size': closeSize,
-                    '--close-color': closeColor,
-                    '--close-color-hover': closeColorHover,
-                    '--close-color-pressed': closeColorPressed,
-                    '--color': color,
-                    '--text-color': textColor,
-                    '--border-radius': borderRadius,
-                    '--padding': padding,
-                    '--line-height': lineHeight,
-                    '--border': border,
-                    '--content-margin': contentMargin,
-                    '--title-font-size': titleFontSize,
-                    '--title-font-weight': titleFontWeight,
-                    '--title-text-color': titleTextColor,
-                    '--action-space': actionSpace
+                    '--n-font-size': fontSize,
+                    '--n-icon-color': iconColor,
+                    '--n-bezier': cubicBezierEaseInOut,
+                    '--n-close-margin': closeMargin,
+                    '--n-icon-margin': iconMargin,
+                    '--n-icon-size': iconSize,
+                    '--n-close-size': closeSize,
+                    '--n-close-color': closeColor,
+                    '--n-close-color-hover': closeColorHover,
+                    '--n-close-color-pressed': closeColorPressed,
+                    '--n-color': color,
+                    '--n-text-color': textColor,
+                    '--n-border-radius': borderRadius,
+                    '--n-padding': padding,
+                    '--n-line-height': lineHeight,
+                    '--n-border': border,
+                    '--n-content-margin': contentMargin,
+                    '--n-title-font-size': titleFontSize,
+                    '--n-title-font-weight': titleFontWeight,
+                    '--n-title-text-color': titleTextColor,
+                    '--n-action-space': actionSpace
                 };
             })
         };

package/es/dialog/src/styles/index.cssr.js

@@ -1,46 +1,46 @@
 import { asModal, c, cB, cE, cM, insideModal } from '../../../_utils/cssr'; // vars:
-// --icon-color
-// --bezier
-// --close-margin
-// --icon-margin
-// --icon-size
-// --close-size
-// --close-color
-// --close-color-hover
-// --close-color-pressed
-// --color
-// --text-color
-// --border-radius
-// --padding
-// --line-height
-// --border
-// --content-margin
-// --title-font-size
-// --title-font-weight
-// --title-text-color
-// --action-space
+// --n-icon-color
+// --n-bezier
+// --n-close-margin
+// --n-icon-margin
+// --n-icon-size
+// --n-close-size
+// --n-close-color
+// --n-close-color-hover
+// --n-close-color-pressed
+// --n-color
+// --n-text-color
+// --n-border-radius
+// --n-padding
+// --n-line-height
+// --n-border
+// --n-content-margin
+// --n-title-font-size
+// --n-title-font-weight
+// --n-title-text-color
+// --n-action-space
 
 export default c([cB('dialog', `
- line-height: var(--line-height);
+ line-height: var(--n-line-height);
  position: relative;
- background: var(--color);
- color: var(--text-color);
+ background: var(--n-color);
+ color: var(--n-text-color);
  box-sizing: border-box;
  margin: auto;
- border-radius: var(--border-radius);
- padding: var(--padding);
+ border-radius: var(--n-border-radius);
+ padding: var(--n-padding);
  transition: 
- border-color .3s var(--bezier),
- background-color .3s var(--bezier),
- color .3s var(--bezier);
+ border-color .3s var(--n-bezier),
+ background-color .3s var(--n-bezier),
+ color .3s var(--n-bezier);
  `, [cE('icon', {
-  color: 'var(--icon-color)'
+  color: 'var(--n-icon-color)'
 }), cM('bordered', {
-  border: 'var(--border)'
+  border: 'var(--n-border)'
 }), cM('icon-top', [cE('close', {
-  margin: 'var(--close-margin)'
+  margin: 'var(--n-close-margin)'
 }), cE('icon', {
-  margin: 'var(--icon-margin)'
+  margin: 'var(--n-icon-margin)'
 }), cE('content', {
   textAlign: 'center'
 }), cE('title', {
@@ -48,35 +48,35 @@ export default c([cB('dialog', `
 }), cE('action', {
   justifyContent: 'center'
 })]), cM('icon-left', [cE('icon', {
-  margin: 'var(--icon-margin)'
+  margin: 'var(--n-icon-margin)'
 })]), cE('close', `
- font-size: var(--close-size);
+ font-size: var(--n-close-size);
  position: absolute;
  right: 0;
  top: 0;
- margin: var(--close-margin);
- transition: .3s color var(--bezier);
+ margin: var(--n-close-margin);
+ transition: .3s color var(--n-bezier);
  z-index: 1;
  `), cE('content', `
- font-size: var(--font-size);
- margin: var(--content-margin);
+ font-size: var(--n-font-size);
+ margin: var(--n-content-margin);
  position: relative;
  word-break: break-word;
  `, [c('&:last-child', 'margin-bottom: 0;')]), cE('action', `
  display: flex;
  justify-content: flex-end;
  `, [c('> *:not(:last-child)', {
-  marginRight: 'var(--action-space)'
+  marginRight: 'var(--n-action-space)'
 })]), cE('icon', {
-  fontSize: 'var(--icon-size)',
-  transition: 'color .3s var(--bezier)'
+  fontSize: 'var(--n-icon-size)',
+  transition: 'color .3s var(--n-bezier)'
 }), cE('title', `
- transition: color .3s var(--bezier);
+ transition: color .3s var(--n-bezier);
  display: flex;
  align-items: center;
- font-size: var(--title-font-size);
- font-weight: var(--title-font-weight);
- color: var(--title-text-color);
+ font-size: var(--n-title-font-size);
+ font-weight: var(--n-title-font-weight);
+ color: var(--n-title-text-color);
  `), cB('dialog-icon-container', {
   display: 'flex',
   justifyContent: 'center'

package/es/dynamic-tags/src/DynamicTags.d.ts

@@ -2571,7 +2571,7 @@ declare const _default: import("vue").DefineComponent<{
         };
     }>;
     cssVars: import("vue").ComputedRef<{
-        '--input-width': string;
+        '--n-input-width': string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<{
     closable?: unknown;

package/es/dynamic-tags/src/DynamicTags.js

@@ -122,7 +122,7 @@ export default defineComponent({
             cssVars: computed(() => {
                 const { self: { inputWidth } } = themeRef.value;
                 return {
-                    '--input-width': inputWidth
+                    '--n-input-width': inputWidth
                 };
             })
         };

package/es/dynamic-tags/src/styles/index.cssr.js

@@ -2,5 +2,5 @@ import { cB } from '../../../_utils/cssr'; // vars:
 // --input-width
 
 export default cB('dynamic-tags', [cB('input', {
-  minWidth: 'var(--input-width)'
+  minWidth: 'var(--n-input-width)'
 })]);

package/es/form/src/Form.d.ts

@@ -34,15 +34,15 @@ declare const formProps: {
         readonly default: undefined;
     };
     readonly theme: PropType<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -65,15 +65,15 @@ declare const formProps: {
         labelTextAlignHorizontal: string;
     }, any>>;
     readonly themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -96,15 +96,15 @@ declare const formProps: {
         labelTextAlignHorizontal: string;
     }, any>>>;
     readonly builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -162,15 +162,15 @@ declare const _default: import("vue").DefineComponent<{
         readonly default: undefined;
     };
     readonly theme: PropType<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -193,15 +193,15 @@ declare const _default: import("vue").DefineComponent<{
         labelTextAlignHorizontal: string;
     }, any>>;
     readonly themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -224,15 +224,15 @@ declare const _default: import("vue").DefineComponent<{
         labelTextAlignHorizontal: string;
     }, any>>>;
     readonly builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -283,15 +283,15 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     size?: "small" | "medium" | "large" | undefined;
     theme?: import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -314,15 +314,15 @@ declare const _default: import("vue").DefineComponent<{
         labelTextAlignHorizontal: string;
     }, any> | undefined;
     themeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;
@@ -345,15 +345,15 @@ declare const _default: import("vue").DefineComponent<{
         labelTextAlignHorizontal: string;
     }, any>> | undefined;
     builtinThemeOverrides?: import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"Form", {
+        blankHeightSmall: string;
+        blankHeightMedium: string;
+        blankHeightLarge: string;
         lineHeight: string;
         labelTextColor: string;
         asteriskColor: string;
         feedbackTextColorError: string;
         feedbackTextColorWarning: string;
         feedbackTextColor: string;
-        blankHeightSmall: string;
-        blankHeightMedium: string;
-        blankHeightLarge: string;
         feedbackPadding: string;
         feedbackHeightSmall: string;
         feedbackHeightMedium: string;