amis-editor 6.4.0 → 6.5.0

package/lib/tpl/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.0
- * build time: 2024-05-06
+ * amis-editor v6.5.0
+ * build time: 2024-05-31
  * Copyright 2018-2024 @fex
  */
 
@@ -155,65 +155,65 @@ amisEditorCore.setSchemaTpl('validations', function () {
     }, {
       type: 'input-number',
       name: 'isLength',
-      visibleOn: 'data.type == "isLength"',
+      visibleOn: 'this.type == "isLength"',
       placeholder: i18nRuntime.i18n("7be30fe376e9bfd8895ee50e6f4216f3"),
       value: '1'
     }, {
       type: 'input-number',
       name: 'maximum',
-      visibleOn: 'data.type == "maximum"',
+      visibleOn: 'this.type == "maximum"',
       placeholder: i18nRuntime.i18n("d00f99fd76e86ba4dab6f70858010ca0")
     }, {
       type: 'input-number',
       name: 'minimum',
-      visibleOn: 'data.type == "minimum"',
+      visibleOn: 'this.type == "minimum"',
       placeholder: i18nRuntime.i18n("e993ecfbb3f934481257f1bb57056bfe")
     }, {
       type: 'input-number',
       name: 'maxLength',
-      visibleOn: 'data.type == "maxLength"',
+      visibleOn: 'this.type == "maxLength"',
       placeholder: i18nRuntime.i18n("99f5d503544334c670cbe1f400aea9e1")
     }, {
       type: 'input-number',
       name: 'minLength',
-      visibleOn: 'data.type == "minLength"',
+      visibleOn: 'this.type == "minLength"',
       placeholder: i18nRuntime.i18n("91bdac623455c91b7400328a5600cec0")
     }, {
       type: 'input-text',
       name: 'equals',
-      visibleOn: 'data.type == "equals"',
+      visibleOn: 'this.type == "equals"',
       placeholder: i18nRuntime.i18n("7002c4a1b7cb5bc32ffd52e1f2d74c70"),
       value: ''
     }, {
       type: 'input-text',
       name: 'equalsField',
-      visibleOn: 'data.type == "equalsField"',
+      visibleOn: 'this.type == "equalsField"',
       placeholder: i18nRuntime.i18n("aa9cfa5321e589494841ddd90a10c467"),
       value: ''
     }, {
       type: 'input-text',
       name: 'matchRegexp',
-      visibleOn: 'data.type == "matchRegexp"',
+      visibleOn: 'this.type == "matchRegexp"',
       placeholder: i18nRuntime.i18n("d22b6fb1c857777ba21467835efc65d6")
     }, {
       type: 'input-text',
       name: 'matchRegexp1',
-      visibleOn: 'data.type == "matchRegexp1"',
+      visibleOn: 'this.type == "matchRegexp1"',
       placeholder: i18nRuntime.i18n("d22b6fb1c857777ba21467835efc65d6")
     }, {
       type: 'input-text',
       name: 'matchRegexp2',
-      visibleOn: 'data.type == "matchRegexp2"',
+      visibleOn: 'this.type == "matchRegexp2"',
       placeholder: i18nRuntime.i18n("d22b6fb1c857777ba21467835efc65d6")
     }, {
       type: 'input-text',
       name: 'matchRegexp3',
-      visibleOn: 'data.type == "matchRegexp3"',
+      visibleOn: 'this.type == "matchRegexp3"',
       placeholder: i18nRuntime.i18n("d22b6fb1c857777ba21467835efc65d6")
     }, {
       type: 'input-text',
       name: 'matchRegexp4',
-      visibleOn: 'data.type == "matchRegexp4"',
+      visibleOn: 'this.type == "matchRegexp4"',
       placeholder: i18nRuntime.i18n("d22b6fb1c857777ba21467835efc65d6")
     }]
   };
@@ -426,7 +426,10 @@ amisEditorCore.setSchemaTpl('validation', function (config) {
     title: i18nRuntime.i18n("b7579706a363e5f23b1040fecfbcb677"),
     body: [tslib.__assign({
       type: 'ae-validationControl',
-      mode: 'normal'
+      mode: 'normal',
+      style: {
+        marginBottom: '6px'
+      }
     }, config
     // pipeIn: (value: any, data: any) => {
     //   // return reduce(value, (arr: any, item) => {
@@ -454,10 +457,14 @@ amisEditorCore.setSchemaTpl('validation', function (config) {
     //   //   return arr;
     //   // }, []);
     // },
-    ), amisEditorCore.getSchemaTpl('validateOnChange')]
+    ), amisEditorCore.getSchemaTpl('validationApiControl'), amisEditorCore.getSchemaTpl('validateOnChange')]
   };
   return a;
 });
+amisEditorCore.setSchemaTpl('validationApiControl', {
+  type: 'ae-validationApiControl',
+  label: false
+});
 amisEditorCore.setSchemaTpl('validationControl', function (value) {
   if (value === void 0) {
     value = [];
@@ -496,4 +503,4 @@ amisEditorCore.setSchemaTpl('validationControl', function (value) {
     value: value
   };
 });
-window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};
+window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};

package/lib/util.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.0
- * build time: 2024-05-06
+ * amis-editor v6.5.0
+ * build time: 2024-05-31
  * Copyright 2018-2024 @fex
  */
 
@@ -455,4 +455,4 @@ exports.resolveOptionEventDataSchame = resolveOptionEventDataSchame;
 exports.resolveOptionType = resolveOptionType;
 exports.schemaArrayFormat = schemaArrayFormat;
 exports.schemaToArray = schemaToArray;
-window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};
+window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};

package/lib/validator.d.ts

@@ -39,6 +39,7 @@ declare enum ValidTagMatchType {
     isBuiltIn = 3
 }
 export declare const registerValidator: (...config: Array<Validator>) => void;
+export declare const removeAllValidator: () => void;
 export declare const getValidatorsByTag: (tag: ValidatorTag) => {
     defaultValidators: Record<string, Validator>;
     moreValidators: Record<string, Validator>;
@@ -57,6 +58,8 @@ export declare enum ValidatorTag {
     File = "8",
     Date = "9",
     Code = "10",
-    Tree = "11"
+    Tree = "11",
+    Phone = "12",
+    Tel = "13"
 }
 export {};

package/lib/validator.js

@@ -1,6 +1,6 @@
 /**
- * amis-editor v6.4.0
- * build time: 2024-05-06
+ * amis-editor v6.5.0
+ * build time: 2024-05-31
  * Copyright 2018-2024 @fex
  */
 
@@ -36,6 +36,9 @@ var registerValidator = function () {
   }
   Validators.push.apply(Validators, tslib.__spreadArray([], tslib.__read(config), false));
 };
+var removeAllValidator = function () {
+  Validators.length = 0;
+};
 var getValidatorsByTag = function (tag) {
   var defaultValidators = {};
   var moreValidators = {};
@@ -88,11 +91,13 @@ exports.ValidatorTag = void 0;
   ValidatorTag["Date"] = "9";
   ValidatorTag["Code"] = "10";
   ValidatorTag["Tree"] = "11";
+  ValidatorTag["Phone"] = "12";
+  ValidatorTag["Tel"] = "13";
 })(exports.ValidatorTag || (exports.ValidatorTag = {}));
 registerValidator.apply(void 0, tslib.__spreadArray([{
   label: i18nRuntime.i18n("537b39a8b56fdc27a5fdd70aa032d3bc"),
   name: 'required',
-  tag: (_a = {}, _a[exports.ValidatorTag.Text] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.File] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.MultiSelect] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Date] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Code] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Email] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Password] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.URL] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Tree] = ValidTagMatchType.isDefault, _a)
+  tag: (_a = {}, _a[exports.ValidatorTag.Text] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.File] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.MultiSelect] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Date] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Code] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Email] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Password] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.URL] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Tree] = ValidTagMatchType.isDefault, _a[exports.ValidatorTag.Phone] = ValidTagMatchType.isDefault, _a)
 }, {
   label: i18nRuntime.i18n("cff1ec632eaf35f64791615e15ce6d76"),
   name: 'isEmail',
@@ -248,13 +253,13 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
   name: 'isPhoneNumber',
   group: exports.ValidationGroup.Pattern,
   message: i18nRuntime.i18n("161278fb2c71e5a8aa8aac50f230233d"),
-  tag: (_p = {}, _p[exports.ValidatorTag.Text] = ValidTagMatchType.isMore, _p)
+  tag: (_p = {}, _p[exports.ValidatorTag.Text] = ValidTagMatchType.isMore, _p[exports.ValidatorTag.Phone] = ValidTagMatchType.isBuiltIn, _p)
 }, {
   label: i18nRuntime.i18n("193a8c42c1c373f385a4c7b33ffc381e"),
   name: 'isTelNumber',
   group: exports.ValidationGroup.Pattern,
   message: i18nRuntime.i18n("ba42949accfe87c20e6c2486cd065dd2"),
-  tag: (_q = {}, _q[exports.ValidatorTag.Text] = ValidTagMatchType.isMore, _q)
+  tag: (_q = {}, _q[exports.ValidatorTag.Text] = ValidTagMatchType.isMore, _q[exports.ValidatorTag.Tel] = ValidTagMatchType.isBuiltIn, _q)
 }, {
   label: i18nRuntime.i18n("6102d474314f27577d89e85b4c6cc4a5"),
   name: 'isZipcode',
@@ -324,4 +329,5 @@ registerValidator.apply(void 0, tslib.__spreadArray([{
 exports.getValidator = getValidator;
 exports.getValidatorsByTag = getValidatorsByTag;
 exports.registerValidator = registerValidator;
-window.amisEditorVersionInfo={version:'6.4.0',buildTime:'2024-05-06'};
+exports.removeAllValidator = removeAllValidator;
+window.amisEditorVersionInfo={version:'6.5.0',buildTime:'2024-05-31'};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-editor",
-  "version": "6.4.0",
+  "version": "6.5.0",
   "description": "amis 可视化编辑器",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@webcomponents/webcomponentsjs": "^2.6.0",
-    "amis-editor-core": "^6.4.0",
+    "amis-editor-core": "^6.5.0",
     "amis-postcss": "1.0.0",
     "amis-theme-editor-helper": "*",
     "i18n-runtime": "*",
@@ -81,8 +81,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-overlays": "5.1.1",
-    "react-router": "5.2.0",
-    "react-router-dom": "5.2.0",
+    "react-router": "5.2.1",
+    "react-router-dom": "5.3.0",
     "rimraf": "^3.0.2",
     "rollup": "^2.73.0",
     "rollup-plugin-auto-external": "^2.0.0",