amis-core 6.0.0 → 6.1.0

package/lib/utils/resolveCondition.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/resolveVariable.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/resolveVariableAndFilter.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/scrollPosition.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/string2regExp.d.ts

@@ -1 +1 @@
-export declare function string2regExp(value: string, caseSensitive?: boolean): RegExp;
+export declare function string2regExp(value: string, caseSensitive?: boolean, globalSearch?: boolean): RegExp;

package/lib/utils/string2regExp.js

@@ -1,18 +1,19 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function string2regExp(value, caseSensitive) {
+function string2regExp(value, caseSensitive, globalSearch) {
     if (caseSensitive === void 0) { caseSensitive = false; }
+    if (globalSearch === void 0) { globalSearch = false; }
     if (typeof value !== 'string') {
         throw new TypeError('Expected a string');
     }
-    return new RegExp(value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d'), !caseSensitive ? 'i' : '');
+    return new RegExp(value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d'), "".concat(!caseSensitive ? 'i' : '').concat(globalSearch ? 'g' : ''));
 }
 
 exports.string2regExp = string2regExp;

package/lib/utils/stripNumber.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/style-helper.d.ts

@@ -10,7 +10,7 @@ interface extra {
 export declare function findOrCreateStyle(id: string, doc?: Document): HTMLElement;
 export declare function insertStyle(style: string, id: string, doc?: Document): void;
 export declare function addStyle(style: string, id: string): void;
-export declare function formatStyle(themeCss: any, classNames?: CustomStyleClassName[], id?: string, defaultData?: any): {
+export declare function formatStyle(themeCss: any, classNames?: CustomStyleClassName[], id?: string, defaultData?: any, data?: any): {
     value: string;
     origin: {
         className: string;
@@ -26,7 +26,15 @@ export interface CustomStyleClassName {
         disabled?: extra;
     };
 }
-export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id: string, defaultData?: any, customStyleClassPrefix?: string, doc?: Document): void;
+export declare function insertCustomStyle(prams: {
+    themeCss: any;
+    classNames: CustomStyleClassName[];
+    id: string;
+    defaultData?: any;
+    customStyleClassPrefix?: string;
+    doc?: Document;
+    [propName: string]: any;
+}): void;
 /**
  * 根据路径获取默认值
  */
@@ -34,7 +42,12 @@ export declare function getValueByPath(path: string, data: any): any;
 /**
  * 设置源码编辑自定义样式
  */
-export declare function insertEditCustomStyle(customStyle: any, id?: string, doc?: Document): void;
+export declare function insertEditCustomStyle(params: {
+    customStyle: any;
+    id?: string;
+    doc?: Document;
+    [propName: string]: any;
+}): void;
 export interface InsertCustomStyle {
     themeCss: any;
     classNames: CustomStyleClassName[];
@@ -46,7 +59,13 @@ export interface InsertCustomStyle {
 /**
  * 移除自定义样式
  */
-export declare function removeCustomStyle(type: string, id: string, doc?: Document): void;
+export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
 export declare function formatInputThemeCss(themeCss: any): any;
-export declare function setThemeClassName(name: string, id?: string, themeCss?: any, extra?: string): string;
+export declare function setThemeClassName(params: {
+    name: string;
+    id?: string;
+    themeCss: any;
+    extra?: string;
+    [propName: string]: any;
+}): string;
 export {};

package/lib/utils/style-helper.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -14,6 +14,7 @@ var isObject = require('lodash/isObject');
 var map = require('lodash/map');
 var isEmpty = require('lodash/isEmpty');
 var kebabCase = require('lodash/kebabCase');
+var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -112,7 +113,7 @@ function handleInheritData(statusMap, data) {
         });
     });
 }
-function formatStyle(themeCss, classNames, id, defaultData) {
+function formatStyle(themeCss, classNames, id, defaultData, data) {
     var e_1, _a;
     // 没有具体的样式，或者没有对应的classname
     if (!themeCss || !classNames) {
@@ -132,6 +133,9 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         }
         var className = item.key + '-' + (id === null || id === void 0 ? void 0 : id.replace('u:', ''));
         var weightsList = item.weights || {};
+        if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+            className += "-".concat(data.index);
+        }
         var statusMap = {
             default: {},
             hover: {},
@@ -163,6 +167,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
             var styles = [];
             var fn = function (key, value) {
                 key = valueMap[key] || key;
+                value = resolveVariableAndFilter.resolveVariableAndFilter(value, data, '| raw') || value;
                 styles.push("".concat(key.startsWith('--') ? key : kebabCase__default["default"](key), ": ").concat(value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''), ";"));
             };
             Object.keys(statusMap[status]).forEach(function (key) {
@@ -235,13 +240,18 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         origin: res
     };
 }
-function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix, doc) {
+function insertCustomStyle(prams) {
+    var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
     if (!themeCss) {
         return;
     }
-    var value = formatStyle(themeCss, classNames, id, defaultData).value;
+    var value = formatStyle(themeCss, classNames, id, defaultData, data).value;
     value = customStyleClassPrefix ? "".concat(customStyleClassPrefix, " ").concat(value) : value;
-    insertStyle(value, id.replace('u:', ''), doc);
+    var classId = id.replace('u:', '');
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        classId += "-".concat(data.index);
+    }
+    insertStyle(value, classId, doc);
 }
 /**
  * 根据路径获取默认值
@@ -284,38 +294,53 @@ function traverseStyle(style, path, result) {
 /**
  * 设置源码编辑自定义样式
  */
-function insertEditCustomStyle(customStyle, id, doc) {
+function insertEditCustomStyle(params) {
+    var customStyle = params.customStyle, id = params.id, doc = params.doc, data = params.data;
     var styles = {};
     traverseStyle(customStyle, '', styles);
     var content = '';
+    var index = '';
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        index = "-".concat(data.index);
+    }
     if (!isEmpty__default["default"](styles)) {
-        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', ''));
+        var className_1 = "wrapperCustomStyle-".concat(id === null || id === void 0 ? void 0 : id.replace('u:', '')).concat(index);
         Object.keys(styles).forEach(function (key) {
             if (!isObject__default["default"](styles[key])) {
-                content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(styles[key], "\n}");
+                content += "\n.".concat(className_1, " {\n  ").concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(styles[key].replace(/['|"]/g, ''), data, '| raw') || styles[key], "\n}");
             }
             else if (key === 'root') {
-                var res = map__default["default"](styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                var res = map__default["default"](styles[key], function (value, key) {
+                    return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
+                });
                 content += "\n.".concat(className_1, " {\n  ").concat(res.join('\n  '), "\n}");
             }
             else if (/^root:/.test(key)) {
-                var res = map__default["default"](styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                var res = map__default["default"](styles[key], function (value, key) {
+                    return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
+                });
                 var nowKey = key.replace('root', '');
                 content += "\n.".concat(className_1, " ").concat(nowKey, " {\n  ").concat(res.join('\n  '), "\n}");
             }
             else {
-                var res = map__default["default"](styles[key], function (value, key) { return "".concat(key, ": ").concat(value, ";"); });
+                var res = map__default["default"](styles[key], function (value, key) {
+                    return "".concat(key, ": ").concat(resolveVariableAndFilter.resolveVariableAndFilter(value.replace(/['|"]/g, ''), data, '| raw') || value, ";");
+                });
                 content += "\n.".concat(className_1, " ").concat(key, " {\n  ").concat(res.join('\n  '), "\n}");
             }
         });
     }
-    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()), doc);
+    insertStyle(content, 'wrapperCustomStyle-' + ((id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid()) + index, doc);
 }
 /**
  * 移除自定义样式
  */
-function removeCustomStyle(type, id, doc) {
-    var style = (doc || document).getElementById('amis-' + (type ? type + '-' : '') + id.replace('u:', ''));
+function removeCustomStyle(type, id, doc, data) {
+    var styleId = 'amis-' + (type ? type + '-' : '') + id.replace('u:', '');
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        styleId += "-".concat(data.index);
+    }
+    var style = (doc || document).getElementById(styleId);
     if (style) {
         style.remove();
     }
@@ -334,14 +359,19 @@ function formatInputThemeCss(themeCss) {
     });
     return inputFontThemeCss;
 }
-function setThemeClassName(name, id, themeCss, extra) {
+function setThemeClassName(params) {
+    var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
     if (!id || !themeCss) {
         return '';
     }
     if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
         return '';
     }
-    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '');
+    var index = '';
+    if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
+        index = "-".concat(data.index);
+    }
+    return "".concat(name, "-").concat(id.replace('u:', '')) + (extra ? "-".concat(extra) : '') + index;
 }
 
 exports.addStyle = addStyle;

package/lib/utils/style.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/toNumber.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/tokenize.d.ts

@@ -1 +1,2 @@
+export declare function memoParse(str: string, options?: any): any;
 export declare const tokenize: (str: string, data: object, defaultFilter?: string) => string;

package/lib/utils/tokenize.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -9,13 +9,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
 
+var AST_CACHE = {};
+function memoParse(str, options) {
+    var key = "".concat(str).concat((options === null || options === void 0 ? void 0 : options.evalMode) ? '-eval' : '').concat((options === null || options === void 0 ? void 0 : options.allowFilter) ? '-filter' : '').concat((options === null || options === void 0 ? void 0 : options.variableMode) ? '-variable' : '');
+    var ast = AST_CACHE[key] || amisFormula.parse(str, options);
+    AST_CACHE[key] = ast;
+    return ast;
+}
 var tokenize = function (str, data, defaultFilter) {
     if (defaultFilter === void 0) { defaultFilter = '| html'; }
     if (!str || typeof str !== 'string') {
         return str;
     }
     try {
-        var ast = amisFormula.parse(str, {
+        var ast = memoParse(str, {
             evalMode: false,
             allowFilter: true
         });
@@ -30,4 +37,5 @@ var tokenize = function (str, data, defaultFilter) {
     }
 };
 
+exports.memoParse = memoParse;
 exports.tokenize = tokenize;

package/lib/utils/tpl-builtin.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/tpl-lodash.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/tpl.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -12,6 +12,7 @@ var tplBuiltin = require('./tpl-builtin.js');
 var tplLodash = require('./tpl-lodash.js');
 var amisFormula = require('amis-formula');
 var resolveCondition = require('./resolveCondition.js');
+var tokenize = require('./tokenize.js');
 
 var enginers = {};
 function registerTplEnginer(name, enginer) {
@@ -124,13 +125,10 @@ function evalExpressionWithConditionBuilder(expression, data, defaultResult) {
         });
     });
 }
-var AST_CACHE = {};
 function evalFormula(expression, data) {
-    var ast = AST_CACHE[expression] ||
-        amisFormula.parse(expression, {
-            evalMode: false
-        });
-    AST_CACHE[expression] = ast;
+    var ast = tokenize.memoParse(expression, {
+        evalMode: false
+    });
     return amisFormula.evaluate(ast, data, {
         defaultFilter: 'raw'
     });

package/lib/utils/uncontrollable.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';

package/lib/utils/validateId.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 身份证号码校验，（没有校验城市和区县）
+ *
+ * 身份证号码是由18位组成，分别表示：
+ * 第1、2位数字表示：所在省份的代码；
+ * 第3、4位数字表示：所在城市的代码；
+ * 第5、6位数字表示：所在区县的代码；
+ * 第7-14位数字表示：出生年、月、日（其中7、8、9、10位是年，11、12位是月，13、14位是日）；
+ * 第15-17位数字表示：顺序编码，都是同一地址辖区内的，以及同年同月同日出生人的顺序码，同时 第17位兼具性别标识功能，男单女双；
+ * 第18位是校检码：可以是0-9的数字，有时也用X表示, X来代替10。
+ *
+ * 身份证15位时，次序为省（2位）市（2位）区县（2位）年（2位）月（2位）日（2位）顺序编码（3位），皆为数字，没有最后一位校验码
+ */
+export declare function isId18(id: string): boolean;
+export declare function isId15(id: string): boolean;
+export declare function isId(id: string): boolean;

package/lib/utils/validateId.js

@@ -0,0 +1,160 @@
+/**
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+
+/**
+ * 身份证号码校验，（没有校验城市和区县）
+ *
+ * 身份证号码是由18位组成，分别表示：
+ * 第1、2位数字表示：所在省份的代码；
+ * 第3、4位数字表示：所在城市的代码；
+ * 第5、6位数字表示：所在区县的代码；
+ * 第7-14位数字表示：出生年、月、日（其中7、8、9、10位是年，11、12位是月，13、14位是日）；
+ * 第15-17位数字表示：顺序编码，都是同一地址辖区内的，以及同年同月同日出生人的顺序码，同时 第17位兼具性别标识功能，男单女双；
+ * 第18位是校检码：可以是0-9的数字，有时也用X表示, X来代替10。
+ *
+ * 身份证15位时，次序为省（2位）市（2位）区县（2位）年（2位）月（2位）日（2位）顺序编码（3位），皆为数字，没有最后一位校验码
+ */
+function isId18(id) {
+    if (!/^\d{17}(\d|X)$/.test(id)) {
+        return false;
+    }
+    var info = getInfoFromId(id);
+    if (!info) {
+        return false;
+    }
+    var province = info.province, city = info.city, country = info.country, birthday = info.birthday;
+    if (!verifyRegion(province, city, country) || !verifyBirthday(birthday)) {
+        return false;
+    }
+    return verifyCheckCode(id);
+}
+function isId15(id) {
+    if (!/^\d{15}$/.test(id)) {
+        return false;
+    }
+    var info = getInfoFromId(id);
+    if (!info) {
+        return false;
+    }
+    var province = info.province, city = info.city, country = info.country, birthday = info.birthday;
+    return verifyRegion(province, city, country) && verifyBirthday(birthday);
+}
+function isId(id) {
+    return isId18(id) || isId15(id);
+}
+function getProvInfo(prov) {
+    return {
+        11: '北京市',
+        12: '天津市',
+        13: '河北省',
+        14: '山西省',
+        15: '内蒙古自治区',
+        21: '辽宁省',
+        22: '吉林省',
+        23: '黑龙江省',
+        31: '上海省',
+        32: '江苏省',
+        33: '浙江省',
+        34: '安徽省',
+        35: '福建省',
+        36: '江西省',
+        37: '山东省',
+        41: '河南省',
+        42: '湖北省',
+        43: '湖南省',
+        44: '广东省',
+        45: '广西壮族自治区',
+        46: '海南省',
+        50: '重庆市',
+        51: '四川省',
+        52: '贵州省',
+        53: '云南省',
+        54: '西藏自治区',
+        61: '陕西省',
+        62: '甘肃省',
+        63: '青海省',
+        64: '宁夏回族自治区',
+        65: '新疆维吾尔自治区',
+        71: '台湾省',
+        81: '香港',
+        82: '澳门',
+        91: '国外'
+    }[prov];
+}
+function getInfoFromId(id) {
+    if ((id.length === 18 && !/^\d{17}(\d|X)$/.test(id)) ||
+        (id.length === 15 && !/^\d{15}$/.test(id))) {
+        return;
+    }
+    var data;
+    if (id.length == 18) {
+        data = id.match(/^(\d{2})(\d{2})(\d{2})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/);
+    }
+    else if (id.length == 15) {
+        data = id.match(/^(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})(\d{3})$/);
+    }
+    if (!data) {
+        return;
+    }
+    var _a = tslib.__read(data, 9); _a[0]; var province = _a[1], city = _a[2], country = _a[3], year = _a[4], month = _a[5], day = _a[6], sequenceCode = _a[7], checkCode = _a[8];
+    return {
+        province: province,
+        provinceName: getProvInfo(province),
+        city: city,
+        country: country,
+        year: year,
+        month: month,
+        day: day,
+        birthday: new Date(year + '/' + month + '/' + day),
+        sequenceCode: sequenceCode,
+        checkCode: checkCode,
+        isMale: +sequenceCode % 2 === 1,
+        isFemale: +sequenceCode % 2 === 0
+    };
+}
+function verifyRegion(province, city, country) {
+    if (!getProvInfo(province)) {
+        return false;
+    }
+    // 这里暂时不获取市和区的具体信息，因为调用CityDB会把校验函数传染为异步
+    // city位: 00表示省；01-20，51-70表示省直辖市；21-50表示地区（自治州、盟）
+    if (!/^(?:[0-6]\d|70)$/.test(city)) {
+        return false;
+    }
+    if (!/^\d\d$/.test(country)) {
+        return false;
+    }
+    return true;
+}
+function verifyBirthday(birthday) {
+    return !isNaN(+birthday);
+}
+/**
+ * 校验码计算方式
+ * 1、将前面的身份证号码17位数分别乘以不同的系数。从第一位到第十七位的系数分别为：7 9 10 5 8 4 2 1 6 3 7 9 10 5 8 4 2 ；
+ * 2、将这17位数字和系数相乘的结果相加；
+ * 3、用加出来和除以11，看余数是多少；
+ * 4、余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3 2；
+ * 5、通过上面得知如果余数是2，余数所对应的最后一位身份证号是X，就会在身份证的第18位数字上出现罗马数字的X。
+ */
+function verifyCheckCode(id) {
+    var arrInt = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+    var arrCh = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'];
+    var cardTemp = 0;
+    for (var i = 0; i < 17; i++) {
+        cardTemp += +id.slice(i, i + 1) * arrInt[i];
+    }
+    return arrCh[cardTemp % 11] === id.slice(17, 18);
+}
+
+exports.isId = isId;
+exports.isId15 = isId15;
+exports.isId18 = isId18;

package/lib/utils/validations.js

@@ -1,6 +1,6 @@
 /**
- * amis-core v6.0.0
- * Copyright 2018-2023 fex
+ * amis-core v6.1.0
+ * Copyright 2018-2024 fex
  */
 
 'use strict';
@@ -16,6 +16,7 @@ var isPureVariable = require('./isPureVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');
 var memoize = require('lodash/memoize');
+var validateId = require('./validateId.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -226,9 +227,13 @@ var validations = {
         return !isExisty(value) || isEmpty(value) || /^\d{6}$/.test(value);
     },
     isId: function (values, value) {
-        return (!isExisty(value) ||
-            isEmpty(value) ||
-            /(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/.test(value));
+        return !isExisty(value) || isEmpty(value) || validateId.isId(String(value));
+    },
+    isId18: function (values, value) {
+        return !isExisty(value) || isEmpty(value) || validateId.isId18(String(value));
+    },
+    isId15: function (values, value) {
+        return !isExisty(value) || isEmpty(value) || validateId.isId15(String(value));
     },
     notEmptyString: function (values, value) {
         return !isExisty(value) || !(String(value) && String(value).trim() === '');
@@ -343,6 +348,8 @@ var validateMessages = {
     isTelNumber: 'validate.isTelNumber',
     isZipcode: 'validate.isZipcode',
     isId: 'validate.isId',
+    isId18: 'validate.isId',
+    isId15: 'validate.isId',
     isDateTimeSame: 'validate.isDateTimeSame',
     isDateTimeBefore: 'validate.isDateTimeBefore',
     isDateTimeAfter: 'validate.isDateTimeAfter',
@@ -384,8 +391,7 @@ function validate(value, values, rules, messages, __) {
             //   {error: true, msg: '错误提示'}
             // 格式的信息来灵活展示错误
             var fnResErrorMsg = '';
-            if (typeof validateRes === 'object' &&
-                validateRes.error === true) {
+            if (typeof validateRes === 'object' && validateRes.error === true) {
                 fnResErrorMsg = (_a = validateRes === null || validateRes === void 0 ? void 0 : validateRes.msg) !== null && _a !== void 0 ? _a : '';
             }
             if (!validateRes || fnResErrorMsg) {
@@ -393,13 +399,15 @@ function validate(value, values, rules, messages, __) {
                 if (Array.isArray(value)) {
                     msgRuleName = "".concat(ruleName, "Array");
                 }
-                return [{
+                return [
+                    {
                         rule: ruleName,
                         msg: tpl.filter(__((messages && messages[ruleName]) ||
                             fnResErrorMsg ||
                             validateMessages[msgRuleName] ||
                             validateMessages[ruleName]), tslib.__assign({}, [''].concat(args)))
-                    }];
+                    }
+                ];
             }
         }
     }