amis-core 3.4.0 → 3.4.1

package/lib/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -57,6 +57,7 @@ var Column = mobxStateTree.types
     rawIndex: 0,
     width: 0,
     minWidth: 0,
+    realWidth: 0,
     breakpoint: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     pristine: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
     remark: mobxStateTree.types.optional(mobxStateTree.types.frozen(), undefined),
@@ -80,11 +81,14 @@ var Column = mobxStateTree.types
         var table = mobxStateTree.getParent(self, 2);
         table.persistSaveToggledColumns();
     },
-    setWidth: function (value, minWidth) {
+    setMinWidth: function (value) {
+        self.minWidth = value;
+    },
+    setWidth: function (value) {
         self.width = value;
-        if (typeof minWidth === 'number') {
-            self.minWidth = minWidth;
-        }
+    },
+    setRealWidth: function (value) {
+        self.realWidth = value;
     }
 }); });
 var Row = mobxStateTree.types
@@ -98,12 +102,15 @@ 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; })), []),
-    depth: mobxStateTree.types.number // 当前children位于第几层，便于使用getParent获取最顶层TableStore
+    depth: mobxStateTree.types.number,
+    appeared: true,
+    lazyRender: false
 })
     .views(function (self) { return ({
     get checked() {
@@ -198,6 +205,11 @@ var Row = mobxStateTree.types
             return false;
         }
         return true;
+    },
+    get indentStyle() {
+        return {
+            paddingLeft: "calc(".concat(self.depth - 1, " * var(--Table-tree-indent))")
+        };
     }
 }); })
     .actions(function (self) { return ({
@@ -249,6 +261,9 @@ var Row = mobxStateTree.types
                 index++;
             }
         }
+    },
+    markAppeared: function (value) {
+        value && (self.appeared = !!value);
     }
 }); });
 var TableStore = iRenderer.iRendererStore
@@ -261,6 +276,8 @@ var TableStore = iRenderer.iRendererStore
     primaryField: 'id',
     orderBy: '',
     orderDir: mobxStateTree.types.optional(mobxStateTree.types.union(mobxStateTree.types.literal('asc'), mobxStateTree.types.literal('desc'), mobxStateTree.types.literal('')), 'asc'),
+    loading: false,
+    canAccessSuperData: false,
     draggable: false,
     dragging: false,
     selectable: false,
@@ -279,7 +296,9 @@ var TableStore = iRenderer.iRendererStore
     keepItemSelectionOnPageChange: false,
     // 导出 Excel 按钮的 loading 状态
     exportExcelLoading: false,
-    searchFormExpanded: false // 用来控制搜索框是否展开了，那个自动根据 searchable 生成的表单 autoGenerateFilter
+    searchFormExpanded: false,
+    lazyRenderAfter: 100,
+    tableLayout: 'auto'
 })
     .views(function (self) {
     function getColumnsExceptBuiltinTypes() {
@@ -315,7 +334,7 @@ var TableStore = iRenderer.iRendererStore
                     : item.type === '__dragme'
                         ? self.dragging
                         : item.type === '__expandme'
-                            ? (getFootableColumns().length || self.isNested) && !self.dragging
+                            ? getFootableColumns().length && !self.dragging
                             : (item.toggled || !item.toggable) &&
                                 (!self.footable ||
                                     !item.breakpoint ||
@@ -515,8 +534,11 @@ var TableStore = iRenderer.iRendererStore
         get unSelectedRows() {
             return getUnSelectedRows();
         },
+        get falttenedRows() {
+            return helper.flattenTree(self.rows);
+        },
         get checkableRows() {
-            return helper.flattenTree(self.rows).filter(function (item) { return item.checkable; });
+            return this.falttenedRows.filter(function (item) { return item.checkable; });
         },
         get expandableRows() {
             return self.rows.filter(function (item) { return item.expandable; });
@@ -569,7 +591,7 @@ var TableStore = iRenderer.iRendererStore
             return list;
         },
         get columnWidthReady() {
-            return getFilteredColumns().every(function (column) { return column.width; });
+            return getFilteredColumns().every(function (column) { return column.realWidth; });
         },
         getStickyStyles: function (column, columns) {
             var stickyClassName = '';
@@ -587,20 +609,24 @@ var TableStore = iRenderer.iRendererStore
                 })) {
                     stickyClassName += ' is-sticky-last-left';
                 }
-                var left = 0;
+                var left = [];
                 while (index >= 0) {
                     var col = columns[index];
                     if ((col && col.fixed === 'left') ||
                         autoFixLeftColumns.includes(col.type)) {
-                        left += col.width;
+                        left.push("var(--Table-column-".concat(col.index, "-width)"));
                     }
                     index--;
                 }
-                style.left = left;
+                style.left = left.length
+                    ? left.length === 1
+                        ? left[0]
+                        : "calc(".concat(left.join(' + '), ")")
+                    : 0;
             }
             else if (column.fixed === 'right') {
                 stickyClassName = 'is-sticky is-sticky-right';
-                var right = 0;
+                var right = [];
                 var index = columns.indexOf(column) + 1;
                 if (columns.slice(0, index - 1).every(function (col) { return col.fixed !== 'right'; })) {
                     stickyClassName += ' is-sticky-first-right';
@@ -609,13 +635,28 @@ var TableStore = iRenderer.iRendererStore
                 while (index < len) {
                     var col = columns[index];
                     if (col && col.fixed === 'right') {
-                        right += col.width;
+                        right.push("var(--Table-column-".concat(col.index, "-width)"));
                     }
                     index++;
                 }
-                style.right = right;
+                style.right = right.length
+                    ? right.length === 1
+                        ? right[0]
+                        : "calc(".concat(right.join(' + '), ")")
+                    : 0;
             }
             return [style, stickyClassName];
+        },
+        get items() {
+            return self.rows.concat();
+        },
+        buildStyles: function (style) {
+            style = tslib.__assign({}, style);
+            getFilteredColumns().forEach(function (column) {
+                style["--Table-column-".concat(column.index, "-width")] =
+                    column.realWidth + 'px';
+            });
+            return style;
         }
     };
 })
@@ -624,38 +665,54 @@ var TableStore = iRenderer.iRendererStore
     function setTable(ref) {
         tableRef = ref;
     }
+    function getTable() {
+        return tableRef;
+    }
     function update(config) {
-        config.primaryField !== void 0 &&
+        var _a;
+        config.primaryField !== undefined &&
             (self.primaryField = config.primaryField);
-        config.selectable !== void 0 && (self.selectable = config.selectable);
-        config.columnsTogglable !== void 0 &&
+        config.selectable !== undefined && (self.selectable = config.selectable);
+        config.columnsTogglable !== undefined &&
             (self.columnsTogglable = config.columnsTogglable);
-        config.draggable !== void 0 && (self.draggable = config.draggable);
-        if (typeof config.orderBy === 'string') {
-            setOrderByInfo(config.orderBy, config.orderDir === 'desc' ? 'desc' : 'asc');
+        config.draggable !== undefined && (self.draggable = config.draggable);
+        if (typeof config.orderBy === 'string' ||
+            typeof config.orderDir === 'string') {
+            setOrderByInfo((_a = config.orderBy) !== null && _a !== void 0 ? _a : self.orderBy, config.orderDir !== undefined
+                ? config.orderDir === 'desc'
+                    ? 'desc'
+                    : 'asc'
+                : self.orderDir);
         }
-        config.multiple !== void 0 && (self.multiple = config.multiple);
-        config.footable !== void 0 && (self.footable = config.footable);
-        config.expandConfig !== void 0 &&
+        config.multiple !== undefined && (self.multiple = config.multiple);
+        config.footable !== undefined && (self.footable = config.footable);
+        config.expandConfig !== undefined &&
             (self.expandConfig = config.expandConfig);
-        config.itemCheckableOn !== void 0 &&
+        config.itemCheckableOn !== undefined &&
             (self.itemCheckableOn = config.itemCheckableOn);
-        config.itemDraggableOn !== void 0 &&
+        config.itemDraggableOn !== undefined &&
             (self.itemDraggableOn = config.itemDraggableOn);
-        config.hideCheckToggler !== void 0 &&
+        config.hideCheckToggler !== undefined &&
             (self.hideCheckToggler = !!config.hideCheckToggler);
-        config.combineNum !== void 0 &&
+        config.combineNum !== undefined &&
             (self.combineNum = parseInt(config.combineNum, 10) || 0);
-        config.combineFromIndex !== void 0 &&
+        config.combineFromIndex !== undefined &&
             (self.combineFromIndex =
                 parseInt(config.combineFromIndex, 10) || 0);
-        config.maxKeepItemSelectionLength !== void 0 &&
+        config.maxKeepItemSelectionLength !== undefined &&
             (self.maxKeepItemSelectionLength = config.maxKeepItemSelectionLength);
-        config.keepItemSelectionOnPageChange !== void 0 &&
+        config.keepItemSelectionOnPageChange !== undefined &&
             (self.keepItemSelectionOnPageChange =
                 config.keepItemSelectionOnPageChange);
         config.exportExcelLoading !== undefined &&
             (self.exportExcelLoading = config.exportExcelLoading);
+        config.loading !== undefined && (self.loading = config.loading);
+        config.canAccessSuperData !== undefined &&
+            (self.canAccessSuperData = !!config.canAccessSuperData);
+        typeof config.lazyRenderAfter === 'number' &&
+            (self.lazyRenderAfter = config.lazyRenderAfter);
+        typeof config.tableLayout === 'string' &&
+            (self.tableLayout = config.tableLayout);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
                 .filter(function (column) { return column; })
@@ -718,22 +775,41 @@ var TableStore = iRenderer.iRendererStore
             self.columns.replace(columns);
         }
     }
-    function syncTableWidth() {
+    function initTableWidth() {
         var table = tableRef;
         if (!table) {
             return;
         }
         var tableWidth = table.parentElement.offsetWidth;
         var thead = table.querySelector(':scope>thead');
-        var tbody = table.querySelector(':scope>tbody');
+        var tbody = null;
+        var htmls = [];
+        var isFixed = self.tableLayout === 'fixed';
+        var someSettedWidth = self.columns.some(function (column) { return column.pristine.width; });
+        var minWidths = {};
+        // fixed 模式需要参考 auto 获得列最小宽度
+        if (isFixed) {
+            tbody = table.querySelector(':scope>tbody');
+            htmls.push("<table style=\"table-layout:auto!important;width:0!important;min-width:0!important;\" class=\"".concat(table.className, "\">").concat(thead.outerHTML, "</table>"));
+        }
+        if (someSettedWidth || isFixed) {
+            htmls.push("<table style=\"table-layout:auto!important;min-width:".concat(tableWidth, "px!important;width:").concat(tableWidth, "px!important;\" class=\"").concat(table.className.replace('is-layout-fixed', ''), "\">").concat(thead.outerHTML).concat(tbody ? "<tbody>".concat(tbody.innerHTML, "</tbody>") : '', "</table>"));
+        }
+        if (!htmls.length) {
+            return;
+        }
         var div = document.createElement('div');
         div.className = 'amis-scope'; // jssdk 里面 css 会在这一层
         div.style.cssText += "visibility: hidden!important;";
-        div.innerHTML =
-            "<table style=\"table-layout:auto!important;width:0!important;min-width:0!important;\" class=\"".concat(table.className, "\">").concat(thead.outerHTML, "</table>") +
-                "<table style=\"table-layout:auto!important;min-width:".concat(tableWidth, "px!important;width:").concat(tableWidth, "px!important;\" class=\"").concat(table.className.replace('is-layout-fixed', ''), "\">").concat(thead.outerHTML).concat(tbody ? "<tbody>".concat(tbody.innerHTML, "</tbody>") : '', "</table>");
-        var ths1 = [].slice.call(div.querySelectorAll(':scope>table:first-child>thead>tr>th[data-index]'));
-        var ths2 = [].slice.call(div.querySelectorAll(':scope>table:last-child>thead>tr>th[data-index]'));
+        div.innerHTML = htmls.join('');
+        var ths1 = [];
+        var ths2 = [];
+        if (isFixed) {
+            ths1 = [].slice.call(div.querySelectorAll(':scope>table:first-child>thead>tr>th[data-index]'));
+        }
+        if (someSettedWidth || isFixed) {
+            ths2 = [].slice.call(div.querySelectorAll(':scope>table:last-child>thead>tr>th[data-index]'));
+        }
         ths1.forEach(function (th) {
             th.style.cssText += 'width: 0';
         });
@@ -744,24 +820,38 @@ var TableStore = iRenderer.iRendererStore
                 ? "width: ".concat(column.pristine.width, "px;")
                 : column.pristine.width
                     ? "width: ".concat(column.pristine.width, ";")
-                    : '');
+                    : '' // todo 可能需要让修改过列宽的保持相应宽度，目前这样相当于重置了
+            );
         });
         document.body.appendChild(div);
-        var minWidths = {};
         ths1.forEach(function (th) {
-            minWidths[th.getAttribute('data-index')] = th.clientWidth;
+            var index = parseInt(th.getAttribute('data-index'), 10);
+            minWidths[index] = th.clientWidth;
+            var column = self.columns[index];
+            column.setMinWidth(minWidths[index]);
         });
         ths2.forEach(function (col) {
             var index = parseInt(col.getAttribute('data-index'), 10);
             var column = self.columns[index];
-            column.setWidth(Math.max(typeof column.pristine.width === 'number'
-                ? column.pristine.width
-                : col.clientWidth - 2, minWidths[index]), minWidths[index]);
+            if (column.pristine.width || isFixed) {
+                column.setWidth(Math.max(typeof column.pristine.width === 'number'
+                    ? column.pristine.width
+                    : col.clientWidth, minWidths[index] || 0));
+            }
         });
         document.body.removeChild(div);
     }
-    function invalidTableColumnWidth() {
-        self.columns.forEach(function (column) { return column.setWidth(0); });
+    function syncTableWidth() {
+        var table = tableRef;
+        if (!table) {
+            return;
+        }
+        var cols = [].slice.call(table.querySelectorAll(':scope>colgroup>col[data-index]'));
+        cols.forEach(function (col) {
+            var index = parseInt(col.getAttribute('data-index'), 10);
+            var column = self.columns[index];
+            column.setRealWidth(col.clientWidth);
+        });
     }
     function combineCell(arr, keys) {
         if (!keys.length || !arr.length) {
@@ -826,7 +916,7 @@ var TableStore = iRenderer.iRendererStore
         }
         return combineCell(arr, keys);
     }
-    function initChildren(children, depth, pindex, parentId, path) {
+    function initChildren(children, depth, pindex, parentId, path, nThRef) {
         if (path === void 0) { path = ''; }
         depth += 1;
         return children.map(function (item, index) {
@@ -845,12 +935,13 @@ var TableStore = iRenderer.iRendererStore
                 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, "."))
+                    ? 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))
@@ -862,6 +953,7 @@ var TableStore = iRenderer.iRendererStore
         // 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)) {
@@ -876,13 +968,14 @@ 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: {},
                 children: item && Array.isArray(item.children)
-                    ? initChildren(item.children, 1, index, id, "".concat(index, "."))
+                    ? initChildren(item.children, 1, index, id, "".concat(index, "."), nThRef)
                     : [],
                 expandable: !!((item && Array.isArray(item.children) && item.children.length) ||
                     (self.footable && self.footableColumns.length))
@@ -893,6 +986,14 @@ var TableStore = iRenderer.iRendererStore
         }
         replaceRow(arr, reUseRow);
         self.isNested = self.rows.some(function (item) { return item.children.length; });
+        // 前 20 个直接渲染，后面的按需渲染
+        if (self.lazyRenderAfter &&
+            self.falttenedRows.length > self.lazyRenderAfter) {
+            for (var i = self.lazyRenderAfter, len = self.falttenedRows.length; i < len; i++) {
+                self.falttenedRows[i].appeared = false;
+                self.falttenedRows[i].lazyRender = true;
+            }
+        }
         var expand = self.footable && self.footable.expand;
         if (expand === 'first' ||
             (self.expandConfig && self.expandConfig.expand === 'first')) {
@@ -1158,10 +1259,8 @@ var TableStore = iRenderer.iRendererStore
     function persistSaveToggledColumns() {
         var key = getPersistDataKey(self.columnsData);
         localStorage.setItem(key, JSON.stringify({
-            // 可显示列index, 原始配置中存在 toggled: false 的列不持久化
-            toggledColumnIndex: self.activeToggaleColumns
-                .filter(function (item) { var _a; return !(((_a = item.pristine) === null || _a === void 0 ? void 0 : _a.toggled) === false); })
-                .map(function (item) { return item.index; }),
+            // 可显示列index
+            toggledColumnIndex: self.activeToggaleColumns.map(function (item) { return item.index; }),
             // 列排序，name，label可能不存在
             columnOrder: self.columnsData.map(function (item) { return item.name || item.label || item.rawIndex; }),
             // 已激活的可查询列
@@ -1215,10 +1314,11 @@ var TableStore = iRenderer.iRendererStore
     }
     return {
         setTable: setTable,
+        getTable: getTable,
         update: update,
         updateColumns: updateColumns,
+        initTableWidth: initTableWidth,
         syncTableWidth: syncTableWidth,
-        invalidTableColumnWidth: invalidTableColumnWidth,
         initRows: initRows,
         updateSelected: updateSelected,
         toggleAll: toggleAll,

package/lib/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.4.0
+ * amis-core v3.4.1
  * Copyright 2018-2023 fex
  */
 
@@ -516,12 +516,13 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
                     }
                     if (!json.ok) {
                         self.updateMessage((_d = (_c = (_b = (_a = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : json.msg) !== null && _c !== void 0 ? _c : options.errorMessage) !== null && _d !== void 0 ? _d : self.__('saveFailed'), true);
-                        mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
-                            ? {
-                                closeButton: true,
-                                timeout: json.msgTimeout
-                            }
-                            : undefined);
+                        !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                            mobxStateTree.getEnv(self).notify('error', self.msg, json.msgTimeout !== undefined
+                                ? {
+                                    closeButton: true,
+                                    timeout: json.msgTimeout
+                                }
+                                : undefined);
                         throw new ServerError(self.msg);
                     }
                     else {
@@ -541,7 +542,9 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
                     if (!mobxStateTree.isAlive(self) || self.disposed) {
                         return [2 /*return*/];
                     }
-                    e_1.type !== 'ServerError' && mobxStateTree.getEnv(self).notify('error', e_1.message);
+                    !(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
+                        e_1.type !== 'ServerError' &&
+                        mobxStateTree.getEnv(self).notify('error', e_1.message);
                     throw e_1;
                 case 3: return [2 /*return*/];
             }

package/lib/theme.d.ts

@@ -1,11 +1,6 @@
 import React from 'react';
 import hoistNonReactStatic from 'hoist-non-react-statics';
-export type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | boolean;
-interface ClassDictionary {
-    [id: string]: any;
-}
-interface ClassArray extends Array<ClassValue> {
-}
+export type ClassValue = ClassValue[] | Record<string, any> | string | number | boolean | null | undefined;
 export type ClassNamesFn = (...classes: ClassValue[]) => string;
 interface ThemeConfig {
     classPrefix?: string;
@@ -15,70 +10,62 @@ interface ThemeConfig {
     components?: {
         [propName: string]: any;
     };
-    [propsName: string]: any;
+    [propName: string]: any;
 }
 export declare function theme(name: string, config: Partial<ThemeConfig>): void;
 export declare function makeClassnames(ns?: string): (...classes: ClassValue[]) => string;
-export type ThemeInstance = ThemeConfig & {
+export interface ThemeInstance extends ThemeConfig {
     getRendererConfig: (name?: string) => any;
     getComponentConfig: (name?: string) => any;
     classnames: ClassNamesFn;
-};
+}
 export declare function hasTheme(theme: string): boolean;
 export declare function setDefaultTheme(theme: string): void;
 export declare function classnames(...classes: ClassValue[]): any;
 export declare function getClassPrefix(): string | undefined;
 export declare function getTheme(theme: string): ThemeInstance;
 export interface ThemeProps {
-    className?: string;
-    style?: {
-        [propName: string]: any;
-    };
-    classPrefix: string;
     classnames: ClassNamesFn;
-    theme?: string;
-    mobileUI?: boolean;
-}
-export interface ThemeOutterProps {
-    theme?: string;
+    classPrefix: string;
     className?: string;
+    theme?: string;
     mobileUI?: boolean;
     style?: {
         [propName: string]: any;
     };
-    classPrefix?: string;
-    classnames?: ClassNamesFn;
+}
+export interface ThemeOuterProps extends Partial<ThemeProps> {
 }
 export declare let defaultTheme: string;
 export declare const ThemeContext: React.Context<string>;
 export declare function themeable<T extends React.ComponentType<React.ComponentProps<T> & ThemeProps> & {
     themeKey?: string;
 }>(ComposedComponent: T): {
-    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps): {
+    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps): {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>;
+        readonly props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        shouldComponentUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, keyof ThemeProps>> & ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;

package/lib/theme.js

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

package/lib/utils/Animation.js

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

package/lib/utils/ColorScale.js

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

package/lib/utils/DataSchema.js

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

package/lib/utils/DataScope.js

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

package/lib/utils/RootClose.js

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

package/lib/utils/SimpleMap.js

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

package/lib/utils/api.d.ts

@@ -1,5 +1,5 @@
 import { Api, ApiObject, EventTrack, fetcherResult, Payload } from '../types';
-import { fetcherConfig } from '../factory';
+import { FetcherConfig } from '../factory';
 interface ApiCacheConfig extends ApiObject {
     cachedPromise: Promise<any>;
     requestTime: number;
@@ -14,14 +14,14 @@ export declare function str2function(contents: string, ...args: Array<string>):
 export declare function str2AsyncFunction(contents: string, ...args: Array<string>): Function | null;
 export declare function callStrFunction(this: any, fn: string | Function, argNames: Array<string>, ...args: Array<any>): any;
 export declare function responseAdaptor(ret: fetcherResult, api: ApiObject): Payload;
-export declare function wrapFetcher(fn: (config: fetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
+export declare function wrapFetcher(fn: (config: FetcherConfig) => Promise<fetcherResult>, tracker?: (eventTrack: EventTrack, data: any) => void): any;
 export declare function wrapAdaptor(promise: Promise<fetcherResult>, api: ApiObject, context: any): Promise<Payload>;
 /**
  * 请求远程 js 文件然后 new Function 执行，用于 schemaApi 支持 JavaScript
  * @param api
  * @returns
  */
-export declare function jsFetcher(fetcher: (config: fetcherConfig) => Promise<fetcherResult>, api: ApiObject): Promise<fetcherResult>;
+export declare function jsFetcher(fetcher: (config: FetcherConfig) => Promise<fetcherResult>, api: ApiObject): Promise<fetcherResult>;
 export declare function jsonpFetcher(api: ApiObject): Promise<fetcherResult>;
 export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;