amis-core 6.7.0 → 6.9.0-rc.0

package/lib/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -25,7 +25,7 @@ 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))})})}).then(helper.importLazyComponent);
+    return Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['react-json-view', "tslib"], function(mod, tslib) {fullfill(tslib.__importStar(mod))})})}).then(helper.importLazyComponent);
 });
 /** @class */ ((function () {
     function Log() {
@@ -395,11 +395,18 @@ function debug(cat, msg, ext) {
     console.groupCollapsed('[amis debug]', msg);
     console.debug(ext);
     console.groupEnd();
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'debug',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     store.logs.push(log);
 }
@@ -412,11 +419,18 @@ function warning(cat, msg, ext) {
     if (!isEnabled) {
         return;
     }
+    var extStr = '';
+    try {
+        extStr = JSON.stringify(ext);
+    }
+    catch (e) {
+        console.error(e);
+    }
     var log = {
         cat: cat,
         level: 'warn',
         msg: msg,
-        ext: JSON.stringify(ext)
+        ext: extStr
     };
     console.groupCollapsed('amis debug', msg);
     console.trace(log);

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -16,6 +16,7 @@ require('tslib');
 require('moment');
 require('lodash/isPlainObject');
 var getVariable = require('./getVariable.js');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/helper.d.ts

@@ -8,6 +8,7 @@ import { cloneObject, createObject, deleteVariable, extendObject, isObject, setV
 import { string2regExp } from './string2regExp';
 import { getVariable } from './getVariable';
 import { keyToPath } from './keyToPath';
+import type { IStatusStore } from '../store/status';
 export { createObject, cloneObject, isObject, string2regExp, getVariable, setVariable, deleteVariable, keyToPath, extendObject };
 export declare function preventDefault(event: TouchEvent | Event): void;
 export declare function isMobile(): any;
@@ -52,11 +53,13 @@ export declare function hasVisibleExpression(schema: {
     hidden?: boolean;
 }): boolean;
 export declare function isVisible(schema: {
+    id?: string;
+    name?: string;
     visibleOn?: string;
     hiddenOn?: string;
     visible?: boolean;
     hidden?: boolean;
-}, data?: object): boolean;
+}, data?: object, statusStore?: IStatusStore): any;
 export declare function isUnfolded(node: any, config: {
     foldedField?: string;
     unfoldedField?: string;

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -28,11 +28,13 @@ var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
 var resolveVariable = require('./resolveVariable.js');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
+require('./memoryParse.js');
 require('./filter.js');
 var string2regExp = require('./string2regExp.js');
 var getVariable = require('./getVariable.js');
 var keyToPath = require('./keyToPath.js');
 var formula = require('./formula.js');
+var mobxStateTree = require('mobx-state-tree');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -296,7 +298,19 @@ function makeColumnClassBuild(steps, classNameTpl) {
 function hasVisibleExpression(schema) {
     return !!(schema.visibleOn || schema.hiddenOn);
 }
-function isVisible(schema, data) {
+function isVisible(schema, data, statusStore) {
+    var _a;
+    // 有状态时，状态优先
+    if ((schema.id || schema.name) && statusStore) {
+        var id = tpl.filter(schema.id, data);
+        var name_1 = tpl.filter(schema.name, data);
+        var visible = mobxStateTree.isAlive(statusStore)
+            ? (_a = statusStore.visibleState[id]) !== null && _a !== void 0 ? _a : statusStore.visibleState[name_1]
+            : undefined;
+        if (typeof visible !== 'undefined') {
+            return visible;
+        }
+    }
     return !(schema.hidden ||
         schema.visible === false ||
         (schema.hiddenOn &&
@@ -428,7 +442,9 @@ function difference(object$1, base, keepProps) {
                     result_1[key] = a;
                 }
                 // isEquals 里面没有处理好递归引用对象的情况
-                if (!isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
+                if (object$1.hasOwnProperty(key) && // 其中一个不是自己的属性，就不要比对了
+                    base.hasOwnProperty(key) &&
+                    !isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
                     return;
                 }
                 if (!object$1.hasOwnProperty(key)) {

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,7 +14,7 @@ function isPureVariable(path) {
         try {
             var ast = memoryParse.memoryParse(path);
             // 只有一个成员说明是纯表达式模式
-            return ast.body.length === 1 && ast.body[0].type === 'script';
+            return (ast === null || ast === void 0 ? void 0 : ast.body.length) === 1 && ast.body[0].type === 'script';
         }
         catch (err) {
             return false;

package/lib/utils/json-schema-2-amis-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/memoryParse.d.ts

@@ -1,3 +1,4 @@
+import type { ASTNode } from 'amis-formula';
 export declare function memoryParse(input: string, options?: {
     /**
      * 直接是运算表达式？还是从模板开始 ${} 里面才算运算表达式
@@ -14,4 +15,4 @@ export declare function memoryParse(input: string, options?: {
      */
     allowFilter?: boolean;
     variableNamespaces?: Array<string>;
-}): any;
+}): ASTNode | undefined;

package/lib/utils/memoryParse.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,22 +8,26 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
+var visitedCache = require('./visitedCache.js');
 
-var cache = {};
+// NOTE 缓存前40条表达式
+var cache = new visitedCache["default"](40);
 function memoryParse(input, options) {
     if (options === void 0) { options = {
         evalMode: false
     }; }
-    // @todo 优化内存缓存释放，比如只缓存最高频的模版
+    // 优化内存缓存释放，比如只缓存最高频的模版
     if (typeof input !== 'string') {
         return;
     }
     var key = input + JSON.stringify(options);
-    if (cache[key]) {
-        return cache[key];
+    // get cache result
+    if (cache.has(key)) {
+        return cache.get(key);
     }
+    // run parse function and cache
     var ast = amisFormula.parse(input, options);
-    cache[key] = ast;
+    cache.set(key, ast);
     return ast;
 }
 

package/lib/utils/normalizeLink.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/object.d.ts

@@ -1,8 +1,6 @@
-export declare function createObject(superProps?: {
+export declare function createObject<P extends {
     [propName: string]: any;
-}, props?: {
-    [propName: string]: any;
-}, properties?: any): object;
+} | null>(superProps?: P, props?: P, properties?: any): object;
 export declare function extractObjectChain(value: any): object[];
 export declare function createObjectFromChain(chain: Array<object>): object;
 /**

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -167,6 +167,35 @@ function resizeSensor(element, callback, once, type) {
     if (!element) {
         return function () { };
     }
+    // 优先用 ResizeObserver
+    if (typeof ResizeObserver !== 'undefined') {
+        var rect = element.getBoundingClientRect();
+        var originWidth_1 = rect.width;
+        var originHeight_1 = rect.height;
+        var observer_1 = new ResizeObserver(function (entries) {
+            if (once) {
+                observer_1.disconnect();
+            }
+            if (type === 'both') {
+                callback();
+            }
+            else {
+                var entry = entries[0];
+                var cr = entry.contentRect;
+                if ((type === 'width' && cr.width !== originWidth_1) ||
+                    (type === 'height' && cr.height !== originHeight_1)) {
+                    callback();
+                    originWidth_1 = cr.width;
+                    originHeight_1 = cr.height;
+                }
+            }
+        });
+        observer_1.observe(element);
+        return function () {
+            observer_1.disconnect();
+        };
+    }
+    // 不支持 ResizeObserver 的话，用 polyfill
     var disposeEvent = undefined;
     if (once) {
         disposeEvent = attachResizeEvent(element, function () {

package/lib/utils/resolveCondition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -18,6 +18,7 @@ var moment = require('moment');
 var capitalize = require('lodash/capitalize');
 require('amis-formula');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 var isPureVariable = require('./isPureVariable.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ require('tslib');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./resolveVariableAndFilter.js');
 require('./filter.js');

package/lib/utils/toNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.7.0
+ * amis-core v6.9.0-rc.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 var tokenize = require('./tokenize.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');