amis 1.3.5-beta.7 → 1.4.2-beta.11

package/src/utils/attachmentAdpator.ts

@@ -0,0 +1,90 @@
+/**
+ * 处理接口返回附件的情况，好几个地方用
+ * @param response
+ * @param __
+ * @returns
+ */
+
+export default function attachmentAdpator(response: any, __: Function) {
+  if (response && response.headers && response.headers['content-disposition']) {
+    const disposition = response.headers['content-disposition'];
+    let filename = '';
+
+    if (disposition && disposition.indexOf('attachment') !== -1) {
+      // disposition 有可能是 attachment; filename="??.xlsx"; filename*=UTF-8''%E4%B8%AD%E6%96%87.xlsx
+      // 这种情况下最后一个才是正确的文件名
+      let filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)$/;
+
+      let matches = disposition.match(filenameRegex);
+      if (matches && matches.length) {
+        filename = matches[1].replace(`UTF-8''`, '').replace(/['"]/g, '');
+      }
+
+      // 很可能是中文被 url-encode 了
+      if (filename && filename.replace(/[^%]/g, '').length > 2) {
+        filename = decodeURIComponent(filename);
+      }
+
+      let type = response.headers['content-type'];
+      let blob =
+        response.data.toString() === '[object Blob]'
+          ? response.data
+          : new Blob([response.data], {type: type});
+      if (typeof (window.navigator as any).msSaveBlob !== 'undefined') {
+        // IE workaround for "HTML7007: One or more blob URLs were revoked by closing the blob for which they were created. These URLs will no longer resolve as the data backing the URL has been freed."
+        (window.navigator as any).msSaveBlob(blob, filename);
+      } else {
+        let URL = window.URL || (window as any).webkitURL;
+        let downloadUrl = URL.createObjectURL(blob);
+        if (filename) {
+          // use HTML5 a[download] attribute to specify filename
+          let a = document.createElement('a');
+          // safari doesn't support this yet
+          if (typeof a.download === 'undefined') {
+            (window as any).location = downloadUrl;
+          } else {
+            a.href = downloadUrl;
+            a.download = filename;
+            document.body.appendChild(a);
+            a.click();
+          }
+        } else {
+          (window as any).location = downloadUrl;
+        }
+        setTimeout(function () {
+          URL.revokeObjectURL(downloadUrl);
+        }, 100); // cleanup
+      }
+
+      return {
+        ...response,
+        data: {
+          status: 0,
+          msg: __('Embed.downloading')
+        }
+      };
+    }
+  } else if (response.data.toString() === '[object Blob]') {
+    return new Promise((resolve, reject) => {
+      let reader = new FileReader();
+      reader.addEventListener('loadend', e => {
+        const text = reader.result as string;
+
+        try {
+          resolve({
+            ...response,
+            data: {
+              ...JSON.parse(text)
+            }
+          });
+        } catch (e) {
+          reject(e);
+        }
+      });
+
+      reader.readAsText(response.data);
+    });
+  }
+
+  return response;
+}

package/src/utils/dom.tsx

@@ -267,3 +267,15 @@ export function calculatePosition(
     activePlacement
   };
 }
+
+/**
+ * 专门用来获取样式的像素值，默认返回 0
+ */
+export function getStyleNumber(element: HTMLElement, styleName: string) {
+  if (!element) {
+    return 0;
+  }
+  return (
+    parseInt(getComputedStyle(element).getPropertyValue(styleName), 10) || 0
+  );
+}

package/src/utils/handleAction.ts

@@ -0,0 +1,41 @@
+/**
+ * 后续好多地方可能都要支持 action，所以提取公共功能
+ */
+
+import {RendererProps} from '../factory';
+import {ActionSchema, AjaxActionSchema} from '../renderers/Action';
+import {normalizeApi, str2function} from './api';
+
+export default function handleAction(
+  e: React.MouseEvent<any>,
+  action: ActionSchema,
+  props: RendererProps,
+  data?: any
+) {
+  // https://reactjs.org/docs/legacy-event-pooling.html
+  e.persist();
+
+  const onAction = props.onAction;
+  let onClick: any = action.onClick;
+
+  if (typeof onClick === 'string') {
+    onClick = str2function(onClick, 'event', 'props');
+  }
+  const result: any = onClick && onClick(e, props);
+
+  if (e.isDefaultPrevented() || result === false || !onAction) {
+    return;
+  }
+
+  e.preventDefault();
+
+  // download 是一种 ajax 的简写
+  if (action.actionType === 'download') {
+    action.actionType = 'ajax';
+    const api = normalizeApi((action as AjaxActionSchema).api);
+    api.responseType = 'blob';
+    (action as AjaxActionSchema).api = api;
+  }
+
+  onAction(e, action, data || props.data);
+}

package/src/utils/helper.ts

@@ -16,6 +16,14 @@ import {
 } from './tpl-builtin';
 import {isObservable} from 'mobx';
 
+export function isMobile() {
+  return (window as any).matchMedia?.('(max-width: 768px)').matches;
+}
+
+export function range(num: number, min: number, max: number): number {
+  return Math.min(Math.max(num, min), max);
+}
+
 // 方便取值的时候能够把上层的取到，但是获取的时候不会全部把所有的数据获取到。
 export function createObject(
   superProps?: {[propName: string]: any},
@@ -181,7 +189,8 @@ export function getVariable(
 export function setVariable(
   data: {[propName: string]: any},
   key: string,
-  value: any
+  value: any,
+  convertKeyToPath?: boolean
 ) {
   data = data || {};
 
@@ -190,7 +199,7 @@ export function setVariable(
     return;
   }
 
-  const parts = keyToPath(key);
+  const parts = convertKeyToPath !== false ? keyToPath(key) : [key];
   const last = parts.pop() as string;
 
   while (parts.length) {
@@ -1617,7 +1626,7 @@ export function detectPropValueChanged<
 
 // 去掉字符串中的 html 标签，不完全准确但效率比较高
 export function removeHTMLTag(str: string) {
-  return str.replace(/<\/?[^>]+(>|$)/g, '');
+  return typeof str === 'string' ? str.replace(/<\/?[^>]+(>|$)/g, '') : str;
 }
 
 /**

package/src/utils/icon.tsx

@@ -17,6 +17,10 @@ export const generateIcon = (
   className?: string,
   classNameProp?: string
 ) => {
+  if (React.isValidElement(icon)) {
+    return icon;
+  }
+
   const isURLIcon = icon?.indexOf('.') !== -1;
 
   return icon ? (

package/src/utils/tpl-builtin.ts

@@ -383,10 +383,26 @@ 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) =>
-    stripNumber((parseInt(input, 10) || 0) - parseInt(step, 10)),
-  plus: (input, step = 1) =>
-    stripNumber((parseInt(input, 10) || 0) + parseInt(step, 10)),
+  minus(input, step = 1) {
+    return stripNumber(
+      (Number(input) || 0) - Number(getStrOrVariable(step, this))
+    );
+  },
+  plus(input, step = 1) {
+    return stripNumber(
+      (Number(input) || 0) + Number(getStrOrVariable(step, this))
+    );
+  },
+  times(input, step = 1) {
+    return stripNumber(
+      (Number(input) || 0) * Number(getStrOrVariable(step, this))
+    );
+  },
+  division(input, step = 1) {
+    return stripNumber(
+      (Number(input) || 0) / Number(getStrOrVariable(step, this))
+    );
+  },
   count: (input: any) =>
     Array.isArray(input) || typeof input === 'string' ? input.length : 0,
   sum: (input, field) => {
@@ -866,10 +882,13 @@ export function resolveMapping(
 export function dataMapping(
   to: any,
   from: PlainObject = {},
-  ignoreFunction: boolean | ((key: string, value: any) => boolean) = false
+  ignoreFunction: boolean | ((key: string, value: any) => boolean) = false,
+  convertKeyToPath?: boolean
 ): any {
   if (Array.isArray(to)) {
-    return to.map(item => dataMapping(item, from, ignoreFunction));
+    return to.map(item =>
+      dataMapping(item, from, ignoreFunction, convertKeyToPath)
+    );
   } else if (typeof to === 'string') {
     return resolveMapping(to, from);
   } else if (!isPlainObject(to)) {
@@ -883,7 +902,7 @@ export function dataMapping(
 
     if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
       // 如果被ignore，不做数据映射处理。
-      setVariable(ret, key, value);
+      setVariable(ret, key, value, convertKeyToPath);
     } else if (key === '&' && value === '$$') {
       ret = {
         ...ret,
@@ -900,7 +919,8 @@ export function dataMapping(
               dataMapping(
                 value[keys[0]],
                 createObject(from, raw),
-                ignoreFunction
+                ignoreFunction,
+                convertKeyToPath
               )
             )
           : resolveMapping(value, from);
@@ -919,10 +939,10 @@ export function dataMapping(
         };
       }
     } else if (value === '$$') {
-      setVariable(ret, key, from);
+      setVariable(ret, key, from, convertKeyToPath);
     } else if (value && value[0] === '$') {
       const v = resolveMapping(value, from);
-      setVariable(ret, key, v);
+      setVariable(ret, key, v, convertKeyToPath);
 
       if (v === '__undefined') {
         deleteVariable(ret, key);
@@ -952,26 +972,37 @@ export function dataMapping(
       const mapping = value[keys[0]];
 
       (ret as PlainObject)[key] = arr.map((raw: object) =>
-        dataMapping(mapping, createObject(from, raw), ignoreFunction)
+        dataMapping(
+          mapping,
+          createObject(from, raw),
+          ignoreFunction,
+          convertKeyToPath
+        )
       );
     } else if (isPlainObject(value)) {
-      setVariable(ret, key, dataMapping(value, from, ignoreFunction));
+      setVariable(
+        ret,
+        key,
+        dataMapping(value, from, ignoreFunction, convertKeyToPath),
+        convertKeyToPath
+      );
     } else if (Array.isArray(value)) {
       setVariable(
         ret,
         key,
         value.map((value: any) =>
           isPlainObject(value)
-            ? dataMapping(value, from, ignoreFunction)
+            ? dataMapping(value, from, ignoreFunction, convertKeyToPath)
             : resolveMapping(value, from)
-        )
+        ),
+        convertKeyToPath
       );
     } else if (typeof value == 'string' && ~value.indexOf('$')) {
-      setVariable(ret, key, resolveMapping(value, from));
+      setVariable(ret, key, resolveMapping(value, from), convertKeyToPath);
     } else if (typeof value === 'function' && ignoreFunction !== true) {
-      setVariable(ret, key, value(from));
+      setVariable(ret, key, value(from), convertKeyToPath);
     } else {
-      setVariable(ret, key, value);
+      setVariable(ret, key, value, convertKeyToPath);
 
       if (value === '__undefined') {
         deleteVariable(ret, key);

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 (