amis-core 3.1.1 → 3.3.0

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -98,26 +98,27 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath, ignoreIfNotMatc
         }
     }
     else {
-        Object.keys(to).forEach(function (key) {
-            var value = to[key];
-            var keys;
-            if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
-                // 如果被ignore，不做数据映射处理。
-                object.setVariable(ret, key, value, convertKeyToPath);
-            }
-            else if (key === '&' && value === '$$') {
+        var objectKeys = Object.keys(to);
+        // 如果存在  '&' 作为 key，则特殊处理
+        // 就是无论这个 key 的位置在什么地方始终都是当放在最前面
+        var idx = objectKeys.indexOf('&');
+        if (~idx) {
+            var value_1 = to['&'];
+            objectKeys.splice(idx, 1);
+            if (value_1 === '$$') {
                 ret = tslib.__assign(tslib.__assign({}, ret), from);
             }
-            else if (key === '&') {
-                var v = isPlainObject__default["default"](value) &&
-                    (keys = Object.keys(value)) &&
-                    keys.length === 1 &&
-                    from[keys[0].substring(1)] &&
-                    Array.isArray(from[keys[0].substring(1)])
-                    ? from[keys[0].substring(1)].map(function (raw) {
-                        return dataMapping(value[keys[0]], object.createObject(from, raw), ignoreFunction, convertKeyToPath, ignoreIfNotMatch);
+            else {
+                var keys_1;
+                var v = isPlainObject__default["default"](value_1) &&
+                    (keys_1 = Object.keys(value_1)) &&
+                    keys_1.length === 1 &&
+                    from[keys_1[0].substring(1)] &&
+                    Array.isArray(from[keys_1[0].substring(1)])
+                    ? from[keys_1[0].substring(1)].map(function (raw) {
+                        return dataMapping(value_1[keys_1[0]], object.createObject(from, raw), ignoreFunction, convertKeyToPath, ignoreIfNotMatch);
                     })
-                    : resolveMapping(value, from, undefined, ignoreIfNotMatch);
+                    : resolveMapping(value_1, from, undefined, ignoreIfNotMatch);
                 if (Array.isArray(v) || typeof v === 'string') {
                     ret = v;
                 }
@@ -128,10 +129,19 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath, ignoreIfNotMatc
                     ret = tslib.__assign(tslib.__assign({}, ret), v);
                 }
             }
+        }
+        objectKeys.forEach(function (key) {
+            var value = to[key];
+            if (typeof ignoreFunction === 'function' && ignoreFunction(key, value)) {
+                // 如果被ignore，不做数据映射处理。
+                object.setVariable(ret, key, value, convertKeyToPath);
+            }
             else if (value === '$$') {
                 object.setVariable(ret, key, from, convertKeyToPath);
             }
-            else if (value && value[0] === '$') {
+            else if (typeof value === 'string' &&
+                value.length > 0 &&
+                value[0] === '$') {
                 var v = resolveMapping(value, from, undefined, ignoreIfNotMatch);
                 object.setVariable(ret, key, v, convertKeyToPath);
                 if (v === '__undefined') {

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/debug.d.ts

@@ -2,7 +2,9 @@
  * amis 运行时调试功能，为了避免循环引用，这个组件不要依赖 amis 里的组件
  */
 import React, { Component } from 'react';
+export declare const JsonView: React.LazyExoticComponent<React.ComponentType<import("react-json-view").ReactJsonViewProps>>;
 export declare function enableDebug(): void;
+export declare function disableDebug(): void;
 interface DebugWrapperProps {
     renderer: any;
     children?: React.ReactNode;

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,7 +11,6 @@ var tslib = require('tslib');
 var React = require('react');
 var cx = require('classnames');
 var ReactDOM = require('react-dom');
-var JsonView = require('react-json-view');
 var mobx = require('mobx');
 var mobxReact = require('mobx-react');
 var helper = require('./helper.js');
@@ -21,11 +20,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-var JsonView__default = /*#__PURE__*/_interopDefaultLegacy(JsonView);
 
-/**
- * amis 运行时调试功能，为了避免循环引用，这个组件不要依赖 amis 里的组件
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+var JsonView = React__default["default"].lazy(function () { return Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['react-json-view'], function(mod) {fullfill(tslib.__importStar(mod))})})}); });
 /** @class */ ((function () {
     function Log() {
         this.cat = '';
@@ -116,14 +115,15 @@ var LogView = mobxReact.observer(function (_a) {
     var store = _a.store;
     var logs = store.logs;
     var ellipsisThreshold = (_b = store.ellipsisThreshold) !== null && _b !== void 0 ? _b : 50;
-    return (React__default["default"].createElement(React__default["default"].Fragment, null, logs.map(function (log, index) {
-        return (React__default["default"].createElement("div", { className: "AMISDebug-logLine", key: "log-".concat(index) },
-            React__default["default"].createElement("div", { className: "AMISDebug-logLineMsg" },
+    return (_J$X_(React__default["default"].Fragment, null, logs.map(function (log, index) {
+        return (_J$X_("div", { className: "AMISDebug-logLine", key: "log-".concat(index) },
+            _J$X_("div", { className: "AMISDebug-logLineMsg" },
                 "[",
                 log.cat,
                 "] ",
                 log.msg),
-            log.ext ? (React__default["default"].createElement(JsonView__default["default"], { name: null, theme: "monokai", src: JSON.parse(log.ext), collapsed: true, enableClipboard: false, displayDataTypes: false, collapseStringsAfterLength: ellipsisThreshold, iconStyle: "square" })) : null));
+            log.ext ? (_J$X_(React__default["default"].Suspense, { fallback: _J$X_("div", null, "Loading...") },
+                _J$X_(JsonView, { name: null, theme: "monokai", src: JSON.parse(log.ext), collapsed: true, enableClipboard: false, displayDataTypes: false, collapseStringsAfterLength: ellipsisThreshold, iconStyle: "square" }))) : null));
     })));
 });
 var AMISDebug = mobxReact.observer(function (_a) {
@@ -149,11 +149,12 @@ var AMISDebug = mobxReact.observer(function (_a) {
         try {
             for (var stacks_1 = tslib.__values(stacks), stacks_1_1 = stacks_1.next(); !stacks_1_1.done; stacks_1_1 = stacks_1.next()) {
                 var stack = stacks_1_1.value;
-                stackDataView.push(React__default["default"].createElement("div", { key: "data-".concat(level) },
-                    React__default["default"].createElement("h3", null,
+                stackDataView.push(_J$X_("div", { key: "data-".concat(level) },
+                    _J$X_("h3", null,
                         "Data Level-",
                         level),
-                    React__default["default"].createElement(JsonView__default["default"], { key: "dataview-".concat(stack), name: null, theme: "monokai", src: stack, collapsed: level === 0 ? false : true, enableClipboard: false, displayDataTypes: false, iconStyle: "square" })));
+                    _J$X_(React__default["default"].Suspense, { fallback: _J$X_("div", null, "Loading...") },
+                        _J$X_(JsonView, { key: "dataview-".concat(stack), name: null, theme: "monokai", src: stack, collapsed: level === 0 ? false : true, enableClipboard: false, displayDataTypes: false, iconStyle: "square" }))));
                 level += 1;
             }
         }
@@ -199,47 +200,47 @@ var AMISDebug = mobxReact.observer(function (_a) {
             }
         };
     }, [isResizing]);
-    return (React__default["default"].createElement("div", { className: cx__default["default"]('AMISDebug', {
+    return (_J$X_("div", { className: cx__default["default"]('AMISDebug', {
             'is-expanded': store.isExpanded,
             'is-left': store.position === 'left'
         }), ref: panelRef },
-        React__default["default"].createElement("div", { className: "AMISDebug-toggle", title: "open debug", onClick: function () {
+        _J$X_("div", { className: "AMISDebug-toggle", title: "open debug", onClick: function () {
                 store.isExpanded = true;
-            } }, store.isExpanded ? (React__default["default"].createElement("i", { className: "fas fa-times" })) : (React__default["default"].createElement("i", { className: "fas fa-bug" }))),
-        React__default["default"].createElement("div", { className: cx__default["default"]('AMISDebug-content') },
-            React__default["default"].createElement("div", { className: "AMISDebug-close", title: "Close", onClick: function () {
+            } }, store.isExpanded ? (_J$X_("i", { className: "fas fa-times" })) : (_J$X_("i", { className: "fas fa-bug" }))),
+        _J$X_("div", { className: cx__default["default"]('AMISDebug-content') },
+            _J$X_("div", { className: "AMISDebug-close", title: "Close", onClick: function () {
                     store.isExpanded = false;
                     store.activeId = '';
                     store.hoverId = '';
                 } },
-                React__default["default"].createElement("i", { className: "fas fa-times" })),
-            React__default["default"].createElement("div", { className: "AMISDebug-resize", onMouseDown: function (event) {
+                _J$X_("i", { className: "fas fa-times" })),
+            _J$X_("div", { className: "AMISDebug-resize", onMouseDown: function (event) {
                     setStartX(event.clientX);
                     setPanelWidth(parseInt(getComputedStyle(panelRef.current).getPropertyValue('width'), 10));
                     setResizing(true);
                 } }),
-            React__default["default"].createElement("div", { className: "AMISDebug-tab" },
-                React__default["default"].createElement("button", { className: cx__default["default"]({ active: store.tab === 'log' }), onClick: function () {
+            _J$X_("div", { className: "AMISDebug-tab" },
+                _J$X_("button", { className: cx__default["default"]({ active: store.tab === 'log' }), onClick: function () {
                         store.tab = 'log';
                     } }, "Log"),
-                React__default["default"].createElement("button", { className: cx__default["default"]({ active: store.tab === 'inspect' }), onClick: function () {
+                _J$X_("button", { className: cx__default["default"]({ active: store.tab === 'inspect' }), onClick: function () {
                         store.tab = 'inspect';
                     } }, "Inspect")),
-            React__default["default"].createElement("div", { className: "AMISDebug-changePosition" }, store.position === 'right' ? (React__default["default"].createElement("i", { className: "fas fa-chevron-left", title: "move to left", onClick: function () {
+            _J$X_("div", { className: "AMISDebug-changePosition" }, store.position === 'right' ? (_J$X_("i", { className: "fas fa-chevron-left", title: "move to left", onClick: function () {
                     store.position = 'left';
-                } })) : (React__default["default"].createElement("i", { className: "fas fa-chevron-right", title: "move to right", onClick: function () {
+                } })) : (_J$X_("i", { className: "fas fa-chevron-right", title: "move to right", onClick: function () {
                     store.position = 'right';
                 } }))),
-            store.tab === 'log' ? (React__default["default"].createElement("div", { className: "AMISDebug-log" },
-                React__default["default"].createElement("button", { onClick: function () {
+            store.tab === 'log' ? (_J$X_("div", { className: "AMISDebug-log" },
+                _J$X_("button", { onClick: function () {
                         store.logs = [];
                     } }, "Clear Log"),
-                React__default["default"].createElement(LogView, { store: store }))) : null,
-            store.tab === 'inspect' ? (React__default["default"].createElement("div", { className: "AMISDebug-inspect" }, activeId ? (React__default["default"].createElement(React__default["default"].Fragment, null,
-                React__default["default"].createElement("h3", null,
+                _J$X_(LogView, { store: store }))) : null,
+            store.tab === 'inspect' ? (_J$X_("div", { className: "AMISDebug-inspect" }, activeId ? (_J$X_(React__default["default"].Fragment, null,
+                _J$X_("h3", null,
                     "Component:",
                     ' ',
-                    React__default["default"].createElement("span", { className: "primary" }, activeComponentInspect.name)),
+                    _J$X_("span", { className: "primary" }, activeComponentInspect.name)),
                 stackDataView)) : ('Click component to display inspect'))) : null)));
 });
 /**
@@ -264,7 +265,7 @@ function handleMouseclick(e) {
     }
     var dom = e.target;
     var target = dom.closest("[data-debug-id]");
-    if (target) {
+    if (target && !target.closest('.AMISDebug')) {
         store.activeId = target.getAttribute('data-debug-id');
         store.tab = 'inspect';
     }
@@ -304,6 +305,7 @@ mobx.autorun(function () {
 });
 // 页面中只能有一个实例
 var isEnabled = false;
+var unmount;
 function enableDebug() {
     if (isEnabled) {
         return;
@@ -311,13 +313,37 @@ function enableDebug() {
     isEnabled = true;
     var amisDebugElement = document.createElement('div');
     document.body.appendChild(amisDebugElement);
-    var element = React__default["default"].createElement(AMISDebug, { store: store });
+    var element = _J$X_(AMISDebug, { store: store });
+    // if (parseInt(version.split('.')[0], 10) >= 18) {
+    //   const root = createRoot(amisDebugElement);
+    //   root.render(element);
+    //   unmount = () => {
+    //     root.unmount();
+    //     document.body.removeChild(amisDebugElement);
+    //   };
+    // } else {
     ReactDOM.render(element, amisDebugElement);
+    unmount = function () {
+        ReactDOM.unmountComponentAtNode(amisDebugElement);
+        document.body.removeChild(amisDebugElement);
+    };
+    // }
     document.body.appendChild(amisHoverBox);
     document.body.appendChild(amisActiveBox);
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('click', handleMouseclick);
 }
+function disableDebug() {
+    if (!isEnabled) {
+        return;
+    }
+    isEnabled = false;
+    unmount === null || unmount === void 0 ? void 0 : unmount();
+    document.body.removeChild(amisHoverBox);
+    document.body.removeChild(amisActiveBox);
+    document.removeEventListener('mousemove', handleMouseMove);
+    document.removeEventListener('click', handleMouseclick);
+}
 var DebugWrapper = /** @class */ (function (_super) {
     tslib.__extends(DebugWrapper, _super);
     function DebugWrapper() {
@@ -397,6 +423,8 @@ function warning(cat, msg, ext) {
 }
 
 exports.DebugWrapper = DebugWrapper;
+exports.JsonView = JsonView;
 exports.debug = debug;
+exports.disableDebug = disableDebug;
 exports.enableDebug = enableDebug;
 exports.warning = warning;

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,15 +9,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var ReactDOM = require('react-dom');
-var React = require('react');
+require('react');
 var offset = require('./offset.js');
 var position = require('./position.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function getContainer(container, defaultContainer) {
     container = typeof container === 'function' ? container() : container;
     return ReactDOM__default["default"].findDOMNode(container) || defaultContainer;
@@ -219,12 +221,15 @@ function getStyleNumber(element, styleName) {
 }
 /** 根据关键字高亮显示文本内容 */
 function renderTextByKeyword(rendererText, curKeyword) {
+    if (!rendererText || typeof rendererText !== 'string') {
+        return rendererText;
+    }
     if (curKeyword && ~rendererText.indexOf(curKeyword)) {
         var keywordStartIndex = rendererText.indexOf(curKeyword);
         var keywordEndIndex = keywordStartIndex + curKeyword.length;
-        return (React__default["default"].createElement("span", null,
+        return (_J$X_("span", null,
             rendererText.substring(0, keywordStartIndex),
-            React__default["default"].createElement("span", { className: "is-keyword" }, curKeyword),
+            _J$X_("span", { className: "is-keyword" }, curKeyword),
             rendererText.substring(keywordEndIndex)));
     }
     else {

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/formula.d.ts

@@ -13,5 +13,4 @@ export declare function isNeedFormula(expression: any, prevData: {
 }, curData: {
     [propName: string]: any;
 }): boolean;
-export declare function isNowFormula(expression: string): boolean;
 export declare function replaceExpression(expression: any): any;

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,7 +7,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var isObjectByLodash = require('lodash/isObject');
+var isObject = require('lodash/isObject');
 var isString = require('lodash/isString');
 var isBoolean = require('lodash/isBoolean');
 var amisFormula = require('amis-formula');
@@ -22,7 +22,7 @@ var grammar = require('./grammar.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var isObjectByLodash__default = /*#__PURE__*/_interopDefaultLegacy(isObjectByLodash);
+var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
 var isString__default = /*#__PURE__*/_interopDefaultLegacy(isString);
 var isBoolean__default = /*#__PURE__*/_interopDefaultLegacy(isBoolean);
 
@@ -124,7 +124,7 @@ var FormulaExec = {
     },
     collect: function (expression) {
         var variables = [];
-        if (isObjectByLodash__default["default"](expression) || isString__default["default"](expression)) {
+        if (isObject__default["default"](expression) || isString__default["default"](expression)) {
             // 仅对 Object类型 和 String类型 进行变量提取
             variables = grammar.collectVariables(expression);
         }
@@ -208,7 +208,8 @@ function isNeedFormula(expression, prevData, curData) {
     try {
         var variables = FormulaExec.collect(expression);
         return variables.some(function (variable) {
-            return FormulaExec.var(variable, prevData) !== FormulaExec.var(variable, curData);
+            return FormulaExec.var(variable, prevData) !==
+                FormulaExec.var(variable, curData);
         });
     }
     catch (e) {
@@ -216,10 +217,6 @@ function isNeedFormula(expression, prevData, curData) {
         return false;
     }
 }
-function isNowFormula(expression) {
-    var block = expression.split(/\${|\||}/).filter(function (item) { return item; });
-    return block[1] === 'now';
-}
 // 将 \${xx} 替换成 ${xx}
 function replaceExpression(expression) {
     if (expression &&
@@ -234,6 +231,5 @@ exports.FormulaExec = FormulaExec;
 exports.formulaExec = formulaExec;
 exports.isExpression = isExpression;
 exports.isNeedFormula = isNeedFormula;
-exports.isNowFormula = isNowFormula;
 exports.registerFormulaExec = registerFormulaExec;
 exports.replaceExpression = replaceExpression;

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.1.1
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/helper.d.ts

@@ -256,7 +256,7 @@ export declare const autobind: typeof autobindMethod;
 export declare const bulkBindFunctions: <T extends {
     [propName: string]: any;
 }>(context: T, funNames: FunctionPropertyNames<T>[]) => void;
-export declare function sortArray<T extends any>(items: Array<T>, field: string, dir: -1 | 1): Array<T>;
+export declare function sortArray<T extends any>(items: Array<T>, field: string, dir: -1 | 1, fieldGetter?: (item: T, field: string) => any): Array<T>;
 export declare function hasFile(object: any): boolean;
 export declare function qsstringify(data: any, options?: any, keepEmptyArray?: boolean): string;
 export declare function qsparse(data: string, options?: any): qs.ParsedQs;
@@ -268,6 +268,15 @@ export declare function loadScript(src: string): Promise<void>;
 export declare function loadStyle(href: string): Promise<void>;
 export declare class SkipOperation extends Error {
 }
+export declare class ValidateError extends Error {
+    name: 'ValidateError';
+    detail: {
+        [propName: string]: Array<string> | string;
+    };
+    constructor(message: string, error: {
+        [propName: string]: Array<string> | string;
+    });
+}
 /**
  * 深度查找具有某个 key 名字段的对象，实际实现是 internalFindObjectsWithKey，这里包一层是为了做循环引用检测
  * @param obj
@@ -283,7 +292,8 @@ export declare function getPropValue<T extends {
     name?: string;
     data?: any;
     defaultValue?: any;
-}>(props: T, getter?: (props: T) => any, canAccessSuper?: boolean): any;
+    canAccessSuperData?: boolean;
+}>(props: T, getter?: (props: T) => any, canAccessSuper?: boolean | undefined): any;
 export declare function detectPropValueChanged<T extends {
     value?: any;
     name?: string;
@@ -314,6 +324,13 @@ export declare function hashCode(s: string): number;
  * @param mapper
  */
 export declare function JSONTraverse(json: any, mapper: (value: any, key: string | number, host: Object) => any): void;
+/**
+ * 每层都会执行，返回新的对象，新对象不会递归下去
+ * @param json
+ * @param mapper
+ * @returns
+ */
+export declare function JSONValueMap(json: any, mapper: (value: any, key: string | number, host: Object, stack: Array<Object>) => any, stack?: Array<Object>): any;
 export declare function convertArrayValueToMoment(value: number[], types: string[], mom: moment.Moment): moment.Moment;
 export declare function getRange(min: number, max: number, step?: number): number[];
 export declare function repeatCount(count: number, iterator: (index: number) => any): any[];