amis-core 3.6.4 → 6.1.0

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -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,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 

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,5 +1,5 @@
 /**
- * amis-core v3.6.4
+ * amis-core v6.1.0
  * Copyright 2018-2024 fex
  */
 
@@ -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)))
-                    }];
+                    }
+                ];
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "3.6.4",
+  "version": "6.1.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -25,6 +25,7 @@
     "moment-timezone": "^0.5.34",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "resize-observer-polyfill": "^1.5.1",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.1",
     "rollup-plugin-auto-external": "^2.0.0",
@@ -46,7 +47,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^3.6.4",
+    "amis-formula": "^6.1.0",
     "classnames": "2.3.2",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -107,5 +108,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "3bb6b70254792093b876683463a91b9622f6132a"
+  "gitHead": "37d23b4a8eb1c663bc38e8dd9040889ea1526ec4"
 }

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2023 Baidu
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.