amis-core 6.14.0-beta.4 → 6.14.0-beta.5

package/esm/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -17,9 +17,9 @@ import { normalizeOptions } from '../utils/normalizeOptions.js';
 import { optionValueCompare } from '../utils/optionValueCompare.js';
 import '../utils/index.js';
 import { extendObject, createObject, setVariable } from '../utils/object.js';
+import { resolveEventData } from '../utils/renderer-event.js';
 import { isPureVariable } from '../utils/isPureVariable.js';
 import { resolveVariableAndFilter } from '../utils/resolveVariableAndFilter.js';
-import { resolveEventData } from '../utils/renderer-event.js';
 
 var detectProps = detectProps$1.concat([
     'value',
@@ -125,6 +125,30 @@ var OptionsControlBase = /** @class */ (function (_super) {
         }
         return false;
     };
+    OptionsControlBase.prototype.onLoadOptionsFinished = function () {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function () {
+            var _c, options, _d, selectedOptions, multiple, tmpValue, dispatchEvent_1;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (!((_b = (_a = this.input) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.dispatchEvent)) return [3 /*break*/, 2];
+                        _c = this.props.formItem || {}, options = _c.options, _d = _c.selectedOptions, selectedOptions = _d === void 0 ? [] : _d, multiple = _c.multiple, tmpValue = _c.tmpValue;
+                        dispatchEvent_1 = this.input.props.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent_1('loadOptionsFinished', resolveEventData(this.props, {
+                                options: options,
+                                items: options,
+                                value: tmpValue,
+                                selectedItems: multiple ? selectedOptions : selectedOptions[0]
+                            }))];
+                    case 1:
+                        _e.sent();
+                        _e.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
     OptionsControlBase.prototype.componentDidUpdate = function (prevProps) {
         var _this = this;
         var props = this.props;
@@ -149,8 +173,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
             else if (isEffectiveApi(props.source, props.data) &&
                 isApiOutdated(prevProps.source, props.source, prevProps.data, props.data)) {
                 formItem
-                    .loadOptions(props.source, props.data, undefined, true, this.changeOptionValue)
-                    .then(function () { return _this.normalizeValue(); });
+                    .loadOptions(props.source, props.data, undefined, true, this.changeOptionValue, undefined)
+                    .then(function () { return _this.normalizeValue(); })
+                    .then(function () { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, this.onLoadOptionsFinished()];
+                            case 1:
+                                _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); });
             }
         }
         if (prevProps.value !== props.value || (formItem === null || formItem === void 0 ? void 0 : formItem.expressionsInOptions)) {
@@ -383,6 +417,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
         return this.reloadOptions(false, false, data);
     };
     OptionsControlBase.prototype.reloadOptions = function (setError, isInit, data) {
+        var _this = this;
         if (isInit === void 0) { isInit = false; }
         if (data === void 0) { data = this.props.data; }
         var _a = this.props, source = _a.source, formItem = _a.formItem, onChange = _a.onChange, setPrinstineValue = _a.setPrinstineValue, valueField = _a.valueField;
@@ -395,7 +430,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
             return;
         }
         return isAlive(formItem)
-            ? formItem.loadOptions(source, data, undefined, false, isInit ? setPrinstineValue : onChange, setError)
+            ? formItem
+                .loadOptions(source, data, undefined, false, isInit ? setPrinstineValue : onChange, setError)
+                .then(function () { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.onLoadOptionsFinished()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            }); })
             : undefined;
     };
     OptionsControlBase.prototype.deferLoad = function (option) {
@@ -896,6 +942,12 @@ var OptionsControlBase = /** @class */ (function (_super) {
                 ? formItem.getSelectedOptions(value, enableNodePath ? nodeValueArray : undefined)
                 : [], nodePath: nodePathArray, loading: formItem ? formItem.loading : false, setLoading: this.setLoading, setOptions: this.setOptions, syncOptions: this.syncOptions, reloadOptions: this.reload, deferLoad: this.deferLoad, leftDeferLoad: this.leftDeferLoad, expandTreeOptions: this.expandTreeOptions, creatable: creatable !== false && isEffectiveApi(addApi) ? true : creatable, editable: editable || (editable !== false && isEffectiveApi(editApi)), removable: removable || (removable !== false && isEffectiveApi(deleteApi)), onAdd: this.handleOptionAdd, onEdit: this.handleOptionEdit, onDelete: this.handleOptionDelete })));
     };
+    __decorate([
+        autobind,
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Promise)
+    ], OptionsControlBase.prototype, "onLoadOptionsFinished", null);
     __decorate([
         autobind,
         __metadata("design:type", Function),

package/esm/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -43,6 +43,7 @@ import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
+import 'lodash/some';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/combo.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/crud.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/formItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/iRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -46,6 +46,7 @@ import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
+import 'lodash/some';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/list.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/manager.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/modal.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/node.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/pagination.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -43,6 +43,7 @@ import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
+import 'lodash/some';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/service.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -46,6 +46,7 @@ import 'lodash/cloneDeep';
 import 'lodash/map';
 import 'lodash/isEmpty';
 import 'lodash/kebabCase';
+import 'lodash/some';
 import 'uncontrollable';
 import 'hoist-non-react-statics';
 import '../utils/validations.js';

package/esm/store/status.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/table.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/store/table2.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/theme.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/Animation.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/ColorScale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/DataSchema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/DataScope.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/RootClose.js

@@ -1,10 +1,10 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
 import { __rest, __read } from 'tslib';
-import { useState } from 'react';
+import React, { useState } from 'react';
 import useRootClose from 'react-overlays/useRootClose';
 import { findDOMNode } from 'react-dom';
 
@@ -15,7 +15,17 @@ var RootClose = function (_a) {
     var children = _a.children, onRootClose = _a.onRootClose, props = __rest(_a, ["children", "onRootClose"]);
     var _b = __read(useState(null), 2), rootComponent = _b[0], attachRef = _b[1];
     var rootElement = findDOMNode(rootComponent);
-    useRootClose(rootElement, onRootClose, props);
+    var onClose = React.useCallback(function (e) {
+        var target = e.target;
+        var belongedModal = target.closest('[role=dialog]');
+        if (!target.isConnected || // 如果不在文档树中，忽略
+            (rootElement && belongedModal && !belongedModal.contains(rootElement)) // 如果点击的是 modal 里面的，但是 rootElement 不在 modal 里面，忽略
+        ) {
+            return;
+        }
+        onRootClose && onRootClose(e);
+    }, [rootComponent, onRootClose]);
+    useRootClose(rootElement, onClose, props);
     return typeof children === 'function' ? children(attachRef) : children;
 };
 

package/esm/utils/SimpleMap.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/animations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/browser.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/concatData.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -77,7 +77,7 @@ function calculatePosition(placement, overlayNode, target, container, padding, c
     var clip2 = overlayNode.getBoundingClientRect();
     var clip3 = scrollParent.getBoundingClientRect();
     var scaleX = overlayNode.offsetWidth
-        ? clip2.width / overlayNode.offsetWidth
+        ? Math.ceil(clip2.width) / overlayNode.offsetWidth
         : 1;
     var scaleY = overlayNode.offsetHeight
         ? clip2.height / overlayNode.offsetHeight

package/esm/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/formatDuration.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/formula.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/getPageId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/getVariable.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/grammar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/handleAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/helper.d.ts

@@ -23,9 +23,9 @@ export declare function injectPropsToObject(target: any, props: any): any;
 export declare function isSuperDataModified(data: any, prevData: any, store: IIRendererStore): boolean;
 export declare function syncDataFromSuper(data: any, superObject: any, prevSuperObject: any, store: IIRendererStore, force: boolean): any;
 /**
- * 生成 8 位随机数字。
+ * 生成 12 位随机数字。
  *
- * @return {string} 8位随机数字
+ * @return {string} 12位随机数字
  */
 export declare function guid(): string;
 export declare function findIndex(arr: Array<any>, detect: (item?: any, index?: number) => boolean): number;

package/esm/utils/helper.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 
@@ -113,9 +113,9 @@ function syncDataFromSuper(data, superObject, prevSuperObject, store, force) {
     return obj;
 }
 /**
- * 生成 8 位随机数字。
+ * 生成 12 位随机数字。
  *
- * @return {string} 8位随机数字
+ * @return {string} 12位随机数字
  */
 function guid() {
     function s4() {

package/esm/utils/highlight.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/icon.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */
 

package/esm/utils/image.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.4
+ * amis-core v6.14.0-beta.5
  * Copyright 2018-2025 fex
  */