@deot/vc-components 1.0.9 → 1.0.10

package/dist/index.cjs

@@ -3126,6 +3126,10 @@ const props$Y = {
   changeOnSelect: {
     type: Boolean,
     default: false
+  },
+  nullValue: {
+    type: [Number, String, Object],
+    default: ""
   }
 };
 
@@ -4421,6 +4425,7 @@ const DEFAULT_FORMATS = {
   datetime: "YYYY-MM-DD HH:mm:ss",
   time: "HH:mm:ss",
   timerange: "HH:mm:ss",
+  monthrange: "YYYY-MM",
   daterange: "YYYY-MM-DD",
   datetimerange: "YYYY-MM-DD HH:mm:ss"
 };
@@ -4968,8 +4973,8 @@ const useBase = () => {
   const props = instance.props;
   const isHover = vue.ref(false);
   const isActive = vue.ref(false);
-  const currentValue = vue.ref("");
-  const focusedDate = vue.ref(null);
+  const currentValue = vue.ref([]);
+  const focusedDate = vue.ref();
   const formItem = vue.inject("vc-form-item", {});
   const its = vcHooks.useAttrs({ merge: false });
   const formatDateText = (value) => {
@@ -5034,23 +5039,22 @@ const useBase = () => {
   };
   const parseValue = (val) => {
     if (isEmpty(val)) {
-      return isRange.value ? [null, null] : [];
+      return [];
     }
     return parserDate(val);
   };
-  const rest = (date) => {
-    currentValue.value = date;
+  const reset = (v) => {
+    currentValue.value = value2Array(v);
   };
   const sync = (eventName, value) => {
-    const date = isRange.value || isQuarter.value ? value : value[0];
-    const dateString = formatDate(value);
-    emit("input", date);
-    emit("update:modelValue", dateString);
+    const formatValue = formatDate(isRange.value || isQuarter.value ? value : value[0]) || props.nullValue;
+    emit("update:modelValue", formatValue);
     eventName = typeof eventName === "string" ? [eventName] : eventName;
     eventName.forEach((name) => {
-      emit(name, dateString, rest);
+      emit(name, formatValue, reset);
     });
-    formItem?.change?.(date);
+    formItem?.change?.();
+    return formatValue;
   };
   const executePromise = (promiseFn, cb, param) => {
     try {
@@ -5080,11 +5084,9 @@ const useBase = () => {
   };
   const handleClear = () => {
     const clear = () => {
-      const date = isRange.value ? [] : "";
       isActive.value = false;
-      currentValue.value = date;
-      sync("change", date);
-      emit("clear", date);
+      currentValue.value = [];
+      emit("clear", sync("change", []));
     };
     executePromise(instance.vnode.props?.onBeforeClear, clear);
   };
@@ -5101,10 +5103,10 @@ const useBase = () => {
     executePromise(instance.vnode.props?.onBeforeOk, ok, value);
   };
   const handleClose = () => {
-    const val = parseValue(props.modelValue);
-    const isSetValueProp = instance.props.modelValue;
-    if (!lodashEs.isEqualWith(currentValue.value, val) && isSetValueProp) {
-      currentValue.value = value2Array(val);
+    const v = parseValue(props.modelValue);
+    const isSetValueProp = props.modelValue;
+    if (!lodashEs.isEqualWith(currentValue.value, v) && isSetValueProp) {
+      currentValue.value = value2Array(v);
     }
     emit("close");
   };
@@ -5112,7 +5114,7 @@ const useBase = () => {
     () => props.modelValue,
     (v) => {
       v = parseValue(v);
-      focusedDate.value = v[0] || props.startDate || /* @__PURE__ */ new Date();
+      focusedDate.value = v?.[0] || props.startDate || /* @__PURE__ */ new Date();
       currentValue.value = value2Array(v);
     },
     { immediate: true }
@@ -5148,7 +5150,7 @@ const useBase = () => {
 
 /** @jsxImportSource vue */
 
-const COMPONENT_NAME$1l = 'vc-picker';
+const COMPONENT_NAME$1l = 'vc-date-picker';
 const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ vue.defineComponent({
   name: COMPONENT_NAME$1l,
   props: Object.assign(props$Y, pickerProps),
@@ -5206,7 +5208,7 @@ const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ vue.defineCompo
           "disabled": props.disabled,
           "modelValue": visibleValue.value,
           "allowDispatch": false,
-          "class": "vc-picker__input",
+          "class": "vc-date-picker__input",
           "readonly": true,
           "placeholder": props.placeholder || '请选择'
         }, {
@@ -5214,7 +5216,7 @@ const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ vue.defineCompo
             return vue.createVNode("div", {
               "class": [{
                 'is-clear': showClear
-              }, 'vc-picker__append']
+              }, 'vc-date-picker__append']
             }, [vue.createVNode(Icon, {
               "type": showClear.value ? 'clear' : icon.value,
               "onClick": handleIconClick
@@ -10392,11 +10394,6 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
       };
     });
     vcHooks.useScrollbar(isActive);
-    vue.watch(() => props.modelValue, v => {
-      isActive.value = v;
-    }, {
-      immediate: true
-    });
     let startX = 0;
     let startY = 0;
     // Portal调用时，可作为初始值
@@ -10423,7 +10420,17 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
     }, 250, {
       leading: true
     });
-    const handleEnter = () => resetOrigin();
+    const isTransitionEnd = vue.ref(false);
+    const handleBeforeEnter = () => {
+      isTransitionEnd.value = false;
+    };
+    const handleEnter = () => {
+      resetOrigin();
+    };
+    const handleAfterEnter = () => {
+      isTransitionEnd.value = true;
+      resizer.value.refresh();
+    };
     /**
      * 动画执行后关闭, 关闭事件都会被执行
      * visible-change 由移除之后触发
@@ -10494,11 +10501,15 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
      * 这里由于scroller的resize时，render会重置height(实际上就是保留height, 无法移除)
      * 1. 改用nextTick, 抖动严重
      * 2. resizer.value.refresh, 不抖动
+     *
+     * container在最大值时，需要移除，宽度才会缩回去
      */
     const handleContentResize = () => {
-      const has = !!scroller.value.wrapper.style.getPropertyValue('height');
-      has && scroller.value.wrapper.style.removeProperty('height');
-      has && resizer.value.refresh();
+      const needRefreshScroller = !!scroller.value.wrapper.style.getPropertyValue('height');
+      const needRefreshContainer = !!container.value.style.getPropertyValue('height');
+      needRefreshContainer && container.value.style.removeProperty('height');
+      needRefreshScroller && scroller.value.wrapper.style.removeProperty('height');
+      needRefreshScroller && resizer.value.refresh();
     };
     const handleClick = e => {
       // isActive click先触发,后设置后
@@ -10563,6 +10574,11 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
     });
+    vue.watch(() => props.modelValue, v => {
+      isActive.value = v;
+    }, {
+      immediate: true
+    });
     expose({
       isActive,
       // for portal
@@ -10591,7 +10607,9 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
         "onClick": e => handleClose(e, false)
       }, [vue.createVNode(TransitionScale, {
         "mode": "part",
+        "onBeforeEnter": handleBeforeEnter,
         "onEnter": handleEnter,
+        "onAfterEnter": handleAfterEnter,
         "onAfterLeave": handleRemove
       }, {
         default: () => [vue.withDirectives(vue.createVNode("div", {
@@ -10627,8 +10645,8 @@ const ModalView = /* @__PURE__ */ vue.defineComponent({
             return vue.createVNode(Scroller, {
               "ref": scroller,
               "native": false,
-              "always": true,
-              "height": row.height,
+              "always": false,
+              "height": isTransitionEnd.value ? row.height : void 0,
               "contentClass": [{
                 'is-confirm': props.mode
               }, props.portalClass, 'vc-modal__content']
@@ -12173,7 +12191,7 @@ const Circle = /* @__PURE__ */ vue.defineComponent({
         "fill-opacity": "0"
       }, null)]), vue.createVNode("div", {
         "class": "vc-progress-circle__inner"
-      }, [slots.default ? slots.default() : vue.createVNode("span", null, [`${props.percent}%`])])])]);
+      }, [slots.default ? slots.default() : props.showText && vue.createVNode("span", null, [`${props.percent}%`])])])]);
     };
   }
 });
@@ -15239,7 +15257,8 @@ const Upload = vue.defineComponent({
       const { mode, size } = props;
       const onRequest = instance.vnode.props?.onRequest || VcInstance.options.Upload?.onRequest || (() => {
       });
-      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse;
+      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse || (() => {
+      });
       const $mode = mode.replace(/s$/, "");
       const onError = async (originalResponse, internalMessage) => {
         delete requests[vFile.uploadId];
@@ -15248,9 +15267,17 @@ const Upload = vue.defineComponent({
         emitError(originalResponse, internalMessage);
         done(vFile);
       };
-      const onSuccess = async (originalResponse) => {
+      const onSuccess = async (request) => {
         try {
-          const response = await onResponse(originalResponse, options) || originalResponse;
+          let response = await onResponse(request, options) || request;
+          if (response === request) {
+            const text = request.responseType ? request.responseText : request.response;
+            try {
+              response = JSON.parse(text);
+            } catch {
+              response = text;
+            }
+          }
           delete requests[vFile.uploadId];
           cycle.success++;
           cycle.responses = [...cycle.responses, response];
@@ -15284,7 +15311,7 @@ const Upload = vue.defineComponent({
         xhr.onreadystatechange = () => {
           if (xhr.readyState !== 4 || xhr.status === 0) return;
           if (xhr.status >= 200 && xhr.status < 300) {
-            onSuccess(!xhr.responseType ? xhr.responseText : xhr.response);
+            onSuccess(xhr);
           } else {
             onError({}, `服务异常`);
           }

package/dist/index.d.ts

@@ -658,6 +658,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -720,6 +724,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -757,6 +765,7 @@ separator: string;
 splitPanels: boolean;
 steps: unknown[];
 changeOnSelect: boolean;
+nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 declare const Debounce: DefineComponent<ExtractPropTypes<    {
@@ -1859,11 +1868,11 @@ allowDispatch: boolean;
 bytes: boolean;
 controllable: boolean;
 required: boolean;
+nullValue: string | number | Record<string, any>;
 min: number;
 max: number;
 step: number | boolean;
 precision: number;
-nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const InputSearch: DefineComponent<ExtractPropTypes<    {
@@ -2685,6 +2694,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -2747,6 +2760,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -2784,6 +2801,7 @@ separator: string;
 splitPanels: boolean;
 steps: unknown[];
 changeOnSelect: boolean;
+nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const MDivider: DefineComponent<ExtractPropTypes<    {
@@ -4093,11 +4111,11 @@ allowDispatch: boolean;
 bytes: boolean;
 controllable: boolean;
 required: boolean;
+nullValue: string | number | Record<string, any>;
 min: number;
 max: number;
 step: number | boolean;
 precision: number;
-nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const MInputSearch: DefineComponent<ExtractPropTypes<    {
@@ -6655,8 +6673,8 @@ arrow: boolean;
 autoWidth: boolean;
 trigger: string;
 separator: string;
-max: number;
 nullValue: string | number | Record<string, any>;
+max: number;
 searchPlaceholder: string;
 searchable: boolean;
 numerable: boolean;
@@ -7217,6 +7235,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -7279,6 +7301,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -7316,6 +7342,7 @@ separator: string;
 splitPanels: boolean;
 steps: unknown[];
 changeOnSelect: boolean;
+nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const MToast: {
@@ -9999,8 +10026,8 @@ arrow: boolean;
 autoWidth: boolean;
 trigger: string;
 separator: string;
-max: number;
 nullValue: string | number | Record<string, any>;
+max: number;
 searchPlaceholder: string;
 searchable: boolean;
 numerable: boolean;
@@ -10768,6 +10795,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -10830,6 +10861,10 @@ changeOnSelect: {
 type: BooleanConstructor;
 default: boolean;
 };
+nullValue: {
+type: (ObjectConstructor | StringConstructor | NumberConstructor)[];
+default: string;
+};
 disabled: {
 type: BooleanConstructor;
 default: boolean;
@@ -10867,6 +10902,7 @@ separator: string;
 splitPanels: boolean;
 steps: unknown[];
 changeOnSelect: boolean;
+nullValue: string | number | Record<string, any>;
 }, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;
 
 export declare const Toast: {

package/dist/index.iife.js

@@ -7643,6 +7643,10 @@ var VcComponents = (function (exports, vue) {
 	  changeOnSelect: {
 	    type: Boolean,
 	    default: false
+	  },
+	  nullValue: {
+	    type: [Number, String, Object],
+	    default: ""
 	  }
 	};
 
@@ -9002,6 +9006,7 @@ var VcComponents = (function (exports, vue) {
 	  datetime: "YYYY-MM-DD HH:mm:ss",
 	  time: "HH:mm:ss",
 	  timerange: "HH:mm:ss",
+	  monthrange: "YYYY-MM",
 	  daterange: "YYYY-MM-DD",
 	  datetimerange: "YYYY-MM-DD HH:mm:ss"
 	};
@@ -9549,8 +9554,8 @@ var VcComponents = (function (exports, vue) {
 	  const props = instance.props;
 	  const isHover = vue.ref(false);
 	  const isActive = vue.ref(false);
-	  const currentValue = vue.ref("");
-	  const focusedDate = vue.ref(null);
+	  const currentValue = vue.ref([]);
+	  const focusedDate = vue.ref();
 	  const formItem = vue.inject("vc-form-item", {});
 	  const its = useAttrs({ merge: false });
 	  const formatDateText = (value) => {
@@ -9615,23 +9620,22 @@ var VcComponents = (function (exports, vue) {
 	  };
 	  const parseValue = (val) => {
 	    if (isEmpty(val)) {
-	      return isRange.value ? [null, null] : [];
+	      return [];
 	    }
 	    return parserDate(val);
 	  };
-	  const rest = (date) => {
-	    currentValue.value = date;
+	  const reset = (v) => {
+	    currentValue.value = value2Array(v);
 	  };
 	  const sync = (eventName, value) => {
-	    const date = isRange.value || isQuarter.value ? value : value[0];
-	    const dateString = formatDate(value);
-	    emit("input", date);
-	    emit("update:modelValue", dateString);
+	    const formatValue = formatDate(isRange.value || isQuarter.value ? value : value[0]) || props.nullValue;
+	    emit("update:modelValue", formatValue);
 	    eventName = typeof eventName === "string" ? [eventName] : eventName;
 	    eventName.forEach((name) => {
-	      emit(name, dateString, rest);
+	      emit(name, formatValue, reset);
 	    });
-	    formItem?.change?.(date);
+	    formItem?.change?.();
+	    return formatValue;
 	  };
 	  const executePromise = (promiseFn, cb, param) => {
 	    try {
@@ -9661,11 +9665,9 @@ var VcComponents = (function (exports, vue) {
 	  };
 	  const handleClear = () => {
 	    const clear = () => {
-	      const date = isRange.value ? [] : "";
 	      isActive.value = false;
-	      currentValue.value = date;
-	      sync("change", date);
-	      emit("clear", date);
+	      currentValue.value = [];
+	      emit("clear", sync("change", []));
 	    };
 	    executePromise(instance.vnode.props?.onBeforeClear, clear);
 	  };
@@ -9682,10 +9684,10 @@ var VcComponents = (function (exports, vue) {
 	    executePromise(instance.vnode.props?.onBeforeOk, ok, value);
 	  };
 	  const handleClose = () => {
-	    const val = parseValue(props.modelValue);
-	    const isSetValueProp = instance.props.modelValue;
-	    if (!isEqualWith(currentValue.value, val) && isSetValueProp) {
-	      currentValue.value = value2Array(val);
+	    const v = parseValue(props.modelValue);
+	    const isSetValueProp = props.modelValue;
+	    if (!isEqualWith(currentValue.value, v) && isSetValueProp) {
+	      currentValue.value = value2Array(v);
 	    }
 	    emit("close");
 	  };
@@ -9693,7 +9695,7 @@ var VcComponents = (function (exports, vue) {
 	    () => props.modelValue,
 	    (v) => {
 	      v = parseValue(v);
-	      focusedDate.value = v[0] || props.startDate || /* @__PURE__ */ new Date();
+	      focusedDate.value = v?.[0] || props.startDate || /* @__PURE__ */ new Date();
 	      currentValue.value = value2Array(v);
 	    },
 	    { immediate: true }
@@ -9729,7 +9731,7 @@ var VcComponents = (function (exports, vue) {
 
 	/** @jsxImportSource vue */
 
-	const COMPONENT_NAME$1l = 'vc-picker';
+	const COMPONENT_NAME$1l = 'vc-date-picker';
 	const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$1l,
 	  props: Object.assign(props$Y, pickerProps),
@@ -9787,7 +9789,7 @@ var VcComponents = (function (exports, vue) {
 	          "disabled": props.disabled,
 	          "modelValue": visibleValue.value,
 	          "allowDispatch": false,
-	          "class": "vc-picker__input",
+	          "class": "vc-date-picker__input",
 	          "readonly": true,
 	          "placeholder": props.placeholder || '请选择'
 	        }, {
@@ -9795,7 +9797,7 @@ var VcComponents = (function (exports, vue) {
 	            return vue.createVNode("div", {
 	              "class": [{
 	                'is-clear': showClear
-	              }, 'vc-picker__append']
+	              }, 'vc-date-picker__append']
 	            }, [vue.createVNode(Icon, {
 	              "type": showClear.value ? 'clear' : icon.value,
 	              "onClick": handleIconClick
@@ -16413,11 +16415,6 @@ var VcComponents = (function (exports, vue) {
 	      };
 	    });
 	    useScrollbar(isActive);
-	    vue.watch(() => props.modelValue, v => {
-	      isActive.value = v;
-	    }, {
-	      immediate: true
-	    });
 	    let startX = 0;
 	    let startY = 0;
 	    // Portal调用时，可作为初始值
@@ -16444,7 +16441,17 @@ var VcComponents = (function (exports, vue) {
 	    }, 250, {
 	      leading: true
 	    });
-	    const handleEnter = () => resetOrigin();
+	    const isTransitionEnd = vue.ref(false);
+	    const handleBeforeEnter = () => {
+	      isTransitionEnd.value = false;
+	    };
+	    const handleEnter = () => {
+	      resetOrigin();
+	    };
+	    const handleAfterEnter = () => {
+	      isTransitionEnd.value = true;
+	      resizer.value.refresh();
+	    };
 	    /**
 	     * 动画执行后关闭, 关闭事件都会被执行
 	     * visible-change 由移除之后触发
@@ -16515,11 +16522,15 @@ var VcComponents = (function (exports, vue) {
 	     * 这里由于scroller的resize时，render会重置height(实际上就是保留height, 无法移除)
 	     * 1. 改用nextTick, 抖动严重
 	     * 2. resizer.value.refresh, 不抖动
+	     *
+	     * container在最大值时，需要移除，宽度才会缩回去
 	     */
 	    const handleContentResize = () => {
-	      const has = !!scroller.value.wrapper.style.getPropertyValue('height');
-	      has && scroller.value.wrapper.style.removeProperty('height');
-	      has && resizer.value.refresh();
+	      const needRefreshScroller = !!scroller.value.wrapper.style.getPropertyValue('height');
+	      const needRefreshContainer = !!container.value.style.getPropertyValue('height');
+	      needRefreshContainer && container.value.style.removeProperty('height');
+	      needRefreshScroller && scroller.value.wrapper.style.removeProperty('height');
+	      needRefreshScroller && resizer.value.refresh();
 	    };
 	    const handleClick = e => {
 	      // isActive click先触发,后设置后
@@ -16584,6 +16595,11 @@ var VcComponents = (function (exports, vue) {
 	      document.removeEventListener('mousemove', handleMouseMove);
 	      document.removeEventListener('mouseup', handleMouseUp);
 	    });
+	    vue.watch(() => props.modelValue, v => {
+	      isActive.value = v;
+	    }, {
+	      immediate: true
+	    });
 	    expose({
 	      isActive,
 	      // for portal
@@ -16612,7 +16628,9 @@ var VcComponents = (function (exports, vue) {
 	        "onClick": e => handleClose(e, false)
 	      }, [vue.createVNode(TransitionScale, {
 	        "mode": "part",
+	        "onBeforeEnter": handleBeforeEnter,
 	        "onEnter": handleEnter,
+	        "onAfterEnter": handleAfterEnter,
 	        "onAfterLeave": handleRemove
 	      }, {
 	        default: () => [vue.withDirectives(vue.createVNode("div", {
@@ -16648,8 +16666,8 @@ var VcComponents = (function (exports, vue) {
 	            return vue.createVNode(Scroller, {
 	              "ref": scroller,
 	              "native": false,
-	              "always": true,
-	              "height": row.height,
+	              "always": false,
+	              "height": isTransitionEnd.value ? row.height : void 0,
 	              "contentClass": [{
 	                'is-confirm': props.mode
 	              }, props.portalClass, 'vc-modal__content']
@@ -18194,7 +18212,7 @@ var VcComponents = (function (exports, vue) {
 	        "fill-opacity": "0"
 	      }, null)]), vue.createVNode("div", {
 	        "class": "vc-progress-circle__inner"
-	      }, [slots.default ? slots.default() : vue.createVNode("span", null, [`${props.percent}%`])])])]);
+	      }, [slots.default ? slots.default() : props.showText && vue.createVNode("span", null, [`${props.percent}%`])])])]);
 	    };
 	  }
 	});
@@ -21359,7 +21377,8 @@ var VcComponents = (function (exports, vue) {
 	      const { mode, size } = props;
 	      const onRequest = instance.vnode.props?.onRequest || VcInstance.options.Upload?.onRequest || (() => {
 	      });
-	      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse;
+	      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse || (() => {
+	      });
 	      const $mode = mode.replace(/s$/, "");
 	      const onError = async (originalResponse, internalMessage) => {
 	        delete requests[vFile.uploadId];
@@ -21368,9 +21387,17 @@ var VcComponents = (function (exports, vue) {
 	        emitError(originalResponse, internalMessage);
 	        done(vFile);
 	      };
-	      const onSuccess = async (originalResponse) => {
+	      const onSuccess = async (request) => {
 	        try {
-	          const response = await onResponse(originalResponse, options) || originalResponse;
+	          let response = await onResponse(request, options) || request;
+	          if (response === request) {
+	            const text = request.responseType ? request.responseText : request.response;
+	            try {
+	              response = JSON.parse(text);
+	            } catch {
+	              response = text;
+	            }
+	          }
 	          delete requests[vFile.uploadId];
 	          cycle.success++;
 	          cycle.responses = [...cycle.responses, response];
@@ -21404,7 +21431,7 @@ var VcComponents = (function (exports, vue) {
 	        xhr.onreadystatechange = () => {
 	          if (xhr.readyState !== 4 || xhr.status === 0) return;
 	          if (xhr.status >= 200 && xhr.status < 300) {
-	            onSuccess(!xhr.responseType ? xhr.responseText : xhr.response);
+	            onSuccess(xhr);
 	          } else {
 	            onError({}, `服务异常`);
 	          }

package/dist/index.js

@@ -3104,6 +3104,10 @@ const props$Y = {
   changeOnSelect: {
     type: Boolean,
     default: false
+  },
+  nullValue: {
+    type: [Number, String, Object],
+    default: ""
   }
 };
 
@@ -4399,6 +4403,7 @@ const DEFAULT_FORMATS = {
   datetime: "YYYY-MM-DD HH:mm:ss",
   time: "HH:mm:ss",
   timerange: "HH:mm:ss",
+  monthrange: "YYYY-MM",
   daterange: "YYYY-MM-DD",
   datetimerange: "YYYY-MM-DD HH:mm:ss"
 };
@@ -4946,8 +4951,8 @@ const useBase = () => {
   const props = instance.props;
   const isHover = ref(false);
   const isActive = ref(false);
-  const currentValue = ref("");
-  const focusedDate = ref(null);
+  const currentValue = ref([]);
+  const focusedDate = ref();
   const formItem = inject("vc-form-item", {});
   const its = useAttrs({ merge: false });
   const formatDateText = (value) => {
@@ -5012,23 +5017,22 @@ const useBase = () => {
   };
   const parseValue = (val) => {
     if (isEmpty(val)) {
-      return isRange.value ? [null, null] : [];
+      return [];
     }
     return parserDate(val);
   };
-  const rest = (date) => {
-    currentValue.value = date;
+  const reset = (v) => {
+    currentValue.value = value2Array(v);
   };
   const sync = (eventName, value) => {
-    const date = isRange.value || isQuarter.value ? value : value[0];
-    const dateString = formatDate(value);
-    emit("input", date);
-    emit("update:modelValue", dateString);
+    const formatValue = formatDate(isRange.value || isQuarter.value ? value : value[0]) || props.nullValue;
+    emit("update:modelValue", formatValue);
     eventName = typeof eventName === "string" ? [eventName] : eventName;
     eventName.forEach((name) => {
-      emit(name, dateString, rest);
+      emit(name, formatValue, reset);
     });
-    formItem?.change?.(date);
+    formItem?.change?.();
+    return formatValue;
   };
   const executePromise = (promiseFn, cb, param) => {
     try {
@@ -5058,11 +5062,9 @@ const useBase = () => {
   };
   const handleClear = () => {
     const clear = () => {
-      const date = isRange.value ? [] : "";
       isActive.value = false;
-      currentValue.value = date;
-      sync("change", date);
-      emit("clear", date);
+      currentValue.value = [];
+      emit("clear", sync("change", []));
     };
     executePromise(instance.vnode.props?.onBeforeClear, clear);
   };
@@ -5079,10 +5081,10 @@ const useBase = () => {
     executePromise(instance.vnode.props?.onBeforeOk, ok, value);
   };
   const handleClose = () => {
-    const val = parseValue(props.modelValue);
-    const isSetValueProp = instance.props.modelValue;
-    if (!isEqualWith(currentValue.value, val) && isSetValueProp) {
-      currentValue.value = value2Array(val);
+    const v = parseValue(props.modelValue);
+    const isSetValueProp = props.modelValue;
+    if (!isEqualWith(currentValue.value, v) && isSetValueProp) {
+      currentValue.value = value2Array(v);
     }
     emit("close");
   };
@@ -5090,7 +5092,7 @@ const useBase = () => {
     () => props.modelValue,
     (v) => {
       v = parseValue(v);
-      focusedDate.value = v[0] || props.startDate || /* @__PURE__ */ new Date();
+      focusedDate.value = v?.[0] || props.startDate || /* @__PURE__ */ new Date();
       currentValue.value = value2Array(v);
     },
     { immediate: true }
@@ -5126,7 +5128,7 @@ const useBase = () => {
 
 /** @jsxImportSource vue */
 
-const COMPONENT_NAME$1l = 'vc-picker';
+const COMPONENT_NAME$1l = 'vc-date-picker';
 const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ defineComponent({
   name: COMPONENT_NAME$1l,
   props: Object.assign(props$Y, pickerProps),
@@ -5184,7 +5186,7 @@ const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ defineComponent
           "disabled": props.disabled,
           "modelValue": visibleValue.value,
           "allowDispatch": false,
-          "class": "vc-picker__input",
+          "class": "vc-date-picker__input",
           "readonly": true,
           "placeholder": props.placeholder || '请选择'
         }, {
@@ -5192,7 +5194,7 @@ const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ defineComponent
             return createVNode("div", {
               "class": [{
                 'is-clear': showClear
-              }, 'vc-picker__append']
+              }, 'vc-date-picker__append']
             }, [createVNode(Icon, {
               "type": showClear.value ? 'clear' : icon.value,
               "onClick": handleIconClick
@@ -10370,11 +10372,6 @@ const ModalView = /* @__PURE__ */ defineComponent({
       };
     });
     useScrollbar(isActive);
-    watch(() => props.modelValue, v => {
-      isActive.value = v;
-    }, {
-      immediate: true
-    });
     let startX = 0;
     let startY = 0;
     // Portal调用时，可作为初始值
@@ -10401,7 +10398,17 @@ const ModalView = /* @__PURE__ */ defineComponent({
     }, 250, {
       leading: true
     });
-    const handleEnter = () => resetOrigin();
+    const isTransitionEnd = ref(false);
+    const handleBeforeEnter = () => {
+      isTransitionEnd.value = false;
+    };
+    const handleEnter = () => {
+      resetOrigin();
+    };
+    const handleAfterEnter = () => {
+      isTransitionEnd.value = true;
+      resizer.value.refresh();
+    };
     /**
      * 动画执行后关闭, 关闭事件都会被执行
      * visible-change 由移除之后触发
@@ -10472,11 +10479,15 @@ const ModalView = /* @__PURE__ */ defineComponent({
      * 这里由于scroller的resize时，render会重置height(实际上就是保留height, 无法移除)
      * 1. 改用nextTick, 抖动严重
      * 2. resizer.value.refresh, 不抖动
+     *
+     * container在最大值时，需要移除，宽度才会缩回去
      */
     const handleContentResize = () => {
-      const has = !!scroller.value.wrapper.style.getPropertyValue('height');
-      has && scroller.value.wrapper.style.removeProperty('height');
-      has && resizer.value.refresh();
+      const needRefreshScroller = !!scroller.value.wrapper.style.getPropertyValue('height');
+      const needRefreshContainer = !!container.value.style.getPropertyValue('height');
+      needRefreshContainer && container.value.style.removeProperty('height');
+      needRefreshScroller && scroller.value.wrapper.style.removeProperty('height');
+      needRefreshScroller && resizer.value.refresh();
     };
     const handleClick = e => {
       // isActive click先触发,后设置后
@@ -10541,6 +10552,11 @@ const ModalView = /* @__PURE__ */ defineComponent({
       document.removeEventListener('mousemove', handleMouseMove);
       document.removeEventListener('mouseup', handleMouseUp);
     });
+    watch(() => props.modelValue, v => {
+      isActive.value = v;
+    }, {
+      immediate: true
+    });
     expose({
       isActive,
       // for portal
@@ -10569,7 +10585,9 @@ const ModalView = /* @__PURE__ */ defineComponent({
         "onClick": e => handleClose(e, false)
       }, [createVNode(TransitionScale, {
         "mode": "part",
+        "onBeforeEnter": handleBeforeEnter,
         "onEnter": handleEnter,
+        "onAfterEnter": handleAfterEnter,
         "onAfterLeave": handleRemove
       }, {
         default: () => [withDirectives(createVNode("div", {
@@ -10605,8 +10623,8 @@ const ModalView = /* @__PURE__ */ defineComponent({
             return createVNode(Scroller, {
               "ref": scroller,
               "native": false,
-              "always": true,
-              "height": row.height,
+              "always": false,
+              "height": isTransitionEnd.value ? row.height : void 0,
               "contentClass": [{
                 'is-confirm': props.mode
               }, props.portalClass, 'vc-modal__content']
@@ -12151,7 +12169,7 @@ const Circle = /* @__PURE__ */ defineComponent({
         "fill-opacity": "0"
       }, null)]), createVNode("div", {
         "class": "vc-progress-circle__inner"
-      }, [slots.default ? slots.default() : createVNode("span", null, [`${props.percent}%`])])])]);
+      }, [slots.default ? slots.default() : props.showText && createVNode("span", null, [`${props.percent}%`])])])]);
     };
   }
 });
@@ -15217,7 +15235,8 @@ const Upload = defineComponent({
       const { mode, size } = props;
       const onRequest = instance.vnode.props?.onRequest || VcInstance.options.Upload?.onRequest || (() => {
       });
-      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse;
+      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse || (() => {
+      });
       const $mode = mode.replace(/s$/, "");
       const onError = async (originalResponse, internalMessage) => {
         delete requests[vFile.uploadId];
@@ -15226,9 +15245,17 @@ const Upload = defineComponent({
         emitError(originalResponse, internalMessage);
         done(vFile);
       };
-      const onSuccess = async (originalResponse) => {
+      const onSuccess = async (request) => {
         try {
-          const response = await onResponse(originalResponse, options) || originalResponse;
+          let response = await onResponse(request, options) || request;
+          if (response === request) {
+            const text = request.responseType ? request.responseText : request.response;
+            try {
+              response = JSON.parse(text);
+            } catch {
+              response = text;
+            }
+          }
           delete requests[vFile.uploadId];
           cycle.success++;
           cycle.responses = [...cycle.responses, response];
@@ -15262,7 +15289,7 @@ const Upload = defineComponent({
         xhr.onreadystatechange = () => {
           if (xhr.readyState !== 4 || xhr.status === 0) return;
           if (xhr.status >= 200 && xhr.status < 300) {
-            onSuccess(!xhr.responseType ? xhr.responseText : xhr.response);
+            onSuccess(xhr);
           } else {
             onError({}, `服务异常`);
           }

package/dist/index.umd.cjs

@@ -7646,6 +7646,10 @@
 	  changeOnSelect: {
 	    type: Boolean,
 	    default: false
+	  },
+	  nullValue: {
+	    type: [Number, String, Object],
+	    default: ""
 	  }
 	};
 
@@ -9005,6 +9009,7 @@
 	  datetime: "YYYY-MM-DD HH:mm:ss",
 	  time: "HH:mm:ss",
 	  timerange: "HH:mm:ss",
+	  monthrange: "YYYY-MM",
 	  daterange: "YYYY-MM-DD",
 	  datetimerange: "YYYY-MM-DD HH:mm:ss"
 	};
@@ -9552,8 +9557,8 @@
 	  const props = instance.props;
 	  const isHover = vue.ref(false);
 	  const isActive = vue.ref(false);
-	  const currentValue = vue.ref("");
-	  const focusedDate = vue.ref(null);
+	  const currentValue = vue.ref([]);
+	  const focusedDate = vue.ref();
 	  const formItem = vue.inject("vc-form-item", {});
 	  const its = useAttrs({ merge: false });
 	  const formatDateText = (value) => {
@@ -9618,23 +9623,22 @@
 	  };
 	  const parseValue = (val) => {
 	    if (isEmpty(val)) {
-	      return isRange.value ? [null, null] : [];
+	      return [];
 	    }
 	    return parserDate(val);
 	  };
-	  const rest = (date) => {
-	    currentValue.value = date;
+	  const reset = (v) => {
+	    currentValue.value = value2Array(v);
 	  };
 	  const sync = (eventName, value) => {
-	    const date = isRange.value || isQuarter.value ? value : value[0];
-	    const dateString = formatDate(value);
-	    emit("input", date);
-	    emit("update:modelValue", dateString);
+	    const formatValue = formatDate(isRange.value || isQuarter.value ? value : value[0]) || props.nullValue;
+	    emit("update:modelValue", formatValue);
 	    eventName = typeof eventName === "string" ? [eventName] : eventName;
 	    eventName.forEach((name) => {
-	      emit(name, dateString, rest);
+	      emit(name, formatValue, reset);
 	    });
-	    formItem?.change?.(date);
+	    formItem?.change?.();
+	    return formatValue;
 	  };
 	  const executePromise = (promiseFn, cb, param) => {
 	    try {
@@ -9664,11 +9668,9 @@
 	  };
 	  const handleClear = () => {
 	    const clear = () => {
-	      const date = isRange.value ? [] : "";
 	      isActive.value = false;
-	      currentValue.value = date;
-	      sync("change", date);
-	      emit("clear", date);
+	      currentValue.value = [];
+	      emit("clear", sync("change", []));
 	    };
 	    executePromise(instance.vnode.props?.onBeforeClear, clear);
 	  };
@@ -9685,10 +9687,10 @@
 	    executePromise(instance.vnode.props?.onBeforeOk, ok, value);
 	  };
 	  const handleClose = () => {
-	    const val = parseValue(props.modelValue);
-	    const isSetValueProp = instance.props.modelValue;
-	    if (!isEqualWith(currentValue.value, val) && isSetValueProp) {
-	      currentValue.value = value2Array(val);
+	    const v = parseValue(props.modelValue);
+	    const isSetValueProp = props.modelValue;
+	    if (!isEqualWith(currentValue.value, v) && isSetValueProp) {
+	      currentValue.value = value2Array(v);
 	    }
 	    emit("close");
 	  };
@@ -9696,7 +9698,7 @@
 	    () => props.modelValue,
 	    (v) => {
 	      v = parseValue(v);
-	      focusedDate.value = v[0] || props.startDate || /* @__PURE__ */ new Date();
+	      focusedDate.value = v?.[0] || props.startDate || /* @__PURE__ */ new Date();
 	      currentValue.value = value2Array(v);
 	    },
 	    { immediate: true }
@@ -9732,7 +9734,7 @@
 
 	/** @jsxImportSource vue */
 
-	const COMPONENT_NAME$1l = 'vc-picker';
+	const COMPONENT_NAME$1l = 'vc-date-picker';
 	const createPicker = (pickerProps, usePicker) => /* @__PURE__ */ vue.defineComponent({
 	  name: COMPONENT_NAME$1l,
 	  props: Object.assign(props$Y, pickerProps),
@@ -9790,7 +9792,7 @@
 	          "disabled": props.disabled,
 	          "modelValue": visibleValue.value,
 	          "allowDispatch": false,
-	          "class": "vc-picker__input",
+	          "class": "vc-date-picker__input",
 	          "readonly": true,
 	          "placeholder": props.placeholder || '请选择'
 	        }, {
@@ -9798,7 +9800,7 @@
 	            return vue.createVNode("div", {
 	              "class": [{
 	                'is-clear': showClear
-	              }, 'vc-picker__append']
+	              }, 'vc-date-picker__append']
 	            }, [vue.createVNode(Icon, {
 	              "type": showClear.value ? 'clear' : icon.value,
 	              "onClick": handleIconClick
@@ -16416,11 +16418,6 @@
 	      };
 	    });
 	    useScrollbar(isActive);
-	    vue.watch(() => props.modelValue, v => {
-	      isActive.value = v;
-	    }, {
-	      immediate: true
-	    });
 	    let startX = 0;
 	    let startY = 0;
 	    // Portal调用时，可作为初始值
@@ -16447,7 +16444,17 @@
 	    }, 250, {
 	      leading: true
 	    });
-	    const handleEnter = () => resetOrigin();
+	    const isTransitionEnd = vue.ref(false);
+	    const handleBeforeEnter = () => {
+	      isTransitionEnd.value = false;
+	    };
+	    const handleEnter = () => {
+	      resetOrigin();
+	    };
+	    const handleAfterEnter = () => {
+	      isTransitionEnd.value = true;
+	      resizer.value.refresh();
+	    };
 	    /**
 	     * 动画执行后关闭, 关闭事件都会被执行
 	     * visible-change 由移除之后触发
@@ -16518,11 +16525,15 @@
 	     * 这里由于scroller的resize时，render会重置height(实际上就是保留height, 无法移除)
 	     * 1. 改用nextTick, 抖动严重
 	     * 2. resizer.value.refresh, 不抖动
+	     *
+	     * container在最大值时，需要移除，宽度才会缩回去
 	     */
 	    const handleContentResize = () => {
-	      const has = !!scroller.value.wrapper.style.getPropertyValue('height');
-	      has && scroller.value.wrapper.style.removeProperty('height');
-	      has && resizer.value.refresh();
+	      const needRefreshScroller = !!scroller.value.wrapper.style.getPropertyValue('height');
+	      const needRefreshContainer = !!container.value.style.getPropertyValue('height');
+	      needRefreshContainer && container.value.style.removeProperty('height');
+	      needRefreshScroller && scroller.value.wrapper.style.removeProperty('height');
+	      needRefreshScroller && resizer.value.refresh();
 	    };
 	    const handleClick = e => {
 	      // isActive click先触发,后设置后
@@ -16587,6 +16598,11 @@
 	      document.removeEventListener('mousemove', handleMouseMove);
 	      document.removeEventListener('mouseup', handleMouseUp);
 	    });
+	    vue.watch(() => props.modelValue, v => {
+	      isActive.value = v;
+	    }, {
+	      immediate: true
+	    });
 	    expose({
 	      isActive,
 	      // for portal
@@ -16615,7 +16631,9 @@
 	        "onClick": e => handleClose(e, false)
 	      }, [vue.createVNode(TransitionScale, {
 	        "mode": "part",
+	        "onBeforeEnter": handleBeforeEnter,
 	        "onEnter": handleEnter,
+	        "onAfterEnter": handleAfterEnter,
 	        "onAfterLeave": handleRemove
 	      }, {
 	        default: () => [vue.withDirectives(vue.createVNode("div", {
@@ -16651,8 +16669,8 @@
 	            return vue.createVNode(Scroller, {
 	              "ref": scroller,
 	              "native": false,
-	              "always": true,
-	              "height": row.height,
+	              "always": false,
+	              "height": isTransitionEnd.value ? row.height : void 0,
 	              "contentClass": [{
 	                'is-confirm': props.mode
 	              }, props.portalClass, 'vc-modal__content']
@@ -18197,7 +18215,7 @@
 	        "fill-opacity": "0"
 	      }, null)]), vue.createVNode("div", {
 	        "class": "vc-progress-circle__inner"
-	      }, [slots.default ? slots.default() : vue.createVNode("span", null, [`${props.percent}%`])])])]);
+	      }, [slots.default ? slots.default() : props.showText && vue.createVNode("span", null, [`${props.percent}%`])])])]);
 	    };
 	  }
 	});
@@ -21362,7 +21380,8 @@
 	      const { mode, size } = props;
 	      const onRequest = instance.vnode.props?.onRequest || VcInstance.options.Upload?.onRequest || (() => {
 	      });
-	      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse;
+	      const onResponse = instance.vnode.props?.onResponse || VcInstance.options.Upload?.onResponse || (() => {
+	      });
 	      const $mode = mode.replace(/s$/, "");
 	      const onError = async (originalResponse, internalMessage) => {
 	        delete requests[vFile.uploadId];
@@ -21371,9 +21390,17 @@
 	        emitError(originalResponse, internalMessage);
 	        done(vFile);
 	      };
-	      const onSuccess = async (originalResponse) => {
+	      const onSuccess = async (request) => {
 	        try {
-	          const response = await onResponse(originalResponse, options) || originalResponse;
+	          let response = await onResponse(request, options) || request;
+	          if (response === request) {
+	            const text = request.responseType ? request.responseText : request.response;
+	            try {
+	              response = JSON.parse(text);
+	            } catch {
+	              response = text;
+	            }
+	          }
 	          delete requests[vFile.uploadId];
 	          cycle.success++;
 	          cycle.responses = [...cycle.responses, response];
@@ -21407,7 +21434,7 @@
 	        xhr.onreadystatechange = () => {
 	          if (xhr.readyState !== 4 || xhr.status === 0) return;
 	          if (xhr.status >= 200 && xhr.status < 300) {
-	            onSuccess(!xhr.responseType ? xhr.responseText : xhr.response);
+	            onSuccess(xhr);
 	          } else {
 	            onError({}, `服务异常`);
 	          }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deot/vc-components",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",