amis 1.3.5-beta.3 → 1.4.1

package/src/utils/helper.ts

@@ -507,6 +507,7 @@ export function isDisabled(
   );
 }
 
+
 export function hasAbility(
   schema: any,
   ability: string,
@@ -1682,3 +1683,18 @@ export function normalizeNodePath(
 
   return {nodeValueArray, nodePathArray};
 }
+
+// 主要用于排除点击输入框和链接等情况
+export function isClickOnInput(e: React.MouseEvent<HTMLElement>) {
+  const target: HTMLElement = e.target as HTMLElement;
+  let formItem;
+  if (
+    !e.currentTarget.contains(target) ||
+    ~['INPUT', 'TEXTAREA'].indexOf(target.tagName) ||
+    ((formItem = target.closest(`button, a, [data-role="form-item"]`)) &&
+      e.currentTarget.contains(formItem))
+  ) {
+    return true;
+  }
+  return false;
+}

package/src/utils/resize-sensor.ts

@@ -29,6 +29,9 @@ export function getComputedStyle(element: HTMLElement, prop: string) {
 }
 
 function attachResizeEvent(element: HTMLElement, resized: () => void) {
+  if (!element) {
+    return;
+  }
   if (!(element as any).resizedAttached) {
     (element as any).resizedAttached = new EventQueue();
     (element as any).resizedAttached.add(resized);
@@ -165,6 +168,10 @@ export function resizeSensor(
   callback: () => void,
   once: boolean = false
 ) {
+  if (!element) {
+    return () => {};
+  }
+
   let disposeEvent: (() => void) | undefined = undefined;
 
   if (once) {

package/src/utils/tpl-builtin.ts

@@ -115,7 +115,8 @@ const timeUnitMap: {
   millisecond: 'ms'
 };
 
-export const relativeValueRe = /^(.+)?(\+|-)(\d+)(minute|min|hour|day|week|month|year|weekday|second|millisecond)s?$/i;
+export const relativeValueRe =
+  /^(.+)?(\+|-)(\d+)(minute|min|hour|day|week|month|year|weekday|second|millisecond)s?$/i;
 export const filterDate = (
   value: string,
   data: object = {},
@@ -164,9 +165,10 @@ export const filterDate = (
 };
 
 export function parseDuration(str: string): moment.Duration | undefined {
-  const matches = /^((?:\-|\+)?(?:\d*\.)?\d+)(minute|min|hour|day|week|month|quarter|year|weekday|second|millisecond)s?$/.exec(
-    str
-  );
+  const matches =
+    /^((?:\-|\+)?(?:\d*\.)?\d+)(minute|min|hour|day|week|month|quarter|year|weekday|second|millisecond)s?$/.exec(
+      str
+    );
 
   if (matches) {
     const duration = moment.duration(parseFloat(matches[1]), matches[2] as any);
@@ -179,6 +181,15 @@ export function parseDuration(str: string): moment.Duration | undefined {
   return;
 }
 
+// 主要用于解决 0.1+0.2 结果的精度问题导致太长
+export function stripNumber(number: number) {
+  if (typeof number === 'number') {
+    return parseFloat(number.toPrecision(12));
+  } else {
+    return number;
+  }
+}
+
 export const filters: {
   [propName: string]: (input: any, ...args: any[]) => any;
 } = {
@@ -209,6 +220,8 @@ export const filters: {
     data.add();
     return data.isValid() ? data.toDate() : undefined;
   },
+  fromNow: (input: any, inputFormat = '') =>
+    moment(input, inputFormat).fromNow(),
   dateModify: (
     input: any,
     modifier: 'add' | 'subtract' | 'endOf' | 'startOf' = 'add',
@@ -370,18 +383,23 @@ export const filters: {
   first: input => input && input[0],
   nth: (input, nth = 0) => input && input[nth],
   last: input => input && (input.length ? input[input.length - 1] : null),
-  minus: (input, step = 1) => (parseInt(input, 10) || 0) - parseInt(step, 10),
-  plus: (input, step = 1) => (parseInt(input, 10) || 0) + parseInt(step, 10),
+  minus: (input, step = 1) =>
+    stripNumber((parseInt(input, 10) || 0) - parseInt(step, 10)),
+  plus: (input, step = 1) =>
+    stripNumber((parseInt(input, 10) || 0) + parseInt(step, 10)),
   count: (input: any) =>
     Array.isArray(input) || typeof input === 'string' ? input.length : 0,
-  sum: (input, field) =>
-    Array.isArray(input)
-      ? input.reduce(
-          (sum, item) =>
-            sum + (parseFloat(field ? pickValues(field, item) : item) || 0),
-          0
-        )
-      : input,
+  sum: (input, field) => {
+    if (!Array.isArray(input)) {
+      return input;
+    }
+    const restult = input.reduce(
+      (sum, item) =>
+        sum + (parseFloat(field ? pickValues(field, item) : item) || 0),
+      0
+    );
+    return stripNumber(restult);
+  },
   abs: (input: any) => (typeof input === 'number' ? Math.abs(input) : input),
   pick: (input, path = '&') =>
     Array.isArray(input) && !/^\d+$/.test(path)
@@ -721,9 +739,10 @@ export const resolveVariableAndFilter = (
     return undefined;
   }
 
-  const m = /^(\\)?\$(?:((?:\w+\:)?[a-z0-9_.][a-z0-9_.\[\]]*)|{([\s\S]+)})$/i.exec(
-    path
-  );
+  const m =
+    /^(\\)?\$(?:((?:\w+\:)?[a-z0-9_.][a-z0-9_.\[\]]*)|{([\s\S]+)})$/i.exec(
+      path
+    );
 
   if (!m) {
     return undefined;

package/src/utils/validations.ts

@@ -14,6 +14,79 @@ const makeRegexp = (reg: string | RegExp) => {
 
   return /^$/;
 };
+import memoize from 'lodash/memoize';
+import isPlainObject from 'lodash/isPlainObject';
+
+const makeUrlRegexp = memoize(function (options: any) {
+  options = {
+    schemes: ['http', 'https', 'ftp', 'sftp'],
+    allowLocal: true,
+    allowDataUrl: false,
+    ...(isPlainObject(options) ? options : {})
+  };
+
+  // https://github.com/ansman/validate.js/blob/master/validate.js#L1098-L1164
+  let {schemes, allowLocal, allowDataUrl} = options;
+
+  if (!Array.isArray(schemes)) {
+    schemes = ['http', 'https', 'ftp', 'sftp'];
+  }
+
+  let regex =
+    '^' +
+    // protocol identifier
+    '(?:(?:' +
+    schemes.join('|') +
+    ')://)' +
+    // user:pass authentication
+    '(?:\\S+(?::\\S*)?@)?' +
+    '(?:';
+
+  var tld = '(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))';
+
+  if (allowLocal) {
+    tld += '?';
+  } else {
+    regex +=
+      // IP address exclusion
+      // private & local networks
+      '(?!(?:10|127)(?:\\.\\d{1,3}){3})' +
+      '(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})' +
+      '(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})';
+  }
+
+  regex +=
+    // IP address dotted notation octets
+    // excludes loopback network 0.0.0.0
+    // excludes reserved space >= 224.0.0.0
+    // excludes network & broacast addresses
+    // (first & last IP address of each class)
+    '(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])' +
+    '(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}' +
+    '(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))' +
+    '|' +
+    // host name
+    '(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)' +
+    // domain name
+    '(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*' +
+    tld +
+    ')' +
+    // port number
+    '(?::\\d{2,5})?' +
+    // resource path
+    '(?:[/?#]\\S*)?' +
+    '$';
+
+  if (allowDataUrl) {
+    // RFC 2397
+    var mediaType = '\\w+\\/[-+.\\w]+(?:;[\\w=]+)*';
+    var urlchar = "[A-Za-z0-9-_.!~\\*'();\\/?:@&=+$,%]*";
+    var dataurl = 'data:(?:' + mediaType + ')?(?:;base64)?,' + urlchar;
+    regex = '(?:' + regex + ')|(?:^' + dataurl + '$)';
+  }
+
+  return new RegExp(regex, 'i');
+});
 
 export interface ValidateFn {
   (
@@ -55,12 +128,8 @@ export const validations: {
       /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i
     );
   },
-  isUrl: function (values, value) {
-    return validations.matchRegexp(
-      values,
-      value,
-      /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i
-    );
+  isUrl: function (values, value, options) {
+    return validations.matchRegexp(values, value, makeUrlRegexp(options));
   },
   isTrue: function (values, value) {
     return value === true;
@@ -282,9 +351,8 @@ export function validate(
       }
 
       const fn = validations[ruleName];
-      const args = (Array.isArray(rules[ruleName])
-        ? rules[ruleName]
-        : [rules[ruleName]]
+      const args = (
+        Array.isArray(rules[ruleName]) ? rules[ruleName] : [rules[ruleName]]
       ).map((item: any) => {
         if (typeof item === 'string' && isPureVariable(item)) {
           return resolveVariableAndFilter(item, values, '|raw');
@@ -356,9 +424,9 @@ const splitValidations = function (str: string): Array<string> {
     .map(str => (/^__\d+$/.test(str) ? placeholder[str] : str.trim()));
 };
 
-export function str2rules(
-  validations: string | {[propName: string]: any}
-): {[propName: string]: any} {
+export function str2rules(validations: string | {[propName: string]: any}): {
+  [propName: string]: any;
+} {
   if (typeof validations === 'string') {
     return validations
       ? splitValidations(validations).reduce(function (