cnhis-design-vue 3.1.24-beta.5 → 3.1.24-beta.6

package/es/components/form-render/src/components/renderer/date.js

@@ -7,6 +7,7 @@ import { NDatePicker } from 'naive-ui';
 import { useCommonInjection } from '../../hooks/useCommonInjection.js';
 import '../../utils/index.js';
 import { assignUpdateValue, assignClearBindVisited } from '../../utils/schema.js';
+import { businessDateParser } from '../../utils/business.js';
 
 const script = defineComponent({
   props: {
@@ -110,6 +111,39 @@ const script = defineComponent({
         return value;
       return format(new Date(value), props.valueFormat);
     }
+    let prevInputContent = "";
+    function onKeydown(evt) {
+      if (evt.key !== "Enter") {
+        prevInputContent = evt.target.value + evt.key;
+        return;
+      }
+      const result = businessDateParser(prevInputContent);
+      if (!result)
+        return;
+      const {
+        isTimeDisabled: isTimeDisabled2,
+        isDateDisabled: isDateDisabled2
+      } = validateConfig.value;
+      if (!isValidDate(result))
+        return;
+      valueRef.value = format(result, props.valueFormat);
+      function isValidDate(date) {
+        const dateDisabled = !isDateDisabled2 || isDateDisabled2(date.getTime());
+        if (dateDisabled)
+          return;
+        const {
+          isHourDisabled,
+          isMinuteDisabled
+        } = isTimeDisabled2 ? isTimeDisabled2(date.getTime()) : {};
+        const hourDisabled = !isHourDisabled || isHourDisabled(date.getHours());
+        if (hourDisabled)
+          return;
+        const minuteDisabled = !isMinuteDisabled || isMinuteDisabled(date.getMinutes());
+        if (minuteDisabled)
+          return;
+        return true;
+      }
+    }
     watch(() => props.value, (value) => {
       if (!value || formatDate(value) === value)
         return;
@@ -117,14 +151,18 @@ const script = defineComponent({
     });
     const valueRef = computed({
       get: () => formatDate(props.value),
-      set: (value) => emit("update:value", value)
+      set: (value) => {
+        emit("update:value", value);
+        prevInputContent = "";
+      }
     });
     const key = injectValueBindKey(valueRef);
     return () => createVNode(NDatePicker, mergeProps({
       "key": key.value
     }, validateConfig.value, formatConfig.value, {
       "formatted-value": valueRef.value,
-      "onUpdate:formatted-value": ($event) => valueRef.value = $event
+      "onUpdate:formatted-value": ($event) => valueRef.value = $event,
+      "onKeydown": onKeydown
     }), null);
   }
 });

package/es/components/form-render/src/utils/business.d.ts

@@ -10,3 +10,4 @@ export declare function parseAge2FromContext(context: AgeContext): {
     ageUnit: FIELD_AGE_UNIT;
     age: number;
 };
+export declare function businessDateParser(dateString: string): Date | undefined;

package/es/components/form-render/src/utils/business.js

@@ -1,4 +1,5 @@
 import { differenceInDays, differenceInMonths, differenceInYears, format } from 'date-fns';
+import { isString } from 'lodash-es';
 import { FIELD_AGE_UNIT, FIELD_SEX_VALUE } from '../constants/index.js';
 
 function parseIdCard(idCardNo) {
@@ -19,7 +20,7 @@ function parseIdCard(idCardNo) {
   return parseInner(idCardNo, idCardNo.length == 15 ? 14 : 16, idCardNo.length == 15 ? 2 : 4);
 }
 function isMonthType(format2) {
-  return format2 && format2.replace(/yyyy-MM/gi, "YYYY-MM") === "YYYY-MM";
+  return format2 && format2.toUpperCase() === "YYYY-MM";
 }
 function transformDateFormat(format2 = "") {
   if (isMonthType(format2))
@@ -74,5 +75,15 @@ function parseAge2Birthday(age, ageUnit, formatter = "yyyy-MM-dd") {
 function parseAge2FromContext(context) {
   return context.day < 30 ? { ageUnit: FIELD_AGE_UNIT.DAY, age: context.day } : context.day < 365 ? { ageUnit: FIELD_AGE_UNIT.MONTH, age: context.month } : { ageUnit: FIELD_AGE_UNIT.YEAR, age: context.year };
 }
+const businessDateMatcher = /^(\d{4})-?(\d{2})-?(\d{2})?\s?(\d{2})?:?(\d{2})?:?(\d{2})?$/;
+function businessDateParser(dateString) {
+  if (!isString(dateString))
+    return;
+  const matched = dateString.match(businessDateMatcher);
+  if (!matched)
+    return;
+  const [, year, month, day, hour, minute, second] = matched;
+  return new Date(`${year}-${month}-${day || "01"} ${hour || "00"}:${minute || "00"}:${second || "00"}`);
+}
 
-export { isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat };
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.24-beta.5",
+	"version": "3.1.24-beta.6",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -66,5 +66,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "9d7fb3bfacd501109ba0284caf58efa1c7108cd8"
+	"gitHead": "e20944cd695f9fd8c1a267ebee989aaf4e3bd279"
 }