plain-design 1.0.0-beta.71 → 1.0.0-beta.72

package/src/packages/components/Form/types/qq.tsx

@@ -1,11 +1,11 @@
-import {iValidation} from "../validate/createValidation";
-import {checkStringValidation} from "./string";
-import i18n from "../../i18n";
-
-const defaultPattern = /^[1-9][0-9]{4,9}$/;
-
-export function registryQQValidationType(Validation: iValidation) {
-  Validation.registryValidateType('qq', async (param) => {
-    return checkStringValidation(param, { defaultPattern, patternMessage: i18n.$it('base.validate.pleaseEnterCorrectQQNum').d('请输入正确的QQ号码') });
-  });
-}
+import {iValidation} from "../validate/createValidation";
+import {checkStringValidation} from "./string";
+import i18n from "../../i18n";
+
+const defaultPattern = /^[1-9][0-9]{4,9}$/;
+
+export function registryQQValidationType(Validation: iValidation) {
+  Validation.registryValidateType('qq', async (param) => {
+    return checkStringValidation(param, { defaultPattern, patternMessage: i18n.$it('base.validate.pleaseEnterCorrectQQNum').d('请输入正确的QQ号码') });
+  });
+}

package/src/packages/components/Form/types/string.tsx

@@ -1,68 +1,68 @@
-import {toArray} from "plain-utils/utils/toArray";
-import {iValidation} from "../validate/createValidation";
-import {iRegistrationValidator} from "../validate/validate.utils";
-import i18n from "../../i18n";
-
-export function registryStringValidationType(Validation: iValidation) {
-  Validation.registryValidateType('string', async (param) => {
-    return checkStringValidation(param);
-  });
-}
-
-export function checkStringValidation(
-  { value, rule, required, getMessage }: Parameters<iRegistrationValidator>[0],
-  config?: { defaultPattern?: RegExp | RegExp[], patternMessage?: string }) {
-
-  /*是否没有值*/
-  let isEmpty = (
-    /*null, undefined*/
-    value == null ||
-    /*空字符串*/
-    (typeof value === "string" && value.trim() === '')
-  );
-
-  if (!isEmpty && typeof value != "string" && typeof value != "number") {
-    return getMessage(i18n.$it('base.validate.valueShouldBeStringOrNumber').d('值类型应该为字符串或者数字'));
-  }
-
-  if (!isEmpty) {if (typeof value === "number") {value = String(value);}}
-
-  /*any值的必填校验*/
-  if (required) {
-    if (isEmpty) {
-      return getMessage(i18n.$it('base.validate.require').d('必填'));
-    }
-  }
-
-  /*正则匹配*/
-  const patterns = toArray((rule.pattern as RegExp | undefined) || config?.defaultPattern).filter(
-    Boolean
-  );
-  if (!isEmpty && !!patterns.length) {
-    const failPattern = patterns.find((i) => !i!.test(String(value)));
-    if (!!failPattern) {
-      return getMessage(config?.patternMessage || `${i18n.$it('base.validate.notMatchPattern').d('不符合表达式')}：${failPattern.source}`);
-    }
-  }
-
-  /*最小值*/
-  if (rule.min != null && !isEmpty && value.length < rule.min) {
-    return getMessage(i18n.$it('base.validate.minimunCharacters', { num: rule.min }).d(`最少${rule.min}个字符`));
-  }
-  /*最大值*/
-  if (rule.max != null && !isEmpty && value.length > rule.max) {
-    return getMessage(i18n.$it('base.validate.maximunCharacters', { num: rule.max }).d(`最多${rule.max}个字符`));
-  }
-  /*固定长度*/
-  if (rule.len != null && !isEmpty && value.length !== rule.len) {
-    return getMessage(i18n.$it('base.validate.fixedCharacters', { num: rule.len }).d(`固定${rule.len}个字符`));
-  }
-
-  /*枚举范围（取值范围）*/
-  const _enum = rule.enum;
-  if (_enum && !isEmpty) {
-    if (toArray(value).some(i => _enum.indexOf(i) === -1)) {
-      return getMessage(i18n.$it('base.validate.outOfRange', { value, range: _enum }).d(`值${value}超出了范围${_enum}`));
-    }
-  }
-}
+import {toArray} from "plain-utils/utils/toArray";
+import {iValidation} from "../validate/createValidation";
+import {iRegistrationValidator} from "../validate/validate.utils";
+import i18n from "../../i18n";
+
+export function registryStringValidationType(Validation: iValidation) {
+  Validation.registryValidateType('string', async (param) => {
+    return checkStringValidation(param);
+  });
+}
+
+export function checkStringValidation(
+  { value, rule, required, getMessage }: Parameters<iRegistrationValidator>[0],
+  config?: { defaultPattern?: RegExp | RegExp[], patternMessage?: string }) {
+
+  /*是否没有值*/
+  let isEmpty = (
+    /*null, undefined*/
+    value == null ||
+    /*空字符串*/
+    (typeof value === "string" && value.trim() === '')
+  );
+
+  if (!isEmpty && typeof value != "string" && typeof value != "number") {
+    return getMessage(i18n.$it('base.validate.valueShouldBeStringOrNumber').d('值类型应该为字符串或者数字'));
+  }
+
+  if (!isEmpty) {if (typeof value === "number") {value = String(value);}}
+
+  /*any值的必填校验*/
+  if (required) {
+    if (isEmpty) {
+      return getMessage(i18n.$it('base.validate.require').d('必填'));
+    }
+  }
+
+  /*正则匹配*/
+  const patterns = toArray((rule.pattern as RegExp | undefined) || config?.defaultPattern).filter(
+    Boolean
+  );
+  if (!isEmpty && !!patterns.length) {
+    const failPattern = patterns.find((i) => !i!.test(String(value)));
+    if (!!failPattern) {
+      return getMessage(config?.patternMessage || `${i18n.$it('base.validate.notMatchPattern').d('不符合表达式')}：${failPattern.source}`);
+    }
+  }
+
+  /*最小值*/
+  if (rule.min != null && !isEmpty && value.length < rule.min) {
+    return getMessage(i18n.$it('base.validate.minimunCharacters', { num: rule.min }).d(`最少${rule.min}个字符`));
+  }
+  /*最大值*/
+  if (rule.max != null && !isEmpty && value.length > rule.max) {
+    return getMessage(i18n.$it('base.validate.maximunCharacters', { num: rule.max }).d(`最多${rule.max}个字符`));
+  }
+  /*固定长度*/
+  if (rule.len != null && !isEmpty && value.length !== rule.len) {
+    return getMessage(i18n.$it('base.validate.fixedCharacters', { num: rule.len }).d(`固定${rule.len}个字符`));
+  }
+
+  /*枚举范围（取值范围）*/
+  const _enum = rule.enum;
+  if (_enum && !isEmpty) {
+    if (toArray(value).some(i => _enum.indexOf(i) === -1)) {
+      return getMessage(i18n.$it('base.validate.outOfRange', { value, range: _enum }).d(`值${value}超出了范围${_enum}`));
+    }
+  }
+}

package/src/packages/components/Form/types/time.tsx

@@ -1,8 +1,8 @@
-import {iValidation} from "../validate/createValidation";
-import {validateDatetimeValue} from "./date";
-
-export function registryTimeValidationType(Validation: iValidation) {
-  Validation.registryValidateType('time', async (param) => {
-    return validateDatetimeValue(param, 'HH:mm:ss', 'Hms');
-  });
-}
+import {iValidation} from "../validate/createValidation";
+import {validateDatetimeValue} from "./date";
+
+export function registryTimeValidationType(Validation: iValidation) {
+  Validation.registryValidateType('time', async (param) => {
+    return validateDatetimeValue(param, 'HH:mm:ss', 'Hms');
+  });
+}