amis-core 6.6.0 → 6.8.0

package/lib/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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 }; }
 
@@ -88,7 +90,9 @@ function syncDataFromSuper(data, superObject, prevSuperObject, store, force) {
     var obj = tslib.__assign({}, data);
     var keys = [];
     // 如果是 form store，则从父级同步 formItem 种东西。
-    if (store && store.storeType === 'FormStore') {
+    if (store &&
+        store.storeType === 'FormStore' &&
+        store.canAccessSuperData !== false) {
         keys = uniq__default["default"](store.items
             .map(function (item) { return "".concat(item.name).replace(/\..*$/, ''); })
             .concat(Object.keys(obj)));
@@ -149,7 +153,9 @@ function anyChanged(attrs, from, to, strictMode) {
     if (strictMode === void 0) { strictMode = true; }
     return (typeof attrs === 'string'
         ? attrs.split(',').map(function (item) { return item.trim(); })
-        : attrs).some(function (key) { return (strictMode ? from[key] !== to[key] : from[key] != to[key]); });
+        : attrs).some(function (key) {
+        return strictMode ? !Object.is(from[key], to[key]) : from[key] != to[key];
+    });
 }
 function changedEffect(attrs, origin, data, effect, strictMode) {
     if (strictMode === void 0) { strictMode = true; }
@@ -158,7 +164,7 @@ function changedEffect(attrs, origin, data, effect, strictMode) {
         ? attrs.split(',').map(function (item) { return item.trim(); })
         : attrs;
     keys.forEach(function (key) {
-        if (strictMode ? origin[key] !== data[key] : origin[key] != data[key]) {
+        if (strictMode ? !Object.is(origin[key], data[key]) : origin[key] != data[key]) {
             changes[key] = data[key];
         }
     });
@@ -292,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 &&
@@ -424,7 +442,9 @@ function difference(object$1, base, keepProps) {
                     result_1[key] = a;
                 }
                 // isEquals 里面没有处理好递归引用对象的情况
-                if (!isObjectShallowModified(a, b, false, undefined, undefined, 10)) {
+                if (object$1.hasOwnProperty(key) && // 其中一个不是自己的属性，就不要比对了
+                    base.hasOwnProperty(key) &&
+                    !isObjectShallowModified(a, b, true, undefined, undefined, 10)) {
                     return;
                 }
                 if (!object$1.hasOwnProperty(key)) {
@@ -1668,6 +1688,15 @@ var TestIdBuilder = /** @class */ (function () {
     };
     return TestIdBuilder;
 }());
+function supportsMjs() {
+    try {
+        new Function('import("")');
+        return true;
+    }
+    catch (e) {
+        return false;
+    }
+}
 
 exports.cloneObject = object.cloneObject;
 exports.createObject = object.createObject;
@@ -1766,6 +1795,7 @@ exports.rmUndefined = rmUndefined;
 exports.someTree = someTree;
 exports.sortArray = sortArray;
 exports.spliceTree = spliceTree;
+exports.supportsMjs = supportsMjs;
 exports.syncDataFromSuper = syncDataFromSuper;
 exports.ucFirst = ucFirst;
 exports.until = until;

package/lib/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/isPureVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/keyToPath.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/labelToString.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/makeSorter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/math.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offset.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/offsetParent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/optionValueCompare.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/position.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/prettyBytes.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/printElement.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/renderer-event.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -287,9 +287,11 @@ var getRendererEventListeners = function () {
  */
 var resolveEventData = function (props, data, valueKey) {
     var _a, _b;
+    var _c, _d;
     if (valueKey === void 0) { valueKey = 'value'; }
-    return object.createObject(props.data, props.name && valueKey
-        ? tslib.__assign(tslib.__assign({}, data), (_a = {}, _a[props.name] = data[valueKey], _a.__rendererData = tslib.__assign(tslib.__assign({}, props.data), (_b = {}, _b[props.name] = data[valueKey], _b)), _a)) : data);
+    var proto = (_d = (_c = props.getData) === null || _c === void 0 ? void 0 : _c.call(props)) !== null && _d !== void 0 ? _d : props.data;
+    return object.createObject(proto, props.name && valueKey
+        ? tslib.__assign(tslib.__assign({}, data), (_a = {}, _a[props.name] = data[valueKey], _a.__rendererData = tslib.__assign(tslib.__assign({}, proto), (_b = {}, _b[props.name] = data[valueKey], _b)), _a)) : data);
 };
 /**
  * 基于 index、condition、oldCondition 获取匹配的事件目标

package/lib/utils/replaceText.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resize-sensor.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/scrollPosition.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/string2regExp.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/stripNumber.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/style-helper.d.ts

@@ -3,6 +3,7 @@ export declare const valueMap: PlainObject;
 export declare const inheritValueMap: PlainObject;
 interface extra {
     important?: boolean;
+    parent?: string;
     inner?: string;
     pre?: string;
     suf?: string;
@@ -42,10 +43,11 @@ export interface CustomStyleClassName {
         default?: extra;
         hover?: extra;
         active?: extra;
+        focused?: extra;
         disabled?: extra;
     };
 }
-export declare function insertCustomStyle(prams: {
+export declare function insertCustomStyle(params: {
     themeCss: any;
     classNames: CustomStyleClassName[];
     id: string;
@@ -81,7 +83,7 @@ export interface InsertCustomStyle {
 export declare function removeCustomStyle(type: string, id: string, doc?: Document, data?: any): void;
 export declare function formatInputThemeCss(themeCss: any): any;
 export declare function setThemeClassName(params: {
-    name: string;
+    name: string | string[];
     id?: string;
     themeCss: any;
     extra?: string;

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -157,7 +157,8 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
         default: '',
         hover: ':hover',
         active: ':hover:active',
-        disabled: '.is-disabled'
+        focused: '',
+        disabled: ''
     };
     var _loop_1 = function (item) {
         var body = themeCss[item.key];
@@ -173,6 +174,7 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
             default: {},
             hover: {},
             active: {},
+            focused: {},
             disabled: {}
         };
         Object.keys(body).forEach(function (key) {
@@ -186,6 +188,9 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
                 else if (!!~key.indexOf(':active')) {
                     statusMap.active[key.replace(':active', '')] = body[key];
                 }
+                else if (!!~key.indexOf(':focused')) {
+                    statusMap.focused[key.replace(':focused', '')] = body[key];
+                }
                 else if (!!~key.indexOf(':disabled')) {
                     statusMap.disabled[key.replace(':disabled', '')] = body[key];
                 }
@@ -241,9 +246,10 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
             if (styles.length > 0) {
                 var cx = ((weights === null || weights === void 0 ? void 0 : weights.pre) || '') + className + ((weights === null || weights === void 0 ? void 0 : weights.suf) || '');
                 var inner = (weights === null || weights === void 0 ? void 0 : weights.inner) || '';
+                var parent_1 = (weights === null || weights === void 0 ? void 0 : weights.parent) || '';
                 res.push({
-                    className: cx + status2string[status] + inner,
-                    content: ".".concat(cx + status2string[status], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
+                    className: parent_1 + cx + status2string[status] + inner,
+                    content: "".concat(parent_1, " .").concat(cx + status2string[status], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
                 });
                 // TODO:切换状态暂时先不改变组件的样式
                 // if (['hover', 'active', 'disabled'].includes(status)) {
@@ -273,9 +279,9 @@ function formatStyle(themeCss, classNames, id, defaultData, data) {
         origin: res
     };
 }
-function insertCustomStyle(prams) {
+function insertCustomStyle(params) {
     var _a;
-    var themeCss = prams.themeCss, classNames = prams.classNames, id = prams.id, defaultData = prams.defaultData, customStyleClassPrefix = prams.customStyleClassPrefix, doc = prams.doc, data = prams.data;
+    var themeCss = params.themeCss, classNames = params.classNames, id = params.id, defaultData = params.defaultData, customStyleClassPrefix = params.customStyleClassPrefix, doc = params.doc, data = params.data;
     if (!themeCss) {
         return;
     }
@@ -409,21 +415,29 @@ function formatInputThemeCss(themeCss) {
     return inputFontThemeCss;
 }
 function setThemeClassName(params) {
-    var _a;
     var name = params.name, id = params.id, themeCss = params.themeCss, extra = params.extra, data = params.data;
     if (!id || !themeCss) {
         return '';
     }
-    if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
-        return '';
-    }
     var index = '';
     if (typeof (data === null || data === void 0 ? void 0 : data.index) === 'number') {
         index = "-".concat(data.index);
     }
-    return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
-        (extra ? "-".concat(extra) : '') +
-        index);
+    function setClassName(name, id) {
+        var _a;
+        if (name !== 'wrapperCustomStyle' && !themeCss[name]) {
+            return '';
+        }
+        return ("".concat(name, "-").concat(((_a = id.replace) === null || _a === void 0 ? void 0 : _a.call(id, 'u:', '')) || id) +
+            (extra ? "-".concat(extra) : '') +
+            index);
+    }
+    if (typeof name === 'string') {
+        return setClassName(name, id);
+    }
+    else {
+        return name.map(function (n) { return setClassName(n, id); }).join(' ');
+    }
 }
 
 exports.addStyle = addStyle;

package/lib/utils/style.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.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');

package/lib/utils/tpl-lodash.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -12,6 +12,7 @@ var template = require('lodash/template');
 var amisFormula = require('amis-formula');
 var moment = require('moment');
 require('lodash/isPlainObject');
+require('./memoryParse.js');
 require('@rc-component/mini-decimal');
 require('./filter.js');
 

package/lib/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */