amis-core 6.11.0-beta.0 → 6.11.0-beta.2

package/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -17,7 +17,7 @@ import 'lodash/isPlainObject';
 import '../utils/filter.js';
 import isEqual from 'lodash/isEqual';
 import sortBy from 'lodash/sortBy';
-import { immutableExtends, flattenTree, findTree, eachTree, guid, isVisible, hasVisibleExpression, isBreakpoint, difference, sortArray } from '../utils/helper.js';
+import { immutableExtends, flattenTree, findTree, eachTree, findTreeIndex, guid, isVisible, hasVisibleExpression, isBreakpoint, difference, sortArray } from '../utils/helper.js';
 import { evalExpression } from '../utils/tpl.js';
 import { getStoreById } from './manager.js';
 
@@ -230,14 +230,9 @@ var Row = types
         }
         var table = getParent(self, self.depth * 2);
         var parent = getParent(self, 2);
-        return createObject(extendObject(getParent(self, self.depth * 2).data, {
-            index: self.index,
+        return createObject(extendObject(getParent(self, self.depth * 2).data, __assign({ index: self.index, path: self.path, 
             // todo 以后再支持多层，目前先一层
-            parent: parent.storeType === Row.name ? parent.data : undefined,
-            // 只有table时，也可以获取选中行
-            selectedItems: table.selectedRows.map(function (item) { return item.data; }),
-            unSelectedItems: table.unSelectedRows.map(function (item) { return item.data; })
-        }), children
+            parent: parent.storeType === Row.name ? parent.data : undefined }, table.eventContext)), children
             ? __assign(__assign({}, self.data), { children: children }) : self.data);
     },
     get checkable() {
@@ -287,8 +282,12 @@ var Row = types
         var table = self.table;
         var row = self;
         table.toggle(row, checked);
-        table.toggleAncestors(row);
-        table.toggleDescendants(row, checked);
+        // 多选才需要处理祖先和后代
+        // 单选只处理自己就行了
+        if (table.multiple) {
+            table.toggleAncestors(row);
+            table.toggleDescendants(row, checked);
+        }
     },
     toggleExpanded: function () {
         getParent(self, self.depth * 2).toggleExpanded(self);
@@ -297,8 +296,16 @@ var Row = types
         getParent(self, self.depth * 2).setExpanded(self, expanded);
     },
     change: function (values, savePristine) {
-        self.data = immutableExtends(self.data, values);
-        savePristine && (self.pristine = self.data);
+        var data = immutableExtends(self.data, values);
+        Object.isExtensible(data) &&
+            Object.defineProperty(data, '__pristine', {
+                value: savePristine ? data : self.pristine,
+                enumerable: false,
+                configurable: false,
+                writable: false
+            });
+        self.data = data;
+        savePristine && (self.pristine = data);
     },
     reset: function () {
         self.newIndex = self.index;
@@ -360,9 +367,17 @@ var Row = types
     },
     updateData: function (_a) {
         var children = _a.children, rest = __rest(_a, ["children"]);
-        self.data = __assign(__assign({}, self.data), rest);
+        var data = __assign(__assign({}, self.data), rest);
+        Object.isExtensible(data) &&
+            Object.defineProperty(data, '__pristine', {
+                value: self.data.__pristine || self.pristine,
+                enumerable: false,
+                configurable: false,
+                writable: false
+            });
+        self.data = data;
         if (Array.isArray(children)) {
-            this.replaceChildren(initChildren(children, self.depth, self.index, self.id, self.path));
+            this.replaceChildren(initChildren(children, self.depth, self.index, self.id, "".concat(self.path, ".")));
         }
     }
 }); });
@@ -371,6 +386,11 @@ var TableStore = iRendererStore
     .props({
     columns: types.array(Column),
     rows: types.array(Row),
+    // 记录原始列表和原始选中的列表
+    // 因为如果是前端分页，上层 crud 或者 input-table 下发到这层的
+    // 是某个页区间的数据，这个时候 items 和 selectedItems 会少很多条
+    fullItems: types.optional(types.array(types.frozen()), []),
+    fullSelectedItems: types.optional(types.array(types.frozen()), []),
     selectedRows: types.array(types.reference(Row)),
     expandedRows: types.array(types.string),
     primaryField: 'id',
@@ -381,6 +401,7 @@ var TableStore = iRendererStore
     draggable: false,
     dragging: false,
     selectable: false,
+    showIndex: false,
     multiple: true,
     footable: types.frozen(),
     expandConfig: types.frozen(),
@@ -504,13 +525,6 @@ var TableStore = iRendererStore
     function getUnSelectedRows() {
         return flattenTree(self.rows).filter(function (item) { return !item.checked; });
     }
-    function getData(superData) {
-        return createObject(superData, {
-            items: self.rows.map(function (item) { return item.data; }),
-            selectedItems: self.selectedRows.map(function (item) { return item.data; }),
-            unSelectedItems: getUnSelectedRows().map(function (item) { return item.data; })
-        });
-    }
     function hasColumnHidden() {
         return self.columns.findIndex(function (column) { return !column.toggled; }) !== -1;
     }
@@ -684,7 +698,9 @@ var TableStore = iRendererStore
         get firstToggledColumnIndex() {
             return getFirstToggledColumnIndex();
         },
-        getData: getData,
+        getData: function (superData) {
+            return createObject(superData, this.eventContext);
+        },
         get columnGroup() {
             return getColumnGroup();
         },
@@ -777,6 +793,37 @@ var TableStore = iRendererStore
                     column.realWidth + 'px';
             });
             return style;
+        },
+        /**
+         * 构建事件的上下文数据
+         * @param buildChain
+         * @returns
+         */
+        get eventContext() {
+            var context = {
+                selectedItems: self.selectedRows.map(function (item) { return item.data; }),
+                selectedIndexes: self.selectedRows.map(function (item) { return item.path; }),
+                items: self.rows.map(function (item) { return item.data; }),
+                unSelectedItems: this.unSelectedRows.map(function (item) { return item.data; })
+            };
+            // 如果是前端分页情况，需要根据全量数据计算
+            // 如果不是前端分页，数据都没有返回，那种就没办法支持全量数据信息了
+            if (self.fullItems.length > self.rows.length) {
+                // todo 这里的选择顺序会一直变，这个有影响吗?
+                var selectedItems_1 = self.fullSelectedItems
+                    .filter(function (item) {
+                    return !self.rows.find(function (row) { return row.pristine === (item.__pristine || item); });
+                })
+                    .concat(context.selectedItems);
+                context.selectedItems = selectedItems_1;
+                context.items = self.fullItems.concat();
+                context.unSelectedItems = self.fullItems.filter(function (item) { return !selectedItems_1.includes(item); });
+                context.selectedIndexes = selectedItems_1.map(function (item) {
+                    var _a;
+                    return ((_a = findTreeIndex(self.fullItems, function (i) { return (item.__pristine || item) === (i.__pristine || i); })) === null || _a === void 0 ? void 0 : _a.join('.')) || '-1';
+                });
+            }
+            return context;
         }
     };
 })
@@ -835,6 +882,7 @@ var TableStore = iRendererStore
             (self.lazyRenderAfter = config.lazyRenderAfter);
         typeof config.tableLayout === 'string' &&
             (self.tableLayout = config.tableLayout);
+        config.showIndex !== undefined && (self.showIndex = config.showIndex);
         if (config.columns && Array.isArray(config.columns)) {
             var columns = config.columns
                 .map(function (column) {
@@ -876,6 +924,12 @@ var TableStore = iRendererStore
                     label: '空'
                 });
             }
+            if (self.showIndex) {
+                columns.unshift({
+                    type: '__index',
+                    width: 50
+                });
+            }
             columns.unshift({
                 type: '__expandme',
                 toggable: false,
@@ -1052,7 +1106,7 @@ var TableStore = iRendererStore
         }
         return combineCell(arr, keys);
     }
-    function initRows(rows, getEntryId, reUseRow) {
+    function initRows(rows, getEntryId, reUseRow, fullItems, fullSelectedItems) {
         self.selectedRows.clear();
         // self.expandedRows.clear();
         /* 避免输入内容为非数组挂掉 */
@@ -1072,7 +1126,7 @@ var TableStore = iRendererStore
                 depth: 1,
                 index: index,
                 newIndex: index,
-                pristine: item,
+                pristine: item.__pristine || item,
                 path: "".concat(index),
                 data: item,
                 rowSpans: {},
@@ -1111,6 +1165,9 @@ var TableStore = iRendererStore
             }
         }
         self.dragging = false;
+        Array.isArray(fullItems) && self.fullItems.replace(fullItems);
+        Array.isArray(fullSelectedItems) &&
+            self.fullSelectedItems.replace(fullSelectedItems);
     }
     // 获取所有层级的子节点id
     function getExpandAllRows(arr) {
@@ -1306,7 +1363,7 @@ var TableStore = iRendererStore
             return;
         }
         var maxLength = self.getSelectionUpperLimit();
-        var selectedItems = self.data.selectedItems;
+        var selectedItems = self.selectedRows.map(function (item) { return item.data; });
         self.selectedRows.map(function (item) { return item.setCheckdisable(false); });
         if (maxLength !== Infinity && maxLength <= selectedItems.length) {
             self.unSelectedRows.map(function (item) { return !item.checked && item.setCheckdisable(true); });

package/esm/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/theme.d.ts

@@ -67,7 +67,7 @@ export declare function themeable<T extends React.ComponentType<React.ComponentP
         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: any;
+    displayName: string;
     contextType: React.Context<string>;
     ComposedComponent: React.ComponentType<T>;
 } & hoistNonReactStatic.NonReactStatics<T, {}> & {

package/esm/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/types.d.ts

@@ -2,7 +2,7 @@
 import type { JSONSchema7 } from 'json-schema';
 import { ListenerAction } from './actions/Action';
 import { debounceConfig, trackConfig } from './utils/renderer-event';
-import type { TestIdBuilder } from './utils/helper';
+import type { TestIdBuilder, ValidateError } from './utils/helper';
 import { AnimationsProps } from './utils/animations';
 export interface Option {
     /**
@@ -281,7 +281,7 @@ export interface Definitions {
     [propName: string]: SchemaNode;
 }
 export interface ActionObject extends ButtonObject {
-    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'initDrag' | 'cancelDrag' | 'toggleExpanded' | 'setExpanded';
+    actionType?: 'submit' | 'copy' | 'reload' | 'ajax' | 'saveAs' | 'dialog' | 'drawer' | 'confirmDialog' | 'jump' | 'link' | 'url' | 'email' | 'close' | 'confirm' | 'add' | 'remove' | 'delete' | 'edit' | 'cancel' | 'next' | 'prev' | 'reset' | 'validate' | 'reset-and-submit' | 'clear' | 'clear-and-submit' | 'toast' | 'goto-step' | 'goto-image' | 'expand' | 'collapse' | 'step-submit' | 'select' | 'selectAll' | 'clearAll' | 'changeTabKey' | 'clearSearch' | 'submitQuickEdit' | 'initDrag' | 'cancelDrag' | 'toggleExpanded' | 'setExpanded' | 'clearError';
     api?: BaseApiObject | string;
     asyncApi?: BaseApiObject | string;
     payload?: any;
@@ -390,6 +390,7 @@ export type ToastConf = {
     className?: string;
     items?: Array<any>;
     useMobileUI?: boolean;
+    validateError?: ValidateError;
 };
 export interface OptionProps {
     className?: string;

package/esm/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/RootClose.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/animations.d.ts

@@ -3,6 +3,8 @@ export interface AnimationsProps {
         type: string;
         duration?: number;
         delay?: number;
+        repeat?: boolean;
+        inView?: boolean;
     };
     attention?: {
         type: string;
@@ -14,6 +16,8 @@ export interface AnimationsProps {
         type: string;
         duration?: number;
         delay?: number;
+        repeat?: boolean;
+        outView?: boolean;
     };
 }
 export declare function createAnimationStyle(id: string, animationsConfig: AnimationsProps): void;

package/esm/utils/animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/api.d.ts

@@ -48,6 +48,7 @@ export declare function isApiOutdatedWithData(prevApi: Api | undefined, nextApi:
 export declare function isApiOutdated(prevApi: Api | undefined, nextApi: Api | undefined, prevData: any, nextData: any): nextApi is Api;
 export declare function isValidApi(api: string): boolean;
 export declare function isEffectiveApi(api?: Api, data?: any, initFetch?: boolean, initFetchOn?: string): api is Api;
+export declare function shouldBlockedBySendOnApi(api?: Api, data?: any): boolean;
 export declare function isSameApi(apiA: ApiObject | ApiCacheConfig, apiB: ApiObject | ApiCacheConfig): boolean;
 export declare function getApiCache(api: ApiObject): ApiCacheConfig | undefined;
 export declare function setApiCache(api: ApiObject, promise: Promise<any>): Promise<any>;

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -158,9 +158,13 @@ function buildApi(api, data, options) {
         }
         return apiObject;
     };
+    var queryMapped = false;
     if (~idx) {
         var hashIdx = url.indexOf('#');
         var params = qsparse(url.substring(idx + 1, ~hashIdx && hashIdx > idx ? hashIdx : undefined));
+        // 合并 api.query 的配置
+        params = dataMapping(Object.assign(params, api.query), data, undefined, api.convertKeyToPath);
+        queryMapped = true;
         // 将里面的表达式运算完
         JSONTraverse(params, function (value, key, host) {
             var _a;
@@ -172,13 +176,12 @@ function buildApi(api, data, options) {
                 host[key] = replaceExpression(host[key], 'raw', '');
             }
         });
+        api.query = params;
         var left = replaceExpression(url.substring(0, idx), 'raw', '');
-        // 追加
-        Object.assign(params, api.query);
         api.url =
             left +
                 (~left.indexOf('?') ? '&' : '?') +
-                queryStringify((api.query = dataMapping(params, data, undefined, api.convertKeyToPath))) +
+                queryStringify(api.query) +
                 (~hashIdx && hashIdx > idx
                     ? replaceExpression(url.substring(hashIdx))
                     : '');
@@ -199,7 +202,7 @@ function buildApi(api, data, options) {
         api.body = api.data = data;
     }
     // 给 query 做数据映射
-    if (api.query) {
+    if (api.query && !queryMapped) {
         api.query = dataMapping(api.query, data, undefined, api.convertKeyToPath);
     }
     // get 类请求，把 data 附带到 url 上。
@@ -767,6 +770,15 @@ function isEffectiveApi(api, data, initFetch, initFetchOn) {
     }
     return false;
 }
+// 判断api是否存在，且SendOn为不发送
+function shouldBlockedBySendOnApi(api, data) {
+    if (isObject(api) && api.url) {
+        if (api.sendOn && data) {
+            return !evalExpression(api.sendOn, data);
+        }
+    }
+    return false;
+}
 function isSameApi(apiA, apiB) {
     return (apiA.method === apiB.method &&
         apiA.url === apiB.url &&
@@ -812,4 +824,4 @@ function normalizeApiResponseData(data) {
 }
 // window.apiCaches = apiCaches;
 
-export { addApiRequestAdaptor, addApiResponseAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher };
+export { addApiRequestAdaptor, addApiResponseAdaptor, addApiResponseAdator, buildApi, callStrFunction, clearApiCache, getApiCache, isApiOutdated, isApiOutdatedWithData, isEffectiveApi, isSameApi, isValidApi, jsFetcher, jsonpFetcher, normalizeApi, normalizeApiResponseData, removeApiRequestAdaptor, removeApiResponseAdaptor, responseAdaptor, setApiCache, shouldBlockedBySendOnApi, str2AsyncFunction, str2function, wrapAdaptor, wrapFetcher };

package/esm/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/helper.d.ts

@@ -293,8 +293,13 @@ export declare class ValidateError extends Error {
     detail: {
         [propName: string]: Array<string> | string;
     };
+    rawError?: {
+        [propName: string]: any;
+    };
     constructor(message: string, error: {
         [propName: string]: Array<string> | string;
+    }, rawError?: {
+        [propName: string]: any;
     });
 }
 /**

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 
@@ -1218,11 +1218,12 @@ var SkipOperation = /** @class */ (function (_super) {
 }(Error));
 var ValidateError = /** @class */ (function (_super) {
     __extends(ValidateError, _super);
-    function ValidateError(message, error) {
+    function ValidateError(message, error, rawError) {
         var _this = _super.call(this) || this;
         _this.name = 'ValidateError';
         _this.message = message;
         _this.detail = error;
+        _this.rawError = rawError;
         return _this;
     }
     return ValidateError;
@@ -1731,6 +1732,9 @@ function supportsMjs() {
     }
 }
 function formateId(id) {
+    if (!id) {
+        return guid();
+    }
     // 将className非法字符替换为短横线
     id = id.replace(/[^a-zA-Z0-9-]/g, '-');
     // 将连续的-替换为单个-

package/esm/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */
 

package/esm/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0-beta.0
+ * amis-core v6.11.0-beta.2
  * Copyright 2018-2024 fex
  */