amis-core 3.4.3 → 3.5.0

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,7 +13,6 @@ var iRenderer = require('./iRenderer.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
-var isPureVariable = require('../utils/isPureVariable.js');
 var resolveVariable = require('../utils/resolveVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 require('lodash/isPlainObject');
@@ -35,6 +34,38 @@ var sortBy__default = /*#__PURE__*/_interopDefaultLegacy(sortBy);
  * 内部列的数量 '__checkme' | '__dragme' | '__expandme'
  */
 var PARTITION_INDEX = 3;
+function initChildren(children, depth, pindex, parentId, path) {
+    if (path === void 0) { path = ''; }
+    depth += 1;
+    return children.map(function (item, index) {
+        var _a;
+        item = object.isObject(item)
+            ? item
+            : {
+                item: item
+            };
+        var id = (_a = item.__id) !== null && _a !== void 0 ? _a : helper.guid();
+        return {
+            // id: String(item && (item as any)[self.primaryField] || `${pindex}-${depth}-${key}`),
+            id: String(id),
+            parentId: String(parentId),
+            key: String("".concat(pindex, "-").concat(depth, "-").concat(index)),
+            path: "".concat(path).concat(index),
+            depth: depth,
+            index: index,
+            newIndex: index,
+            pristine: item,
+            data: item,
+            defer: !!item.defer,
+            loaded: false,
+            loading: false,
+            rowSpans: {},
+            children: item && Array.isArray(item.children)
+                ? initChildren(item.children, depth, index, id, "".concat(path).concat(index, "."))
+                : []
+        };
+    });
+}
 var Column = mobxStateTree.types
     .model('Column', {
     label: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
@@ -66,7 +97,7 @@ var Column = mobxStateTree.types
     get isPrimary() {
         var _a;
         var table = mobxStateTree.getParent(self, 2);
-        return ((_a = table.filteredColumns[0]) === null || _a === void 0 ? void 0 : _a.id) === self.id;
+        return (((_a = table.filteredColumns.find(function (column) { return !column.type.startsWith('__'); })) === null || _a === void 0 ? void 0 : _a.id) === self.id);
     }
 }); })
     .actions(function (self) { return ({
@@ -108,17 +139,27 @@ var Row = mobxStateTree.types
     rowSpans: mobxStateTree.types.frozen({}),
     index: mobxStateTree.types.number,
     newIndex: mobxStateTree.types.number,
-    nth: 0,
     path: '',
-    expandable: false,
     checkdisable: false,
     isHover: false,
     children: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.late(function () { return Row; })), []),
+    defer: false,
+    loaded: false,
+    loading: false,
+    error: '',
     depth: mobxStateTree.types.number,
     appeared: true,
     lazyRender: false
 })
     .views(function (self) { return ({
+    get expandable() {
+        var table;
+        return !!((self && self.children.length) ||
+            (self && self.defer && !self.loaded) ||
+            ((table = mobxStateTree.getParent(self, self.depth * 2)) &&
+                table.footable &&
+                table.footableColumns.length));
+    },
     get checked() {
         return mobxStateTree.getParent(self, self.depth * 2).isSelected(self);
     },
@@ -246,30 +287,53 @@ var Row = mobxStateTree.types
             }
         });
         if (Array.isArray(data.children)) {
-            var arr = data.children;
-            var pool = arr.concat();
-            // 把多的删了先
-            if (self.children.length > arr.length) {
-                self.children.splice(arr.length, self.children.length - arr.length);
+            this.replaceChildren(data.children);
+        }
+    },
+    replaceChildren: function (children) {
+        var arr = children;
+        var pool = arr.concat();
+        // 把多的删了先
+        if (self.children.length > arr.length) {
+            self.children.splice(arr.length, self.children.length - arr.length);
+        }
+        var index = 0;
+        var len = self.children.length;
+        while (pool.length) {
+            // 因为父级id未更新，所以需要将子级的parentId正确指向父级id
+            var item = tslib.__assign(tslib.__assign({}, pool.shift()), { parentId: self.id });
+            if (index < len) {
+                self.children[index].replaceWith(item);
             }
-            var index = 0;
-            var len = self.children.length;
-            while (pool.length) {
-                // 因为父级id未更新，所以需要将子级的parentId正确指向父级id
-                var item = tslib.__assign(tslib.__assign({}, pool.shift()), { parentId: self.id });
-                if (index < len) {
-                    self.children[index].replaceWith(item);
-                }
-                else {
-                    var row = Row.create(item);
-                    self.children.push(row);
-                }
-                index++;
+            else {
+                var row = Row.create(item);
+                self.children.push(row);
             }
+            index++;
         }
     },
     markAppeared: function (value) {
         value && (self.appeared = !!value);
+    },
+    markLoading: function (value) {
+        self.loading = !!value;
+    },
+    markLoaded: function (value) {
+        self.loaded = !!value;
+    },
+    setError: function (value) {
+        self.error = String(value);
+    },
+    resetDefered: function () {
+        self.error = '';
+        self.loaded = false;
+    },
+    setDeferData: function (_a) {
+        var children = _a.children, rest = tslib.__rest(_a, ["children"]);
+        self.data = tslib.__assign(tslib.__assign({}, self.data), rest);
+        if (Array.isArray(children)) {
+            this.replaceChildren(initChildren(children, self.depth, self.index, self.id, self.path));
+        }
     }
 }); });
 var TableStore = iRenderer.iRendererStore
@@ -674,7 +738,7 @@ var TableStore = iRenderer.iRendererStore
     function getTable() {
         return tableRef;
     }
-    function update(config) {
+    function update(config, options) {
         var _a;
         config.primaryField !== undefined &&
             (self.primaryField = config.primaryField);
@@ -721,8 +785,15 @@ var TableStore = iRenderer.iRendererStore
             (self.tableLayout = config.tableLayout);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
-                .filter(function (column) { return column; })
-                .concat();
+                .map(function (column) {
+                if ((options === null || options === void 0 ? void 0 : options.resolveDefinitions) &&
+                    typeof (column === null || column === void 0 ? void 0 : column.$ref) == 'string' &&
+                    column.$ref) {
+                    return tslib.__assign(tslib.__assign({}, options.resolveDefinitions(column.$ref)), column);
+                }
+                return column;
+            })
+                .filter(function (column) { return column; });
             // 更新列顺序，afterCreate生命周期中更新columns不会触发组件的render
             var key = getPersistDataKey(columns);
             var data = localStorage.getItem(key);
@@ -772,11 +843,7 @@ var TableStore = iRenderer.iRendererStore
                 var origin = item.id
                     ? originColumns_1.find(function (column) { return column.pristine.id === item.id; })
                     : originColumns_1[index];
-                return tslib.__assign(tslib.__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || helper.guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, 
-                    /** 提前映射变量，方便后续view中使用 */
-                    label: isPureVariable.isPureVariable(item.label)
-                        ? resolveVariableAndFilter.resolveVariableAndFilter(item.label, self.data)
-                        : item.label });
+                return tslib.__assign(tslib.__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || helper.guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint, isPrimary: index === PARTITION_INDEX });
             });
             self.columns.replace(columns);
         }
@@ -922,44 +989,11 @@ var TableStore = iRenderer.iRendererStore
         }
         return combineCell(arr, keys);
     }
-    function initChildren(children, depth, pindex, parentId, path, nThRef) {
-        if (path === void 0) { path = ''; }
-        depth += 1;
-        return children.map(function (item, index) {
-            var _a;
-            item = object.isObject(item)
-                ? item
-                : {
-                    item: item
-                };
-            var id = (_a = item.__id) !== null && _a !== void 0 ? _a : helper.guid();
-            return {
-                // id: String(item && (item as any)[self.primaryField] || `${pindex}-${depth}-${key}`),
-                id: String(id),
-                parentId: String(parentId),
-                key: String("".concat(pindex, "-").concat(depth, "-").concat(index)),
-                path: "".concat(path).concat(index),
-                depth: depth,
-                index: index,
-                nth: nThRef.index++,
-                newIndex: index,
-                pristine: item,
-                data: item,
-                rowSpans: {},
-                children: item && Array.isArray(item.children)
-                    ? initChildren(item.children, depth, index, id, "".concat(path).concat(index, "."), nThRef)
-                    : [],
-                expandable: !!((item && Array.isArray(item.children) && item.children.length) ||
-                    (self.footable && self.footableColumns.length))
-            };
-        });
-    }
     function initRows(rows, getEntryId, reUseRow) {
         self.selectedRows.clear();
         // self.expandedRows.clear();
         /* 避免输入内容为非数组挂掉 */
         rows = !Array.isArray(rows) ? [] : rows;
-        var nThRef = { index: 0 };
         var arr = rows.map(function (item, index) {
             var _a;
             if (!object.isObject(item)) {
@@ -974,24 +1008,24 @@ var TableStore = iRenderer.iRendererStore
                 key: String("".concat(index, "-1-").concat(index)),
                 depth: 1,
                 index: index,
-                nth: nThRef.index++,
                 newIndex: index,
                 pristine: item,
                 path: "".concat(index),
                 data: item,
                 rowSpans: {},
+                defer: !!item.defer,
+                loaded: false,
+                loading: false,
                 children: item && Array.isArray(item.children)
-                    ? initChildren(item.children, 1, index, id, "".concat(index, "."), nThRef)
-                    : [],
-                expandable: !!((item && Array.isArray(item.children) && item.children.length) ||
-                    (self.footable && self.footableColumns.length))
+                    ? initChildren(item.children, 1, index, id, "".concat(index, "."))
+                    : []
             };
         });
         if (self.combineNum) {
             arr = autoCombineCell(arr, self.columns, self.combineNum, self.combineFromIndex);
         }
         replaceRow(arr, reUseRow);
-        self.isNested = self.rows.some(function (item) { return item.children.length; });
+        self.isNested = self.rows.some(function (item) { return item.children.length || (item.defer && !item.loaded); });
         // 前 20 个直接渲染，后面的按需渲染
         if (self.lazyRenderAfter &&
             self.falttenedRows.length > self.lazyRenderAfter) {

package/lib/store/table2.js

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

package/lib/theme.js

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

package/lib/types.d.ts

@@ -186,8 +186,14 @@ export interface ApiObject extends BaseApiObject {
     mockResponse?: PlainObject;
     adaptor?: (payload: object, response: fetcherResult, api: ApiObject, context: any) => any;
     requestAdaptor?: (api: ApiObject, context: any) => ApiObject | Promise<ApiObject>;
+    /**
+     * api 发送上下文，可以用来传递一些数据给 api 的 adaptor
+     * @readonly
+     */
+    context?: any;
     /** 是否过滤为空字符串的 query 参数 */
     filterEmptyQuery?: boolean;
+    downloadFileName?: string;
 }
 export type ApiString = string;
 export type Api = ApiString | ApiObject;

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -379,6 +379,7 @@ function wrapFetcher(fn, tracker) {
                 switch (_d.label) {
                     case 0:
                         api = buildApi(api, data, options);
+                        api.context = data;
                         if (!api.requestAdaptor) return [3 /*break*/, 2];
                         debug.debug('api', 'before requestAdaptor', api);
                         return [4 /*yield*/, api.requestAdaptor(api, data)];

package/lib/utils/arraySlice.js

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

package/lib/utils/attachmentAdpator.d.ts

@@ -4,5 +4,6 @@
  * @param __
  * @returns
  */
-export declare function attachmentAdpator(response: any, __: Function): any;
+import { ApiObject } from '../types';
+export declare function attachmentAdpator(response: any, __: Function, api?: ApiObject): any;
 export default attachmentAdpator;

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,21 +15,27 @@ var tslib = require('tslib');
  * @param __
  * @returns
  */
-function attachmentAdpator(response, __) {
+function attachmentAdpator(response, __, api) {
     if (response && response.headers && response.headers['content-disposition']) {
         var disposition = response.headers['content-disposition'];
         var filename = '';
         if (disposition && disposition.indexOf('attachment') !== -1) {
-            // disposition 有可能是 attachment; filename="??.xlsx"; filename*=UTF-8''%E4%B8%AD%E6%96%87.xlsx
-            // 这种情况下最后一个才是正确的文件名
-            var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/;
-            var matches = disposition.match(filenameRegex);
-            if (matches && matches.length) {
-                filename = matches[1].replace("UTF-8''", '').replace(/['"]/g, '');
+            // 如果 api 中配置了，则优先用 api 中的配置
+            if (api === null || api === void 0 ? void 0 : api.downloadFileName) {
+                filename = api.downloadFileName;
             }
-            // 很可能是中文被 url-encode 了
-            if (filename && filename.replace(/[^%]/g, '').length > 2) {
-                filename = decodeURIComponent(filename);
+            else {
+                // disposition 有可能是 attachment; filename="??.xlsx"; filename*=UTF-8''%E4%B8%AD%E6%96%87.xlsx
+                // 这种情况下最后一个才是正确的文件名
+                var filenameRegex = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/i;
+                var matches = disposition.match(filenameRegex);
+                if (matches && matches.length) {
+                    filename = matches[1].replace("UTF-8''", '').replace(/['"]/g, '');
+                }
+                // 很可能是中文被 url-encode 了
+                if (filename && filename.replace(/[^%]/g, '').length > 2) {
+                    filename = decodeURIComponent(filename);
+                }
             }
             var type = response.headers['content-type'];
             var blob = response.data.toString() === '[object Blob]'

package/lib/utils/autobind.js

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

package/lib/utils/columnsSplit.js

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

package/lib/utils/dataMapping.js

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

package/lib/utils/date.js

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

package/lib/utils/debug.js

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

package/lib/utils/decodeEntity.js

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

package/lib/utils/dom.js

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

package/lib/utils/errors.js

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

package/lib/utils/escapeHtml.js

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

package/lib/utils/filter-schema.d.ts

@@ -1,4 +1,12 @@
 import { PlainObject } from '../types';
+import type { ClassValue } from '../theme';
+/**
+ * 计算下发给子组件的className，处理对象类型的className，将其中的表达式计算出来，避免被classnames识别为true
+ *
+ * @param value - CSS类名值
+ * @param ctx - 数据域
+ */
+export declare function filterClassNameObject(classValue: ClassValue, ctx?: Record<string, any>): ClassValue;
 /**
  * 处理 Props 数据，所有带 On 结束的做一次
  *

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -16,6 +16,25 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var isPlainObject__default = /*#__PURE__*/_interopDefaultLegacy(isPlainObject);
 
+/**
+ * 计算下发给子组件的className，处理对象类型的className，将其中的表达式计算出来，避免被classnames识别为true
+ *
+ * @param value - CSS类名值
+ * @param ctx - 数据域
+ */
+function filterClassNameObject(classValue, ctx) {
+    if (ctx === void 0) { ctx = {}; }
+    var result = classValue;
+    if (classValue && typeof classValue === 'string') {
+        result = tokenize.tokenize(classValue, ctx);
+    }
+    else if (classValue && isPlainObject__default["default"](classValue)) {
+        result = helper.mapObject(classValue, function (value) {
+            return typeof value === 'string' ? tpl.evalExpression(value, ctx) : value;
+        }, undefined, function (key) { return tokenize.tokenize(key, ctx); });
+    }
+    return result;
+}
 /**
  * 处理 Props 数据，所有带 On 结束的做一次
  *
@@ -66,16 +85,12 @@ function getExprProperties(schema, data, blackList, props) {
             value &&
             (typeof value === 'string' || isPlainObject__default["default"](value))) {
             exprProps["".concat(key, "Raw")] = value;
-            exprProps[key] =
-                typeof value === 'string'
-                    ? tokenize.tokenize(value, data)
-                    : helper.mapObject(value, function (value) {
-                        return typeof value === 'string' ? tpl.evalExpression(value, data) : value;
-                    }, undefined, function (key) { return tokenize.tokenize(key, data); });
+            exprProps[key] = filterClassNameObject(value, data);
         }
     });
     return exprProps;
 }
 
 exports["default"] = getExprProperties;
+exports.filterClassNameObject = filterClassNameObject;
 exports.getExprProperties = getExprProperties;

package/lib/utils/filter.js

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

package/lib/utils/formatDuration.js

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

package/lib/utils/formula.js

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

package/lib/utils/getVariable.js

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

package/lib/utils/grammar.js

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

package/lib/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.3
+ * amis-core v3.5.0
  * Copyright 2018-2023 fex
  */
 
@@ -30,6 +30,7 @@ function handleAction(e, action, props, data) {
         action.actionType = 'ajax';
         var api$1 = api.normalizeApi(action.api);
         api$1.responseType = 'blob';
+        api$1.downloadFileName = action.downloadFileName;
         action.api = api$1;
     }
     onAction(e, action, data || props.data);