@acorex/components 16.0.7 → 16.0.9

Sign up to get free protection for your applications and to get access to all the features.
@@ -47,14 +47,21 @@ export class AXValidationRuleComponent {
47
47
  return new Promise((resolve) => {
48
48
  switch (type) {
49
49
  case 'required':
50
- resolve({
51
- message: message || AXTranslator.get('validation.messages.required'),
52
- result: (value != null &&
53
- value != '' &&
54
- (!Array.isArray(value) ||
55
- (Array.isArray(value) && value.length > 0))) ||
56
- (typeof value === 'string' && value.trim() != ''),
57
- });
50
+ if (typeof value === 'string') {
51
+ resolve({
52
+ message: message || AXTranslator.get('validation.messages.required'),
53
+ result: value.trim() != '',
54
+ });
55
+ }
56
+ else {
57
+ resolve({
58
+ message: message || AXTranslator.get('validation.messages.required'),
59
+ result: value != null &&
60
+ value != '' &&
61
+ (!Array.isArray(value) ||
62
+ (Array.isArray(value) && value.length > 0)),
63
+ });
64
+ }
58
65
  break;
59
66
  case 'regex':
60
67
  const ex = new RegExp(ruleValue);
@@ -118,4 +125,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.12", ngImpo
118
125
  }], enabled: [{
119
126
  type: Input
120
127
  }] } });
121
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation-rule.widget.js","sourceRoot":"","sources":["../../../../../../libs/components/src/lib/validation/validation-rule.widget.ts"],"names":[],"mappings":"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","sourcesContent":["import { AXTranslator } from '@acorex/core';\nimport { Component, ElementRef, Inject, Input, Optional } from '@angular/core';\nimport {\n  AXValidationRule,\n  AXValidationRuleResult,\n  AXValidationRuleTypes,\n} from './validation.class';\n\n// @dynamic\nexport class AXValidationRules {\n  private static registredRules: { name: string; rule: AXValidationRule }[] =\n    [];\n\n  public static addRule(name: string, rule: AXValidationRule) {\n    const exists = AXValidationRules.get(name);\n    if (exists) {\n      exists.rule = rule;\n    } else {\n      AXValidationRules.registredRules.push({\n        name,\n        rule,\n      });\n    }\n  }\n\n  public static get(name: string) {\n    return this.registredRules.find((c) => c.name === name);\n  }\n}\n\n@Component({\n  selector: 'ax-validation-rule',\n  template: '',\n})\nexport class AXValidationRuleComponent implements AXValidationRule {\n  @Input()\n  type: AXValidationRuleTypes = 'required';\n  @Input()\n  message: string;\n  @Input()\n  value: any;\n\n  @Input()\n  enabled: boolean = true;\n\n  constructor(\n    @Inject(ElementRef)\n    @Optional()\n    private ref?: ElementRef\n  ) {\n    if (ref) ref.nativeElement['__axContext__'] = this;\n  }\n\n  validate(value: any): Promise<AXValidationRuleResult> {\n    if (this.enabled === false) {\n      return Promise.resolve({ result: true });\n    }\n    const regRule = AXValidationRules.get(this.type);\n    if (regRule) {\n      return this.internalValidate(\n        regRule.rule.type,\n        value,\n        this.message || regRule.rule.message,\n        regRule.rule.value\n      );\n    } else {\n      return this.internalValidate(this.type, value, this.message, this.value);\n    }\n  }\n\n  private internalValidate(\n    type: string,\n    value?: any,\n    message?: string,\n    ruleValue?: any\n  ): Promise<AXValidationRuleResult> {\n    return new Promise<AXValidationRuleResult>((resolve) => {\n      switch (type) {\n        case 'required':\n          resolve({\n            message:\n              message || AXTranslator.get('validation.messages.required'),\n            result:\n              (value != null &&\n                value != '' &&\n                (!Array.isArray(value) ||\n                  (Array.isArray(value) && value.length > 0))) ||\n              (typeof value === 'string' && value.trim() != ''),\n          });\n          break;\n        case 'regex':\n          const ex = new RegExp(ruleValue);\n          resolve({\n            message: message || AXTranslator.get('validation.messages.regex'),\n            result: ex.test(value),\n          });\n          break;\n        case 'custom':\n        case 'callback':\n          if (typeof ruleValue === 'function') {\n            const res: any = {};\n            res.message = message;\n            const val = ruleValue({ value, message });\n            if (val instanceof Promise) {\n              val\n                .then((c) => {\n                  res.result = c;\n                })\n                .catch((c) => {\n                  res.result = false;\n                })\n                .finally(() => {\n                  resolve(res);\n                });\n            } else {\n              res.result = val;\n              resolve(res);\n            }\n          } else {\n            resolve({ result: true });\n          }\n          break;\n        default:\n          resolve({ result: true });\n      }\n    });\n  }\n}\n"]}
128
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validation-rule.widget.js","sourceRoot":"","sources":["../../../../../../libs/components/src/lib/validation/validation-rule.widget.ts"],"names":[],"mappings":"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","sourcesContent":["import { AXTranslator } from '@acorex/core';\nimport { Component, ElementRef, Inject, Input, Optional } from '@angular/core';\nimport {\n  AXValidationRule,\n  AXValidationRuleResult,\n  AXValidationRuleTypes,\n} from './validation.class';\n\n// @dynamic\nexport class AXValidationRules {\n  private static registredRules: { name: string; rule: AXValidationRule }[] =\n    [];\n\n  public static addRule(name: string, rule: AXValidationRule) {\n    const exists = AXValidationRules.get(name);\n    if (exists) {\n      exists.rule = rule;\n    } else {\n      AXValidationRules.registredRules.push({\n        name,\n        rule,\n      });\n    }\n  }\n\n  public static get(name: string) {\n    return this.registredRules.find((c) => c.name === name);\n  }\n}\n\n@Component({\n  selector: 'ax-validation-rule',\n  template: '',\n})\nexport class AXValidationRuleComponent implements AXValidationRule {\n  @Input()\n  type: AXValidationRuleTypes = 'required';\n  @Input()\n  message: string;\n  @Input()\n  value: any;\n\n  @Input()\n  enabled: boolean = true;\n\n  constructor(\n    @Inject(ElementRef)\n    @Optional()\n    private ref?: ElementRef\n  ) {\n    if (ref) ref.nativeElement['__axContext__'] = this;\n  }\n\n  validate(value: any): Promise<AXValidationRuleResult> {\n    if (this.enabled === false) {\n      return Promise.resolve({ result: true });\n    }\n    const regRule = AXValidationRules.get(this.type);\n    if (regRule) {\n      return this.internalValidate(\n        regRule.rule.type,\n        value,\n        this.message || regRule.rule.message,\n        regRule.rule.value\n      );\n    } else {\n      return this.internalValidate(this.type, value, this.message, this.value);\n    }\n  }\n\n  private internalValidate(\n    type: string,\n    value?: any,\n    message?: string,\n    ruleValue?: any\n  ): Promise<AXValidationRuleResult> {\n    return new Promise<AXValidationRuleResult>((resolve) => {\n      switch (type) {\n        case 'required':\n          if (typeof value === 'string') {\n            resolve({\n              message:\n                message || AXTranslator.get('validation.messages.required'),\n              result: value.trim() != '',\n            });\n          } else {\n            resolve({\n              message:\n                message || AXTranslator.get('validation.messages.required'),\n              result:\n                value != null &&\n                value != '' &&\n                (!Array.isArray(value) ||\n                  (Array.isArray(value) && value.length > 0)),\n            });\n          }\n\n          break;\n        case 'regex':\n          const ex = new RegExp(ruleValue);\n          resolve({\n            message: message || AXTranslator.get('validation.messages.regex'),\n            result: ex.test(value),\n          });\n          break;\n        case 'custom':\n        case 'callback':\n          if (typeof ruleValue === 'function') {\n            const res: any = {};\n            res.message = message;\n            const val = ruleValue({ value, message });\n            if (val instanceof Promise) {\n              val\n                .then((c) => {\n                  res.result = c;\n                })\n                .catch((c) => {\n                  res.result = false;\n                })\n                .finally(() => {\n                  resolve(res);\n                });\n            } else {\n              res.result = val;\n              resolve(res);\n            }\n          } else {\n            resolve({ result: true });\n          }\n          break;\n        default:\n          resolve({ result: true });\n      }\n    });\n  }\n}\n"]}
@@ -71,14 +71,21 @@ class AXValidationRuleComponent {
71
71
  return new Promise((resolve) => {
72
72
  switch (type) {
73
73
  case 'required':
74
- resolve({
75
- message: message || AXTranslator.get('validation.messages.required'),
76
- result: (value != null &&
77
- value != '' &&
78
- (!Array.isArray(value) ||
79
- (Array.isArray(value) && value.length > 0))) ||
80
- (typeof value === 'string' && value.trim() != ''),
81
- });
74
+ if (typeof value === 'string') {
75
+ resolve({
76
+ message: message || AXTranslator.get('validation.messages.required'),
77
+ result: value.trim() != '',
78
+ });
79
+ }
80
+ else {
81
+ resolve({
82
+ message: message || AXTranslator.get('validation.messages.required'),
83
+ result: value != null &&
84
+ value != '' &&
85
+ (!Array.isArray(value) ||
86
+ (Array.isArray(value) && value.length > 0)),
87
+ });
88
+ }
82
89
  break;
83
90
  case 'regex':
84
91
  const ex = new RegExp(ruleValue);