@xxlabs/antd-plus 1.3.0 → 1.5.0

package/dist/index.js

@@ -10395,7 +10395,7 @@ var Radio_default = FieldRadio;
 * @param
 */
 const FieldRangePicker = (t0) => {
-	const $ = c(70);
+	const $ = c(68);
 	const { text, mode, light, label, format: t1, render, picker, formItemRender, plain, showTime, lightLabel, variant, fieldProps, ref } = t0;
 	const format = t1 === void 0 ? "YYYY-MM-DD" : t1;
 	const intl = useIntl();
@@ -10420,92 +10420,88 @@ const FieldRangePicker = (t0) => {
 			t3 = {
 				display: "flex",
 				flexWrap: "wrap",
-				gap: 8,
+				gap: 4,
 				alignItems: "center"
 			};
 			$[3] = t3;
 		} else t3 = $[3];
-		const t4 = parsedStartText || "-";
+		let t4;
+		if ($[4] !== parsedEndText || $[5] !== parsedStartText) {
+			t4 = parsedStartText || parsedEndText ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+				/* @__PURE__ */ jsx("div", { children: parsedStartText || "-" }),
+				/* @__PURE__ */ jsx("div", { children: "~" }),
+				/* @__PURE__ */ jsx("div", { children: parsedEndText || "-" })
+			] }) : "-";
+			$[4] = parsedEndText;
+			$[5] = parsedStartText;
+			$[6] = t4;
+		} else t4 = $[6];
 		let t5;
-		if ($[4] !== t4) {
-			t5 = /* @__PURE__ */ jsx("div", { children: t4 });
-			$[4] = t4;
-			$[5] = t5;
-		} else t5 = $[5];
-		const t6 = parsedEndText || "-";
-		let t7;
-		if ($[6] !== t6) {
-			t7 = /* @__PURE__ */ jsx("div", { children: t6 });
-			$[6] = t6;
-			$[7] = t7;
-		} else t7 = $[7];
-		let t8;
-		if ($[8] !== ref || $[9] !== t5 || $[10] !== t7) {
-			t8 = /* @__PURE__ */ jsxs("div", {
+		if ($[7] !== ref || $[8] !== t4) {
+			t5 = /* @__PURE__ */ jsx("div", {
 				ref,
 				style: t3,
-				children: [t5, t7]
+				children: t4
 			});
-			$[8] = ref;
+			$[7] = ref;
+			$[8] = t4;
 			$[9] = t5;
-			$[10] = t7;
-			$[11] = t8;
-		} else t8 = $[11];
-		const dom = t8;
+		} else t5 = $[9];
+		const dom = t5;
 		if (render) {
-			let t9;
-			if ($[12] !== dom || $[13] !== fieldProps || $[14] !== mode || $[15] !== render || $[16] !== text) {
-				let t10;
-				if ($[18] !== dom) {
-					t10 = /* @__PURE__ */ jsx("span", { children: dom });
-					$[18] = dom;
-					$[19] = t10;
-				} else t10 = $[19];
-				t9 = render(text, {
+			let t6;
+			if ($[10] !== dom || $[11] !== fieldProps || $[12] !== mode || $[13] !== render || $[14] !== text) {
+				let t7;
+				if ($[16] !== dom) {
+					t7 = /* @__PURE__ */ jsx("span", { children: dom });
+					$[16] = dom;
+					$[17] = t7;
+				} else t7 = $[17];
+				t6 = render(text, {
 					mode,
 					...fieldProps
-				}, t10);
-				$[12] = dom;
-				$[13] = fieldProps;
-				$[14] = mode;
-				$[15] = render;
-				$[16] = text;
-				$[17] = t9;
-			} else t9 = $[17];
-			return t9;
+				}, t7);
+				$[10] = dom;
+				$[11] = fieldProps;
+				$[12] = mode;
+				$[13] = render;
+				$[14] = text;
+				$[15] = t6;
+			} else t6 = $[15];
+			return t6;
 		}
 		return dom;
 	}
 	if (mode === "edit" || mode === "update") {
 		let t3;
-		if ($[20] !== fieldProps.value) {
+		if ($[18] !== fieldProps.value) {
 			t3 = parseValueToDay(fieldProps.value);
-			$[20] = fieldProps.value;
-			$[21] = t3;
-		} else t3 = $[21];
+			$[18] = fieldProps.value;
+			$[19] = t3;
+		} else t3 = $[19];
 		const dayValue = t3;
 		let dom_0;
 		let t4;
-		if ($[22] !== fieldProps || $[23] !== setOpen) {
+		if ($[20] !== fieldProps || $[21] !== setOpen) {
 			t4 = (value) => {
 				fieldProps?.onChange?.(value);
 				if (!value) setOpen(false);
 			};
-			$[22] = fieldProps;
-			$[23] = setOpen;
-			$[24] = t4;
-		} else t4 = $[24];
+			$[20] = fieldProps;
+			$[21] = setOpen;
+			$[22] = t4;
+		} else t4 = $[22];
 		const handleRangeChange = t4;
 		if (light) {
 			const t5 = dayValue || open ? false : void 0;
 			let t6;
-			if ($[25] !== dayValue) {
+			if ($[23] !== dayValue) {
 				t6 = dayValue ? { paddingInlineEnd: 0 } : void 0;
-				$[25] = dayValue;
-				$[26] = t6;
-			} else t6 = $[26];
+				$[23] = dayValue;
+				$[24] = t6;
+			} else t6 = $[24];
 			let t7;
-			if ($[27] !== dayValue || $[28] !== fieldProps || $[29] !== format || $[30] !== handleRangeChange || $[31] !== intl || $[32] !== open || $[33] !== picker || $[34] !== setOpen || $[35] !== showTime) {
+			if ($[25] !== dayValue || $[26] !== fieldProps || $[27] !== format || $[28] !== handleRangeChange || $[29] !== intl || $[30] !== open || $[31] !== picker || $[32] !== setOpen || $[33] !== showTime) {
 				t7 = dayValue || open ? /* @__PURE__ */ jsx(DatePicker.RangePicker, {
 					format,
 					picker,
@@ -10520,29 +10516,29 @@ const FieldRangePicker = (t0) => {
 						fieldProps?.onOpenChange?.(isOpen);
 					}
 				}) : null;
-				$[27] = dayValue;
-				$[28] = fieldProps;
-				$[29] = format;
-				$[30] = handleRangeChange;
-				$[31] = intl;
-				$[32] = open;
-				$[33] = picker;
-				$[34] = setOpen;
-				$[35] = showTime;
-				$[36] = t7;
-			} else t7 = $[36];
+				$[25] = dayValue;
+				$[26] = fieldProps;
+				$[27] = format;
+				$[28] = handleRangeChange;
+				$[29] = intl;
+				$[30] = open;
+				$[31] = picker;
+				$[32] = setOpen;
+				$[33] = showTime;
+				$[34] = t7;
+			} else t7 = $[34];
 			let t8;
-			if ($[37] !== fieldProps || $[38] !== setOpen) {
+			if ($[35] !== fieldProps || $[36] !== setOpen) {
 				t8 = () => {
 					fieldProps?.onOpenChange?.(true);
 					setOpen(true);
 				};
-				$[37] = fieldProps;
-				$[38] = setOpen;
-				$[39] = t8;
-			} else t8 = $[39];
+				$[35] = fieldProps;
+				$[36] = setOpen;
+				$[37] = t8;
+			} else t8 = $[37];
 			let t9;
-			if ($[40] !== fieldProps.disabled || $[41] !== label || $[42] !== lightLabel || $[43] !== t5 || $[44] !== t6 || $[45] !== t7 || $[46] !== t8 || $[47] !== variant) {
+			if ($[38] !== fieldProps.disabled || $[39] !== label || $[40] !== lightLabel || $[41] !== t5 || $[42] !== t6 || $[43] !== t7 || $[44] !== t8 || $[45] !== variant) {
 				t9 = /* @__PURE__ */ jsx(FieldLabel, {
 					ref: lightLabel,
 					allowClear: false,
@@ -10554,40 +10550,40 @@ const FieldRangePicker = (t0) => {
 					variant,
 					onClick: t8
 				});
-				$[40] = fieldProps.disabled;
-				$[41] = label;
-				$[42] = lightLabel;
-				$[43] = t5;
-				$[44] = t6;
-				$[45] = t7;
-				$[46] = t8;
-				$[47] = variant;
-				$[48] = t9;
-			} else t9 = $[48];
+				$[38] = fieldProps.disabled;
+				$[39] = label;
+				$[40] = lightLabel;
+				$[41] = t5;
+				$[42] = t6;
+				$[43] = t7;
+				$[44] = t8;
+				$[45] = variant;
+				$[46] = t9;
+			} else t9 = $[46];
 			dom_0 = t9;
 		} else {
 			let t5;
-			if ($[49] !== intl) {
+			if ($[47] !== intl) {
 				t5 = intl.getMessage("tableForm.selectPlaceholder", "请选择");
-				$[49] = intl;
-				$[50] = t5;
-			} else t5 = $[50];
+				$[47] = intl;
+				$[48] = t5;
+			} else t5 = $[48];
 			let t6;
-			if ($[51] !== intl) {
+			if ($[49] !== intl) {
 				t6 = intl.getMessage("tableForm.selectPlaceholder", "请选择");
-				$[51] = intl;
-				$[52] = t6;
-			} else t6 = $[52];
+				$[49] = intl;
+				$[50] = t6;
+			} else t6 = $[50];
 			let t7;
-			if ($[53] !== t5 || $[54] !== t6) {
+			if ($[51] !== t5 || $[52] !== t6) {
 				t7 = [t5, t6];
-				$[53] = t5;
-				$[54] = t6;
-				$[55] = t7;
-			} else t7 = $[55];
+				$[51] = t5;
+				$[52] = t6;
+				$[53] = t7;
+			} else t7 = $[53];
 			const t8 = plain === void 0 ? variant : plain ? "borderless" : "outlined";
 			let t9;
-			if ($[56] !== dayValue || $[57] !== fieldProps || $[58] !== format || $[59] !== ref || $[60] !== showTime || $[61] !== t7 || $[62] !== t8) {
+			if ($[54] !== dayValue || $[55] !== fieldProps || $[56] !== format || $[57] !== ref || $[58] !== showTime || $[59] !== t7 || $[60] !== t8) {
 				t9 = /* @__PURE__ */ jsx(DatePicker.RangePicker, {
 					ref,
 					format,
@@ -10597,31 +10593,31 @@ const FieldRangePicker = (t0) => {
 					...fieldProps,
 					value: dayValue
 				});
-				$[56] = dayValue;
-				$[57] = fieldProps;
-				$[58] = format;
-				$[59] = ref;
-				$[60] = showTime;
-				$[61] = t7;
-				$[62] = t8;
-				$[63] = t9;
-			} else t9 = $[63];
+				$[54] = dayValue;
+				$[55] = fieldProps;
+				$[56] = format;
+				$[57] = ref;
+				$[58] = showTime;
+				$[59] = t7;
+				$[60] = t8;
+				$[61] = t9;
+			} else t9 = $[61];
 			dom_0 = t9;
 		}
 		if (formItemRender) {
 			let t5;
-			if ($[64] !== dom_0 || $[65] !== fieldProps || $[66] !== formItemRender || $[67] !== mode || $[68] !== text) {
+			if ($[62] !== dom_0 || $[63] !== fieldProps || $[64] !== formItemRender || $[65] !== mode || $[66] !== text) {
 				t5 = formItemRender(text, {
 					mode,
 					...fieldProps
 				}, dom_0);
-				$[64] = dom_0;
-				$[65] = fieldProps;
-				$[66] = formItemRender;
-				$[67] = mode;
-				$[68] = text;
-				$[69] = t5;
-			} else t5 = $[69];
+				$[62] = dom_0;
+				$[63] = fieldProps;
+				$[64] = formItemRender;
+				$[65] = mode;
+				$[66] = text;
+				$[67] = t5;
+			} else t5 = $[67];
 			return t5;
 		}
 		return dom_0;
@@ -11428,9 +11424,19 @@ const FieldTimeRangePickerComponents = ({ text, light, label, mode, lightLabel,
 	const parsedStartText = startText ? dayjs(startText, startTextIsNumberOrMoment ? void 0 : finalFormat).format(finalFormat) : "";
 	const parsedEndText = endText ? dayjs(endText, endTextIsNumberOrMoment ? void 0 : finalFormat).format(finalFormat) : "";
 	if (mode === "read") {
-		const dom = /* @__PURE__ */ jsxs("div", {
+		const dom = /* @__PURE__ */ jsx("div", {
 			ref,
-			children: [/* @__PURE__ */ jsx("div", { children: parsedStartText || "-" }), /* @__PURE__ */ jsx("div", { children: parsedEndText || "-" })]
+			style: {
+				display: "flex",
+				flexWrap: "wrap",
+				gap: 4,
+				alignItems: "center"
+			},
+			children: parsedStartText || parsedEndText ? /* @__PURE__ */ jsxs(Fragment$1, { children: [
+				/* @__PURE__ */ jsx("div", { children: parsedStartText || "-" }),
+				/* @__PURE__ */ jsx("div", { children: "~" }),
+				/* @__PURE__ */ jsx("div", { children: parsedEndText || "-" })
+			] }) : "-"
 		});
 		if (render) return render(text, {
 			mode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xxlabs/antd-plus",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",
@@ -77,7 +77,7 @@
     "lefthook": "^2.0.15",
     "prettier": "^3.8.0",
     "prettier-plugin-organize-imports": "^4.3.0",
-    "prettier-plugin-packagejson": "^2.5.21",
+    "prettier-plugin-packagejson": "^2.5.22",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "semantic-release": "^25.0.2",
     "tsdown": "^0.19.0",