amis-core 3.0.0 → 3.1.0

package/lib/utils/keyToPath.js

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

package/lib/utils/makeSorter.js

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

package/lib/utils/memoryParse.d.ts

@@ -0,0 +1,17 @@
+export declare function memoryParse(input: string, options?: {
+    /**
+     * 直接是运算表达式？还是从模板开始 ${} 里面才算运算表达式
+     */
+    evalMode?: boolean;
+    /**
+     * 只支持取变量。
+     */
+    variableMode?: boolean;
+    /**
+     * 是否允许 filter 语法，比如：
+     *
+     * ${abc | html}
+     */
+    allowFilter?: boolean;
+    variableNamespaces?: Array<string>;
+}): any;

package/lib/utils/memoryParse.js

@@ -0,0 +1,30 @@
+/**
+ * amis-core v3.1.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var amisFormula = require('amis-formula');
+
+var cache = {};
+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];
+    }
+    var ast = amisFormula.parse(input, options);
+    cache[key] = ast;
+    return ast;
+}
+
+exports.memoryParse = memoryParse;

package/lib/utils/normalizeLink.js

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

package/lib/utils/normalizeOptions.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -58,7 +58,9 @@ function normalizeOptions(options, share, valueField) {
         });
     }
     else if (Array.isArray(options)) {
-        return options.map(function (item) {
+        return options
+            .filter(function (item) { return item !== null && item !== undefined; })
+            .map(function (item) {
             var _a;
             var value = item && item[valueField];
             var idx = value !== undefined && !item.children

package/lib/utils/object.d.ts

@@ -3,6 +3,8 @@ export declare function createObject(superProps?: {
 }, props?: {
     [propName: string]: any;
 }, properties?: any): object;
+export declare function extractObjectChain(value: any): object[];
+export declare function createObjectFromChain(chain: Array<object>): object;
 export declare function cloneObject(target: any, persistOwnProps?: boolean): any;
 export declare function extendObject(target: any, src?: any, persistOwnProps?: boolean): any;
 export declare function isObject(obj: any): any;

package/lib/utils/object.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -33,6 +33,31 @@ function createObject(superProps, props, properties) {
         Object.keys(props).forEach(function (key) { return (obj[key] = props[key]); });
     return obj;
 }
+function extractObjectChain(value) {
+    var result = value ? [value] : [];
+    while (value === null || value === void 0 ? void 0 : value.__super) {
+        result.unshift(value.__super);
+        value = value.__super;
+    }
+    return result;
+}
+function createObjectFromChain(chain) {
+    return chain
+        .filter(function (item) { return item; })
+        .reduce(function (proto, value) {
+        proto = proto || Object.prototype;
+        if (Object.isFrozen(proto)) {
+            proto = cloneObject(proto);
+        }
+        return Object.assign(Object.create(proto, {
+            __super: {
+                value: proto,
+                writable: false,
+                enumerable: false
+            }
+        }), value);
+    });
+}
 function cloneObject(target, persistOwnProps) {
     if (persistOwnProps === void 0) { persistOwnProps = true; }
     var obj = target && target.__super
@@ -149,8 +174,10 @@ function pickValues(names, data) {
 
 exports.cloneObject = cloneObject;
 exports.createObject = createObject;
+exports.createObjectFromChain = createObjectFromChain;
 exports.deleteVariable = deleteVariable;
 exports.extendObject = extendObject;
+exports.extractObjectChain = extractObjectChain;
 exports.isObject = isObject;
 exports.pickValues = pickValues;
 exports.setVariable = setVariable;

package/lib/utils/offset.js

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

package/lib/utils/offsetParent.js

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

package/lib/utils/optionValueCompare.js

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

package/lib/utils/position.js

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

package/lib/utils/prettyBytes.js

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

package/lib/utils/renderer-event.js

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

package/lib/utils/replaceText.js

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

package/lib/utils/resize-sensor.js

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

package/lib/utils/resolveCondition.js

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

package/lib/utils/resolveVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var amisFormula = require('amis-formula');
 var getVariable = require('./getVariable.js');
+var memoryParse = require('./memoryParse.js');
 
 function resolveVariable(path, data, canAccessSuper) {
     if (data === void 0) { data = {}; }
@@ -26,7 +27,7 @@ function resolveVariable(path, data, canAccessSuper) {
     // 带 namespace 的用公式
     // 主要是用公式会严格点，不能出现奇怪的变量名
     try {
-        return new amisFormula.Evaluator(data).evalute(amisFormula.parse(path, {
+        return new amisFormula.Evaluator(data).evalute(memoryParse.memoryParse(path, {
             variableMode: true,
             allowFilter: false
         }));

package/lib/utils/resolveVariableAndFilter.js

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

package/lib/utils/resolveVariableAndFilterForAsync.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var amisFormula = require('amis-formula');
+var memoryParse = require('./memoryParse.js');
 
 var formulaEvalErrorHandler;
 /**
@@ -34,7 +35,7 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    ast = amisFormula.parse(path, {
+                    ast = memoryParse.memoryParse(path, {
                         evalMode: false,
                         allowFilter: true
                     });
@@ -48,7 +49,6 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                             : ret];
                 case 3:
                     e_1 = _a.sent();
-                    console.warn(e_1);
                     if (e_1.name === 'FormulaEvalError') {
                         if (!skipFormulaEvalErrorHandler) {
                             // 无法解析时，执行handler自定义解析逻辑
@@ -57,6 +57,7 @@ var resolveVariableAndFilterForAsync = function (path, data, defaultFilter, fall
                         // 跳过自定义解析逻辑，则直接抛异常
                         throw e_1;
                     }
+                    console.warn(e_1);
                     return [2 /*return*/, undefined];
                 case 4: return [2 /*return*/];
             }

package/lib/utils/scrollPosition.js

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

package/lib/utils/string2regExp.js

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

package/lib/utils/stripNumber.js

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

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

@@ -2,6 +2,8 @@ import { PlainObject } from '../types';
 export declare const valueMap: PlainObject;
 export declare const inheritValueMap: PlainObject;
 interface extra {
+    important?: boolean;
+    inner?: string;
     pre?: string;
     suf?: string;
 }
@@ -24,7 +26,7 @@ export declare function formatStyle(themeCss: any, classNames: {
         content: string;
     }[];
 };
-export declare function insertCustomStyle(themeCss: any, classNames: {
+export interface CustomStyleClassName {
     key: string;
     value?: string;
     weights?: {
@@ -33,7 +35,8 @@ export declare function insertCustomStyle(themeCss: any, classNames: {
         active?: extra;
         disabled?: extra;
     };
-}[], id?: string, defaultData?: any): void;
+}
+export declare function insertCustomStyle(themeCss: any, classNames: CustomStyleClassName[], id?: string, defaultData?: any, customStyleClassPrefix?: string): void;
 /**
  * 根据路径获取默认值
  */

package/lib/utils/style-helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -123,7 +123,7 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         }
         list === null || list === void 0 ? void 0 : list.forEach(function (n) {
             if (/(\S*[C|c]lassName-\S*)/.test(n) &&
-                !!~n.indexOf((id === null || id === void 0 ? void 0 : id.replace('u:', '').replace('-label', '').replace('-description', '').replace('-addOn', '').replace('-icon', '')) || '')) {
+                !!~n.indexOf((id === null || id === void 0 ? void 0 : id.replace('u:', '').replace('-label', '').replace('-description', '').replace('-addOn', '').replace('-icon', '').replace('-inner', '')) || '')) {
                 classNameList.push(n);
             }
         });
@@ -193,14 +193,23 @@ function formatStyle(themeCss, classNames, id, defaultData) {
                         }
                         else {
                             var value = style;
-                            value && fn(key, value);
+                            if (key === 'iconSize') {
+                                fn('width', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                                fn('height', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                                fn('font-size', value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            }
+                            else {
+                                value &&
+                                    fn(key, value + ((weights === null || weights === void 0 ? void 0 : weights.important) ? ' !important' : ''));
+                            }
                         }
                     }
                     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) || '';
                         res.push({
-                            className: cx + status2string[status_1],
-                            content: ".".concat(cx + status2string[status_1], " {\n  ").concat(styles.join('\n  '), "\n}")
+                            className: cx + status2string[status_1] + inner,
+                            content: ".".concat(cx + status2string[status_1], " ").concat(inner, "{\n  ").concat(styles.join('\n  '), "\n}")
                         });
                         // TODO:切换状态暂时先不改变组件的样式
                         // if (['hover', 'active', 'disabled'].includes(status)) {
@@ -242,12 +251,15 @@ function formatStyle(themeCss, classNames, id, defaultData) {
         origin: res
     };
 }
-function insertCustomStyle(themeCss, classNames, id, defaultData) {
+function insertCustomStyle(themeCss, classNames, id, defaultData, customStyleClassPrefix) {
     if (!themeCss) {
         return;
     }
     var value = formatStyle(themeCss, classNames, id, defaultData).value;
     if (value) {
+        value = customStyleClassPrefix
+            ? "".concat(customStyleClassPrefix, " ").concat(value)
+            : value;
         insertStyle(value, (id === null || id === void 0 ? void 0 : id.replace('u:', '')) || helper.uuid());
     }
 }

package/lib/utils/style.js

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

package/lib/utils/toNumber.js

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

package/lib/utils/tokenize.d.ts

@@ -1,2 +1 @@
 export declare const tokenize: (str: string, data: object, defaultFilter?: string) => string;
-export declare const asyncTokenize: (str: string, data: object, defaultFilter?: string) => Promise<string>;

package/lib/utils/tokenize.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,7 +7,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var tslib = require('tslib');
 var amisFormula = require('amis-formula');
 
 var tokenize = function (str, data, defaultFilter) {
@@ -30,36 +29,5 @@ var tokenize = function (str, data, defaultFilter) {
         return str;
     }
 };
-var asyncTokenize = function (str, data, defaultFilter) {
-    if (defaultFilter === void 0) { defaultFilter = '| html'; }
-    return tslib.__awaiter(void 0, void 0, void 0, function () {
-        var ast, result, e_1;
-        return tslib.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!str || typeof str !== 'string') {
-                        return [2 /*return*/, str];
-                    }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    ast = amisFormula.parse(str, {
-                        evalMode: false,
-                        allowFilter: true
-                    });
-                    return [4 /*yield*/, amisFormula.evaluateForAsync(ast, data, { defaultFilter: defaultFilter })];
-                case 2:
-                    result = _a.sent();
-                    return [2 /*return*/, "".concat(result == null ? '' : result)];
-                case 3:
-                    e_1 = _a.sent();
-                    console.warn(e_1);
-                    return [2 /*return*/, str];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
-};
 
-exports.asyncTokenize = asyncTokenize;
 exports.tokenize = tokenize;

package/lib/utils/tpl-builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.0.0
+ * amis-core v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -12,6 +12,7 @@ var amisFormula = require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
 var tokenize = require('./tokenize.js');
+var resolveVariableAndFilterForAsync = require('./resolveVariableAndFilterForAsync.js');
 require('./filter.js');
 
 function matchSynatax(str) {
@@ -62,7 +63,7 @@ function register() {
             return tslib.__awaiter(_this, void 0, void 0, function () {
                 return tslib.__generator(this, function (_a) {
                     try {
-                        return [2 /*return*/, tokenize.asyncTokenize(str, data, defaultFilter)];
+                        return [2 /*return*/, resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync(str, data, defaultFilter)];
                     }
                     catch (e) {
                         return [2 /*return*/, "error: ".concat(e.message)];
@@ -87,4 +88,5 @@ Object.defineProperty(exports, 'registerFunction', {
     get: function () { return amisFormula.registerFunction; }
 });
 exports.tokenize = tokenize.tokenize;
+exports.resolveVariableAndFilterForAsync = resolveVariableAndFilterForAsync.resolveVariableAndFilterForAsync;
 exports.register = register;

package/lib/utils/tpl-lodash.js

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

package/lib/utils/tpl.js

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

package/lib/utils/uncontrollable.js

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

package/lib/utils/validations.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-core",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "amis-core",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -45,7 +45,7 @@
     "esm"
   ],
   "dependencies": {
-    "amis-formula": "^3.0.0",
+    "amis-formula": "^3.1.0",
     "classnames": "2.3.1",
     "file-saver": "^2.0.2",
     "hoist-non-react-statics": "^3.3.2",
@@ -101,5 +101,5 @@
       "/.rollup.cache/"
     ]
   },
-  "gitHead": "9220b4c13f4d042ebf2bf1dd8ee8e24d11e39141"
+  "gitHead": "020b12d0be43215664e0c0e53cd33486c43fde86"
 }