@varlet/ui 3.15.1 → 3.15.2

package/highlight/web-types.en-US.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -2887,6 +2887,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "fallback-view-date",
+              "description": "Controls the panel view fallback date when there is no usable selected value. It does not update `v-model`.",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
             }
           ],
           "events": [

package/highlight/web-types.zh-CN.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "name": "VARLET",
   "contributions": {
     "html": {
@@ -2938,6 +2938,15 @@
                 "type": "boolean",
                 "kind": "expression"
               }
+            },
+            {
+              "name": "fallback-view-date",
+              "description": "在没有可用选中值时，控制面板视图回退到的日期（不会写回 `v-model`）",
+              "default": "-",
+              "value": {
+                "type": "string",
+                "kind": "expression"
+              }
             }
           ],
           "events": [

package/lib/varlet.cjs.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 let vue = require("vue");
-//#region ../../node_modules/.pnpm/rattail@2.0.5_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._oaa5dabgz63tacyacthirbl23y/node_modules/rattail/dist/chunk-D1SwGrFN.mjs
+//#region ../../node_modules/.pnpm/rattail@2.0.7_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._6rwx5eoj5ijtwiwneistv24bcq/node_modules/rattail/dist/chunk-D1SwGrFN.mjs
 var __defProp$37 = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -29,7 +29,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 //#endregion
-//#region ../../node_modules/.pnpm/rattail@2.0.5_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._oaa5dabgz63tacyacthirbl23y/node_modules/rattail/dist/isString-eoLxw4CX.mjs
+//#region ../../node_modules/.pnpm/rattail@2.0.7_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._6rwx5eoj5ijtwiwneistv24bcq/node_modules/rattail/dist/isString-eoLxw4CX.mjs
 function isArray(val) {
 	return Array.isArray(val);
 }
@@ -37,7 +37,7 @@ function isString(val) {
 	return typeof val === "string";
 }
 //#endregion
-//#region ../../node_modules/.pnpm/rattail@2.0.5_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._oaa5dabgz63tacyacthirbl23y/node_modules/rattail/dist/callOrReturn-MpTzoGlG.mjs
+//#region ../../node_modules/.pnpm/rattail@2.0.7_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._6rwx5eoj5ijtwiwneistv24bcq/node_modules/rattail/dist/callOrReturn-MpTzoGlG.mjs
 function isFunction(val) {
 	return typeof val === "function";
 }
@@ -280,7 +280,7 @@ function init(converter, defaultAttributes) {
 }
 var api = init(defaultConverter, { path: "/" });
 //#endregion
-//#region ../../node_modules/.pnpm/rattail@2.0.5_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._oaa5dabgz63tacyacthirbl23y/node_modules/rattail/dist/index.mjs
+//#region ../../node_modules/.pnpm/rattail@2.0.7_@voidzero-dev+vite-plus-core@0.1.18_@types+node@20.19.39_esbuild@0.27.7_jiti@2._6rwx5eoj5ijtwiwneistv24bcq/node_modules/rattail/dist/index.mjs
 function at(arr, index) {
 	if (!arr.length) return;
 	if (index < 0) index += arr.length;
@@ -634,6 +634,13 @@ function omitBy(object, fn) {
 		return result;
 	}, {});
 }
+function rekey(object, mapping) {
+	return [...Object.keys(object), ...Object.getOwnPropertySymbols(object)].reduce((result, key) => {
+		const nextKey = hasOwn(mapping, key) ? mapping[key] : key;
+		result[nextKey] = object[key];
+		return result;
+	}, {});
+}
 function mapObject(object, fn) {
 	return Object.entries(object).reduce((result, [key, value]) => {
 		const entry = fn(key, value);
@@ -1524,6 +1531,7 @@ __reExport(/* @__PURE__ */ __exportAll({
 	randomColor: () => randomColor,
 	randomNumber: () => randomNumber,
 	randomString: () => randomString,
+	rekey: () => rekey,
 	removeArrayBlank: () => removeArrayBlank,
 	removeArrayEmpty: () => removeArrayEmpty,
 	removeItem: () => removeItem,
@@ -13510,6 +13518,7 @@ var props$26 = {
 		default: "date"
 	},
 	hint: String,
+	fallbackViewDate: String,
 	allowedDates: Function,
 	color: String,
 	titleColor: String,
@@ -14490,7 +14499,7 @@ function __render__$51(_ctx, _cache) {
 			key: 0,
 			class: (0, vue.normalizeClass)(_ctx.classes(_ctx.n("title-year"), [_ctx.isYearPanel, _ctx.n("title-year--active")])),
 			onClick: _cache[0] || (_cache[0] = ($event) => _ctx.clickEl("year"))
-		}, [(0, vue.renderSlot)(_ctx.$slots, "year", { year: _ctx.chooseYear }, () => [(0, vue.createTextVNode)((0, vue.toDisplayString)(_ctx.chooseYear), 1)])], 2)) : (0, vue.createCommentVNode)("v-if", true)], 2), (0, vue.createElementVNode)("div", {
+		}, [(0, vue.renderSlot)(_ctx.$slots, "year", { year: _ctx.displayYear }, () => [(0, vue.createTextVNode)((0, vue.toDisplayString)(_ctx.displayYear), 1)])], 2)) : (0, vue.createCommentVNode)("v-if", true)], 2), (0, vue.createElementVNode)("div", {
 			class: (0, vue.normalizeClass)(_ctx.classes(_ctx.n("title-date"), [!_ctx.isYearPanel || _ctx.type === "year", _ctx.n("title-date--active")], [_ctx.range, _ctx.n("title-date--range")])),
 			onClick: _cache[1] || (_cache[1] = ($event) => _ctx.clickEl("date"))
 		}, [(0, vue.createVNode)(vue.Transition, { name: _ctx.multiple ? "" : `${_ctx.n()}${_ctx.reverse ? "-reverse" : ""}-translatey` }, {
@@ -14645,6 +14654,7 @@ var __sfc__$51 = (0, vue.defineComponent)({
 			previewMonth: previewMonth.value,
 			previewYear: previewYear.value
 		}));
+		const displayYear = (0, vue.computed)(() => previewYear.value || chooseYear.value || "");
 		const getYearTitle = (0, vue.computed)(() => {
 			var _a;
 			const { multiple, range } = props2;
@@ -14702,7 +14712,7 @@ var __sfc__$51 = (0, vue.defineComponent)({
 		let checkType = "";
 		let touchDirection;
 		(0, vue.watch)(() => props2.modelValue, (value) => {
-			if (!checkValue() || invalidFormatDate(value)) return;
+			if (!checkValue()) return;
 			if (props2.range) {
 				if (!isArray(value)) return;
 				rangeDone.value = value.length !== 1;
@@ -14710,7 +14720,7 @@ var __sfc__$51 = (0, vue.defineComponent)({
 			} else if (props2.multiple) {
 				if (!isArray(value)) return;
 				multipleInit(value, props2.type);
-			} else dateInit(value);
+			} else dateInit(getSingleDate(value));
 		}, { immediate: true });
 		(0, vue.watch)(getPanelType, resetState);
 		function clickEl(type) {
@@ -14854,29 +14864,50 @@ var __sfc__$51 = (0, vue.defineComponent)({
 			}
 			return false;
 		}
+		function getFallbackDate() {
+			if (props2.fallbackViewDate) {
+				if (dayjs(props2.fallbackViewDate).format("YYYY-MM-D") !== "Invalid Date") return props2.fallbackViewDate;
+			}
+			return dayjs().format("YYYY-MM-D");
+		}
+		function getSingleDate(value) {
+			if (value && !invalidFormatDate(dayjs(value).format("YYYY-MM-D"))) return value;
+			return getFallbackDate();
+		}
+		function getFirstValidDate(value, type) {
+			const formatType = type === "year" ? "YYYY" : type === "month" ? "YYYY-MM" : "YYYY-MM-D";
+			return value.find((choose) => !invalidFormatDate(dayjs(choose).format(formatType)));
+		}
 		function rangeInit(value, type) {
+			var _a;
 			const rangeDate = type === "year" ? chooseRangeYear : type === "month" ? chooseRangeMonth : chooseRangeDay;
 			const formatType = type === "year" ? "YYYY" : type === "month" ? "YYYY-MM" : "YYYY-MM-D";
-			const formatDateList = value.map((choose) => dayjs(choose).format(formatType)).slice(0, 2);
-			if (rangeDate.value.some((date) => invalidFormatDate(date))) return;
-			rangeDate.value = formatDateList;
+			rangeDate.value = value.map((choose) => dayjs(choose).format(formatType)).filter((date) => !invalidFormatDate(date)).slice(0, 2);
 			const isChangeOrder = dayjs(rangeDate.value[0]).isAfter(rangeDate.value[1]);
 			if (rangeDate.value.length === 2 && isChangeOrder) rangeDate.value = [rangeDate.value[1], rangeDate.value[0]];
+			previewInit((_a = getFirstValidDate(value, type)) != null ? _a : getFallbackDate());
 		}
 		function multipleInit(value, type) {
+			var _a;
 			const rangeDate = type === "year" ? chooseYears : type === "month" ? chooseMonths : chooseDays;
 			const formatType = type === "year" ? "YYYY" : type === "month" ? "YYYY-MM" : "YYYY-MM-D";
 			rangeDate.value = Array.from(new Set(value.map((choose) => dayjs(choose).format(formatType)))).filter((date) => date !== "Invalid Date");
+			previewInit((_a = getFirstValidDate(value, type)) != null ? _a : getFallbackDate());
 		}
 		function dateInit(value) {
-			const formatDate = (value ? dayjs(value) : dayjs()).format("YYYY-MM-D");
+			const formatDate = (value ? dayjs(value) : dayjs(getFallbackDate())).format("YYYY-MM-D");
 			if (invalidFormatDate(formatDate)) return;
 			const [yearValue, monthValue, dayValue] = formatDate.split("-");
-			const monthDes2 = MONTH_LIST.find((month) => month === monthValue);
-			chooseMonth.value = monthDes2;
+			chooseMonth.value = MONTH_LIST.find((month) => month === monthValue);
 			chooseYear.value = yearValue;
 			chooseDay.value = dayValue;
-			previewMonth.value = monthDes2;
+			previewInit(formatDate);
+		}
+		function previewInit(value) {
+			const formatDate = (value ? dayjs(value) : dayjs(getFallbackDate())).format("YYYY-MM-D");
+			if (invalidFormatDate(formatDate)) return;
+			const [yearValue, monthValue] = formatDate.split("-");
+			previewMonth.value = MONTH_LIST.find((month) => month === monthValue);
 			previewYear.value = yearValue;
 		}
 		function resetState() {
@@ -14895,6 +14926,7 @@ var __sfc__$51 = (0, vue.defineComponent)({
 			chooseYear,
 			chooseDay,
 			previewYear,
+			displayYear,
 			isYearPanel,
 			isMonthPanel,
 			getMonthTitle,
@@ -28508,7 +28540,7 @@ var _WatermarkComponent = stdin_default$99;
 var stdin_default$93 = stdin_default$99;
 //#endregion
 //#region es/index.bundle.mjs
-var version = "3.15.1";
+var version = "3.15.2";
 function install(app) {
 	stdin_default.install && app.use(stdin_default);
 	stdin_default$1.install && app.use(stdin_default$1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/ui",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "description": "A Vue3 component library based on Material Design 2 and 3, supporting mobile and desktop.",
   "keywords": [
     "Vue3",
@@ -44,9 +44,9 @@
     "@popperjs/core": "^2.11.6",
     "dayjs": "^1.10.4",
     "decimal.js": "^10.2.1",
-    "@varlet/icons": "3.15.1",
-    "@varlet/shared": "3.15.1",
-    "@varlet/use": "3.15.1"
+    "@varlet/icons": "3.15.2",
+    "@varlet/shared": "3.15.2",
+    "@varlet/use": "3.15.2"
   },
   "devDependencies": {
     "@types/node": "^20.19.0",
@@ -62,9 +62,9 @@
     "vue": "3.5.21",
     "vue-router": "4.5.1",
     "zod": "^3.23.8",
-    "@varlet/cli": "3.15.1",
-    "@varlet/touch-emulator": "3.15.1",
-    "@varlet/ui": "3.15.1"
+    "@varlet/cli": "3.15.2",
+    "@varlet/ui": "3.15.2",
+    "@varlet/touch-emulator": "3.15.2"
   },
   "peerDependencies": {
     "vue": "^3.2.0"

package/types/datePicker.d.ts

@@ -22,6 +22,7 @@ export interface DatePickerProps extends BasicAttributes {
   multiple?: boolean
   range?: boolean
   touchable?: boolean
+  fallbackViewDate?: string
   onPreview?: ListenerProp<(year: number, month: number, day?: number) => void>
   onChange?: ListenerProp<(value: string | string[]) => void>
   'onUpdate:modelValue'?: ListenerProp<(value: string | string[]) => void>