amis-core 6.14.0-beta.1 → 6.14.0-beta.11

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.14.0-beta.1
+ * amis-core v6.14.0-beta.11
  * Copyright 2018-2025 fex
  */
 
@@ -21,9 +21,9 @@ var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
 require('../utils/index.js');
 var object = require('../utils/object.js');
+var rendererEvent = require('../utils/renderer-event.js');
 var isPureVariable = require('../utils/isPureVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
-var rendererEvent = require('../utils/renderer-event.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -56,9 +56,8 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
 var OptionsControlBase = /** @class */ (function (_super) {
     tslib.__extends(OptionsControlBase, _super);
     function OptionsControlBase(props, config) {
-        var _this = this;
         var _a;
-        _this = _super.call(this, props) || this;
+        var _this = _super.call(this, props) || this;
         _this.config = config;
         _this.toDispose = [];
         _this.mounted = false;
@@ -139,6 +138,30 @@ var OptionsControlBase = /** @class */ (function (_super) {
         }
         return false;
     };
+    OptionsControlBase.prototype.onLoadOptionsFinished = function () {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _a, options, _b, selectedOptions, multiple, tmpValue, dispatchEvent_1;
+            var _c, _d;
+            return tslib.__generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        if (!((_d = (_c = this.input) === null || _c === void 0 ? void 0 : _c.props) === null || _d === void 0 ? void 0 : _d.dispatchEvent)) return [3 /*break*/, 2];
+                        _a = this.props.formItem || {}, options = _a.options, _b = _a.selectedOptions, selectedOptions = _b === void 0 ? [] : _b, multiple = _a.multiple, tmpValue = _a.tmpValue;
+                        dispatchEvent_1 = this.input.props.dispatchEvent;
+                        return [4 /*yield*/, dispatchEvent_1('loadOptionsFinished', rendererEvent.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;
@@ -163,8 +186,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
             else if (api.isEffectiveApi(props.source, props.data) &&
                 api.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 tslib.__awaiter(_this, void 0, void 0, function () {
+                    return tslib.__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)) {
@@ -179,10 +212,10 @@ var OptionsControlBase = /** @class */ (function (_super) {
         this.toDispose = [];
     };
     // 不推荐使用，缺少组件值
-    OptionsControlBase.prototype.oldDispatchOptionEvent = function (eventName, eventData) {
-        if (eventData === void 0) { eventData = ''; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
+    OptionsControlBase.prototype.oldDispatchOptionEvent = function (eventName_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (eventName, eventData) {
             var _a, dispatchEvent, options, rendererEvent$1;
+            if (eventData === void 0) { eventData = ''; }
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -197,10 +230,10 @@ var OptionsControlBase = /** @class */ (function (_super) {
             });
         });
     };
-    OptionsControlBase.prototype.dispatchOptionEvent = function (eventName, eventData) {
-        if (eventData === void 0) { eventData = ''; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
+    OptionsControlBase.prototype.dispatchOptionEvent = function (eventName_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (eventName, eventData) {
             var _a, dispatchEvent, options, value, rendererEvent$1;
+            if (eventData === void 0) { eventData = ''; }
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -397,6 +430,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;
@@ -409,7 +443,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
             return;
         }
         return mobxStateTree.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 tslib.__awaiter(_this, void 0, void 0, function () {
+                return tslib.__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) {
@@ -456,15 +501,15 @@ var OptionsControlBase = /** @class */ (function (_super) {
         formItem === null || formItem === void 0 ? void 0 : formItem.expandTreeOptions(nodePathArr, api, object.createObject(data));
     };
     OptionsControlBase.prototype.initOptions = function (data) {
-        var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _b, formItem, name, multiple, defaultCheckAll;
+            var _a, formItem, name, multiple, defaultCheckAll;
+            var _b;
             return tslib.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4 /*yield*/, this.reloadOptions(false, true)];
                     case 1:
                         _c.sent();
-                        _b = this.props, formItem = _b.formItem, name = _b.name, multiple = _b.multiple, defaultCheckAll = _b.defaultCheckAll;
+                        _a = this.props, formItem = _a.formItem, name = _a.name, multiple = _a.multiple, defaultCheckAll = _a.defaultCheckAll;
                         if (!formItem) {
                             return [2 /*return*/];
                         }
@@ -472,7 +517,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                             object.setVariable(data, name, formItem.value);
                         }
                         // 默认全选
-                        if (multiple && defaultCheckAll && ((_a = formItem.filteredOptions) === null || _a === void 0 ? void 0 : _a.length)) {
+                        if (multiple && defaultCheckAll && ((_b = formItem.filteredOptions) === null || _b === void 0 ? void 0 : _b.length)) {
                             this.defaultCheckAll();
                         }
                         return [2 /*return*/];
@@ -508,18 +553,18 @@ var OptionsControlBase = /** @class */ (function (_super) {
         var formItem = this.props.formItem;
         formItem && formItem.setLoading(value);
     };
-    OptionsControlBase.prototype.handleOptionAdd = function (idx, value, skipForm, callback) {
-        var _a, _b;
-        if (idx === void 0) { idx = -1; }
-        if (skipForm === void 0) { skipForm = false; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _d, prevent, payload, e_1, isPrevented, ret, options;
-            var _e;
+    OptionsControlBase.prototype.handleOptionAdd = function () {
+        return tslib.__awaiter(this, arguments, void 0, function (idx, value, skipForm, callback) {
+            var _a, addControls, addDialog, disabled, labelField, onOpenDialog, optionLabel, addApi, source, data, valueField, deferField, model, createBtnLabel, env, __, parent, ctx, customAddPrevent, result, _b, prevent, payload, e_1, isPrevented, ret, options;
+            var _c;
             var _this = this;
+            var _d, _e;
+            if (idx === void 0) { idx = -1; }
+            if (skipForm === void 0) { skipForm = false; }
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
-                        _c = this.props, addControls = _c.addControls, addDialog = _c.addDialog, disabled = _c.disabled, labelField = _c.labelField, onOpenDialog = _c.onOpenDialog, optionLabel = _c.optionLabel, addApi = _c.addApi, source = _c.source, data = _c.data, valueField = _c.valueField, deferField = _c.deferField, model = _c.formItem, createBtnLabel = _c.createBtnLabel, env = _c.env, __ = _c.translate;
+                        _a = this.props, addControls = _a.addControls, addDialog = _a.addDialog, disabled = _a.disabled, labelField = _a.labelField, onOpenDialog = _a.onOpenDialog, optionLabel = _a.optionLabel, addApi = _a.addApi, source = _a.source, data = _a.data, valueField = _a.valueField, deferField = _a.deferField, model = _a.formItem, createBtnLabel = _a.createBtnLabel, env = _a.env, __ = _a.translate;
                         // 禁用或者没有配置 name
                         if (disabled || !model) {
                             return [2 /*return*/];
@@ -543,7 +588,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                             ? tslib.__assign({ parent: parent }, value) : value);
                         customAddPrevent = false;
                         if (!skipForm) return [3 /*break*/, 1];
-                        _d = ctx;
+                        _b = ctx;
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, onOpenDialog(tslib.__assign(tslib.__assign({ type: 'dialog', title: createBtnLabel || "\u65B0\u589E".concat(optionLabel || '选项') }, addDialog), { body: {
                                 type: 'form',
@@ -584,10 +629,10 @@ var OptionsControlBase = /** @class */ (function (_super) {
                                 }); }
                             } }), ctx)];
                     case 2:
-                        _d = _f.sent();
+                        _b = _f.sent();
                         _f.label = 3;
                     case 3:
-                        result = _d;
+                        result = _b;
                         if (!skipForm) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.dispatchOptionEvent('addConfirm', {
                                 item: result
@@ -615,7 +660,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         payload = _f.sent();
                         if (!payload.ok) {
                             !addApi.silent &&
-                                env.notify('error', (_b = (_a = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('Options.createFailed')));
+                                env.notify('error', (_e = (_d = addApi === null || addApi === void 0 ? void 0 : addApi.messages) === null || _d === void 0 ? void 0 : _d.failed) !== null && _e !== void 0 ? _e : (payload.msg || __('Options.createFailed')));
                             result = null;
                         }
                         else {
@@ -635,7 +680,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         }
                         // 没走服务端的。
                         if (!result.hasOwnProperty(valueField || 'value')) {
-                            result = tslib.__assign(tslib.__assign({}, result), (_e = {}, _e[valueField || 'value'] = result[labelField || 'label'], _e));
+                            result = tslib.__assign(tslib.__assign({}, result), (_c = {}, _c[valueField || 'value'] = result[labelField || 'label'], _c));
                         }
                         return [4 /*yield*/, this.oldDispatchOptionEvent('add', tslib.__assign(tslib.__assign({}, result), { idx: idx }))];
                     case 11:
@@ -682,17 +727,17 @@ var OptionsControlBase = /** @class */ (function (_super) {
             });
         });
     };
-    OptionsControlBase.prototype.handleOptionEdit = function (value, origin, skipForm, callback) {
-        var _a, _b;
-        if (origin === void 0) { origin = value; }
-        if (skipForm === void 0) { skipForm = false; }
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _d, prevent, payload, e_2, isPrevented, ret, indexes;
+    OptionsControlBase.prototype.handleOptionEdit = function (value_1) {
+        return tslib.__awaiter(this, arguments, void 0, function (value, origin, skipForm, callback) {
+            var _a, editControls, editDialog, disabled, labelField, valueField, onOpenDialog, editApi, editInitApi, env, source, data, model, optionLabel, __, customEditPrevent, result, _b, prevent, payload, e_2, isPrevented, ret, indexes;
             var _this = this;
+            var _c, _d;
+            if (origin === void 0) { origin = value; }
+            if (skipForm === void 0) { skipForm = false; }
             return tslib.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        _c = this.props, editControls = _c.editControls, editDialog = _c.editDialog, disabled = _c.disabled, labelField = _c.labelField, valueField = _c.valueField, onOpenDialog = _c.onOpenDialog, editApi = _c.editApi, editInitApi = _c.editInitApi, env = _c.env, source = _c.source, data = _c.data, model = _c.formItem, optionLabel = _c.optionLabel, __ = _c.translate;
+                        _a = this.props, editControls = _a.editControls, editDialog = _a.editDialog, disabled = _a.disabled, labelField = _a.labelField, valueField = _a.valueField, onOpenDialog = _a.onOpenDialog, editApi = _a.editApi, editInitApi = _a.editInitApi, env = _a.env, source = _a.source, data = _a.data, model = _a.formItem, optionLabel = _a.optionLabel, __ = _a.translate;
                         if (disabled || !model) {
                             return [2 /*return*/];
                         }
@@ -708,7 +753,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         }
                         customEditPrevent = false;
                         if (!skipForm) return [3 /*break*/, 1];
-                        _d = value;
+                        _b = value;
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, onOpenDialog(tslib.__assign(tslib.__assign({ type: 'dialog', title: __('Options.editLabel', {
                                 label: optionLabel || __('Options.label')
@@ -741,10 +786,10 @@ var OptionsControlBase = /** @class */ (function (_super) {
                                 }); }
                             } }), object.createObject(data, value))];
                     case 2:
-                        _d = _e.sent();
+                        _b = _e.sent();
                         _e.label = 3;
                     case 3:
-                        result = _d;
+                        result = _b;
                         if (!skipForm) return [3 /*break*/, 5];
                         return [4 /*yield*/, this.dispatchOptionEvent('editConfirm', {
                                 item: result
@@ -772,7 +817,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         payload = _e.sent();
                         if (!payload.ok) {
                             !editApi.silent &&
-                                env.notify('error', (_b = (_a = editApi === null || editApi === void 0 ? void 0 : editApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (payload.msg || __('saveFailed')));
+                                env.notify('error', (_d = (_c = editApi === null || editApi === void 0 ? void 0 : editApi.messages) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : (payload.msg || __('saveFailed')));
                             result = null;
                         }
                         else {
@@ -818,13 +863,13 @@ var OptionsControlBase = /** @class */ (function (_super) {
         });
     };
     OptionsControlBase.prototype.handleOptionDelete = function (value, callback) {
-        var _a, _b;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _d, isPrevented, delConfirmPrevent, result, ret, options, indexes, e_3;
+            var _a, deleteConfirmText, disabled, data, deleteApi, onDelete, env, model, source, valueField, __, ctx, confirmed, _b, isPrevented, delConfirmPrevent, result, ret, options, indexes, e_3;
+            var _c, _d;
             return tslib.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        _c = this.props, deleteConfirmText = _c.deleteConfirmText, disabled = _c.disabled, data = _c.data, deleteApi = _c.deleteApi, onDelete = _c.onDelete, env = _c.env, model = _c.formItem, source = _c.source, valueField = _c.valueField, __ = _c.translate;
+                        _a = this.props, deleteConfirmText = _a.deleteConfirmText, disabled = _a.disabled, data = _a.data, deleteApi = _a.deleteApi, onDelete = _a.onDelete, env = _a.env, model = _a.formItem, source = _a.source, valueField = _a.valueField, __ = _a.translate;
                         if (disabled || !model) {
                             return [2 /*return*/];
                         }
@@ -832,13 +877,13 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         if (!deleteConfirmText) return [3 /*break*/, 2];
                         return [4 /*yield*/, env.confirm(tpl.filter(__(deleteConfirmText), ctx))];
                     case 1:
-                        _d = _e.sent();
+                        _b = _e.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        _d = true;
+                        _b = true;
                         _e.label = 3;
                     case 3:
-                        confirmed = _d;
+                        confirmed = _b;
                         if (!confirmed) {
                             return [2 /*return*/];
                         }
@@ -867,7 +912,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
                         result = _e.sent();
                         if (!result.ok) {
                             !deleteApi.silent &&
-                                env.notify('error', (_b = (_a = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _a === void 0 ? void 0 : _a.failed) !== null && _b !== void 0 ? _b : (result.msg || __('deleteFailed')));
+                                env.notify('error', (_d = (_c = deleteApi === null || deleteApi === void 0 ? void 0 : deleteApi.messages) === null || _c === void 0 ? void 0 : _c.failed) !== null && _d !== void 0 ? _d : (result.msg || __('deleteFailed')));
                             return [2 /*return*/];
                         }
                         _e.label = 8;
@@ -910,6 +955,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 && api.isEffectiveApi(addApi) ? true : creatable, editable: editable || (editable !== false && api.isEffectiveApi(editApi)), removable: removable || (removable !== false && api.isEffectiveApi(deleteApi)), onAdd: this.handleOptionAdd, onEdit: this.handleOptionEdit, onDelete: this.handleOptionDelete })));
     };
+    tslib.__decorate([
+        helper.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", Promise)
+    ], OptionsControlBase.prototype, "onLoadOptionsFinished", null);
     tslib.__decorate([
         helper.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Placeholder.js

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

package/lib/renderers/builtin.js

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

package/lib/renderers/register.js

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