amis-core 3.4.2 → 3.4.3

package/esm/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -195,12 +195,13 @@ var TableStore2 = ServiceStore.named('TableStore2')
             unSelectedItems: getUnSelectedRows().map(function (item) { return item.data; })
         });
     }
-    function getRowByIndex(rowIndex, levels) {
+    function getRowByIndex(rowIndex, levels, rows) {
+        rows = rows || self.rows;
         if (levels && levels.length > 0) {
             var index = +(levels.shift() || 0);
-            return getRowByIndex(index, levels);
+            return getRowByIndex(rowIndex, levels, rows[index].children);
         }
-        return self.rows[rowIndex];
+        return rows[rowIndex];
     }
     function isSelected(row) {
         return !!~self.selectedRows.indexOf(row);

package/esm/theme.js

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

package/esm/utils/Animation.js

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

package/esm/utils/ColorScale.js

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

package/esm/utils/DataSchema.js

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

package/esm/utils/DataScope.js

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

package/esm/utils/RootClose.js

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

package/esm/utils/SimpleMap.js

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

package/esm/utils/api.js

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

package/esm/utils/arraySlice.js

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

package/esm/utils/attachmentAdpator.js

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

package/esm/utils/autobind.js

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

package/esm/utils/columnsSplit.js

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

package/esm/utils/dataMapping.js

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

package/esm/utils/date.js

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

package/esm/utils/debug.d.ts

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

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -9,13 +9,15 @@ import cx from 'classnames';
 import { findDOMNode, render, unmountComponentAtNode } from 'react-dom';
 import { observable, autorun } from 'mobx';
 import { observer } from 'mobx-react';
-import { uuidv4 } from './helper.js';
+import { importLazyComponent, uuidv4 } from './helper.js';
 import { position } from './position.js';
 
 /**
  * amis 运行时调试功能，为了避免循环引用，这个组件不要依赖 amis 里的组件
  */
-var JsonView = React.lazy(function () { return import('react-json-view'); });
+var JsonView = React.lazy(function () {
+    return import('react-json-view').then(importLazyComponent);
+});
 /** @class */ ((function () {
     function Log() {
         this.cat = '';

package/esm/utils/decodeEntity.js

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

package/esm/utils/dom.js

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

package/esm/utils/errors.js

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

package/esm/utils/escapeHtml.js

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

package/esm/utils/filter-schema.js

@@ -1,12 +1,12 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
 import { evalExpression, filter } from './tpl.js';
 import { injectPropsToObject, mapObject } from './helper.js';
 import isPlainObject from 'lodash/isPlainObject';
-import cx from 'classnames';
+import { tokenize } from './tokenize.js';
 
 /**
  * 处理 Props 数据，所有带 On 结束的做一次
@@ -28,13 +28,14 @@ function getExprProperties(schema, data, blackList, props) {
             return;
         }
         var parts = /^(.*)(On|Expr|(?:c|C)lassName)(Raw)?$/.exec(key);
+        var type = parts === null || parts === void 0 ? void 0 : parts[2];
         var value = schema[key];
         if (value &&
             typeof value === 'string' &&
             (parts === null || parts === void 0 ? void 0 : parts[1]) &&
-            (parts[2] === 'On' || parts[2] === 'Expr')) {
+            (type === 'On' || type === 'Expr')) {
             key = parts[1];
-            if (parts[2] === 'On' || parts[2] === 'Expr') {
+            if (type === 'On' || type === 'Expr') {
                 if (!ctx &&
                     props &&
                     typeof value === 'string' &&
@@ -43,7 +44,7 @@ function getExprProperties(schema, data, blackList, props) {
                         __props: props
                     });
                 }
-                if (parts[2] === 'On') {
+                if (type === 'On') {
                     value = (props === null || props === void 0 ? void 0 : props[key]) || evalExpression(value, ctx || data);
                 }
                 else {
@@ -52,14 +53,17 @@ function getExprProperties(schema, data, blackList, props) {
             }
             exprProps[key] = value;
         }
-        else if (value &&
-            isPlainObject(value) &&
-            ((parts === null || parts === void 0 ? void 0 : parts[2]) === 'className' || (parts === null || parts === void 0 ? void 0 : parts[2]) === 'ClassName')) {
-            key = parts[1] + parts[2];
+        else if ((type === 'className' || type === 'ClassName') &&
+            !(props === null || props === void 0 ? void 0 : props[key]) && // 如果 props 里面有则是 props 优先
+            value &&
+            (typeof value === 'string' || isPlainObject(value))) {
             exprProps["".concat(key, "Raw")] = value;
-            exprProps[key] = cx(mapObject(value, function (value) {
-                return typeof value === 'string' ? evalExpression(value, data) : value;
-            }));
+            exprProps[key] =
+                typeof value === 'string'
+                    ? tokenize(value, data)
+                    : mapObject(value, function (value) {
+                        return typeof value === 'string' ? evalExpression(value, data) : value;
+                    }, undefined, function (key) { return tokenize(key, data); });
         }
     });
     return exprProps;

package/esm/utils/filter.js

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

package/esm/utils/formatDuration.js

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

package/esm/utils/formula.js

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

package/esm/utils/getVariable.js

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

package/esm/utils/grammar.js

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

package/esm/utils/handleAction.js

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

package/esm/utils/helper.d.ts

@@ -273,7 +273,7 @@ export declare function qsparse(data: string, options?: any): qs.ParsedQs;
 export declare function object2formData(data: any, options?: any, fd?: FormData): any;
 export declare function chainFunctions(...fns: Array<(...args: Array<any>) => void>): (...args: Array<any>) => void;
 export declare function chainEvents(props: any, schema: any): any;
-export declare function mapObject(value: any, fn: Function, skipFn?: (value: any) => boolean): any;
+export declare function mapObject(value: any, valueMapper: (value: any) => any, skipFn?: (value: any) => boolean, keyMapper?: (key: string) => string): any;
 export declare function loadScript(src: string): Promise<void>;
 export declare function loadStyle(href: string): Promise<void>;
 export declare class SkipOperation extends Error {
@@ -364,3 +364,4 @@ export declare function differenceFromAll<T>(allOptions: Array<T>, options: Arra
  */
 export declare function buildTrackExpression(schema: any): string;
 export declare function evalTrackExpression(expression: string, data: Record<string, any>): string;
+export declare function importLazyComponent(mod: any): any;

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -1065,7 +1065,7 @@ function chainEvents(props, schema) {
     });
     return ret;
 }
-function mapObject(value, fn, skipFn) {
+function mapObject(value, valueMapper, skipFn, keyMapper) {
     // 如果value值满足skipFn条件则不做map操作
     skipFn =
         skipFn && typeof skipFn === 'function'
@@ -1077,20 +1077,21 @@ function mapObject(value, fn, skipFn) {
                 }
                 return false;
             };
-    if (!!skipFn(value)) {
+    if (skipFn(value)) {
         return value;
     }
     if (Array.isArray(value)) {
-        return value.map(function (item) { return mapObject(item, fn); });
+        return value.map(function (item) { return mapObject(item, valueMapper, skipFn, keyMapper); });
     }
     if (isObject(value)) {
-        var tmpValue_1 = __assign({}, value);
-        Object.keys(tmpValue_1).forEach(function (key) {
-            tmpValue_1[key] = mapObject(tmpValue_1[key], fn);
+        var tmpValue_1 = {};
+        Object.keys(value).forEach(function (key) {
+            var newKey = keyMapper ? keyMapper(key) : key;
+            tmpValue_1[newKey] = mapObject(value[key], valueMapper, skipFn, keyMapper);
         });
         return tmpValue_1;
     }
-    return fn(value);
+    return valueMapper(value);
 }
 function loadScript(src) {
     return new Promise(function (ok, fail) {
@@ -1215,7 +1216,7 @@ function getScrollbarWidth() {
 // 后续改用 FormulaExec['formula']
 function resolveValueByName(data, name, canAccessSuper) {
     return isPureVariable(name)
-        ? resolveVariableAndFilter(name, data)
+        ? resolveVariableAndFilter(name, data, '|raw')
         : resolveVariable(name, data, canAccessSuper);
 }
 // 统一的获取 value 值方法
@@ -1538,5 +1539,9 @@ function evalTrackExpression(expression, data) {
     })
         .join('');
 }
+// 很奇怪的问题，react-json-view import 有些情况下 mod.default 才是 esModule
+function importLazyComponent(mod) {
+    return mod.default.__esModule ? mod.default : mod;
+}
 
-export { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };
+export { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };

package/esm/utils/highlight.js

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

package/esm/utils/icon.js

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

package/esm/utils/image.js

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

package/esm/utils/isPureVariable.js

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

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

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

package/esm/utils/keyToPath.js

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

package/esm/utils/makeSorter.js

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

package/esm/utils/math.js

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

package/esm/utils/memoryParse.js

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

package/esm/utils/normalizeLink.js

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

package/esm/utils/normalizeOptions.js

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

package/esm/utils/object.js

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

package/esm/utils/offset.js

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

package/esm/utils/offsetParent.js

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

package/esm/utils/optionValueCompare.js

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

package/esm/utils/position.js

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

package/esm/utils/prettyBytes.js

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

package/esm/utils/renderer-event.js

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

package/esm/utils/replaceText.js

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

package/esm/utils/resize-sensor.js

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

package/esm/utils/resolveCondition.js

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

package/esm/utils/resolveVariable.js

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

package/esm/utils/resolveVariableAndFilter.js

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

package/esm/utils/resolveVariableAndFilterForAsync.js

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

package/esm/utils/scrollPosition.js

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

package/esm/utils/string2regExp.js

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

package/esm/utils/stripNumber.js

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

package/esm/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.2
+ * amis-core v3.4.3
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import isObject from 'lodash/isObject';
 import map from 'lodash/map';
 import isEmpty from 'lodash/isEmpty';
+import kebabCase from 'lodash/kebabCase';
 
 var valueMap = {
     'marginTop': 'margin-top',
@@ -150,7 +151,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
             var styles = [];
             var fn = function (key, value) {
                 key = valueMap[key] || key;
-                styles.push("".concat(key, ": ").concat(value, ";"));
+                styles.push("".concat(kebabCase(key), ": ").concat(value, ";"));
             };
             Object.keys(statusMap[status]).forEach(function (key) {
                 if (key !== '$$id') {