amis-core 6.11.0 → 6.12.0-ab.2

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -57,6 +57,7 @@ function CustomStyle (props) {
             styleHelper.insertEditCustomStyle({
                 customStyle: wrapperCustomStyle,
                 id: id,
+                customStyleClassPrefix: env === null || env === void 0 ? void 0 : env.customStyleClassPrefix,
                 doc: (_b = (_a = env === null || env === void 0 ? void 0 : env.getModalContainer) === null || _a === void 0 ? void 0 : _a.call(env)) === null || _b === void 0 ? void 0 : _b.ownerDocument,
                 data: data
             });

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -13,6 +13,7 @@ var cx = require('classnames');
 var ReactDOM = require('react-dom');
 var React = require('react');
 require('../utils/api.js');
+require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -12,6 +12,7 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var theme = require('../theme.js');
 require('../utils/api.js');
+require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/envOverwrite.d.ts

@@ -1,4 +1,4 @@
 /**
  * @file 用于在移动端或不同语言环境下使用不同配置
  */
-export declare const envOverwrite: (schema: any, locale?: string) => any;
+export declare const envOverwrite: (schema: any, locale?: string, device?: string) => any;

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -22,7 +22,8 @@ var isMobile = ((_b = (_a = window).matchMedia) === null || _b === void 0 ? void
     ? true
     : false;
 // 这里不能用 addSchemaFilter 是因为还需要更深层的替换，比如 select 里的 options
-var envOverwrite = function (schema, locale) {
+var envOverwrite = function (schema, locale, device) {
+    var isMobileDevice = device === 'mobile' || isMobile;
     return helper.JSONValueMap(schema, function (value) {
         if (!isPlainObject__default["default"](value)) {
             return value;
@@ -32,7 +33,7 @@ var envOverwrite = function (schema, locale) {
             delete newValue[locale];
             return newValue;
         }
-        else if (isMobile && value.mobile) {
+        else if (isMobileDevice && value.mobile) {
             var newValue = Object.assign({}, value, value.mobile);
             delete newValue.mobile;
             return newValue;

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/globalVar.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/globalVarClientHandler.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/globalVarDefaultValueHandler.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -145,10 +145,10 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.11.0';
+var version = '6.12.0-ab.2';
 window.amisVersionInfo = {
-    version: '6.11.0',
-    buildTime: '2025-02-07T11:08:34.811Z'
+    version: '6.12.0-ab.2',
+    buildTime: '2025-09-04T09:40:07.945Z'
 };
 function render(schema, _a, options, pathPrefix) {
     if (_a === void 0) { _a = {}; }
@@ -210,7 +210,7 @@ function AMISRenderer(_a) {
     }
     // 根据环境覆盖 schema，这个要在最前面做，不然就无法覆盖 validations
     schema = React__default["default"].useMemo(function () {
-        schema = envOverwrite.envOverwrite(schema, locale$1);
+        schema = envOverwrite.envOverwrite(schema, locale$1, env$1.isMobile() ? 'mobile' : 'pc');
         // todo 和 envOverwrite 一起处理，减少循环次数
         schema = replaceText.replaceText(schema, options.replaceText, env$1.replaceTextIgnoreKeys);
         return schema;
@@ -285,6 +285,7 @@ exports.disableDebug = debug.disableDebug;
 exports.enableDebug = debug.enableDebug;
 exports.traceProps = debug.traceProps;
 exports.warning = debug.warning;
+exports.calculateHeight = dom.calculateHeight;
 exports.calculatePosition = dom.calculatePosition;
 exports.getContainer = dom.getContainer;
 exports.getStyleNumber = dom.getStyleNumber;
@@ -364,6 +365,7 @@ exports.isClickOnInput = helper.isClickOnInput;
 exports.isDisabled = helper.isDisabled;
 exports.isEmpty = helper.isEmpty;
 exports.isMobile = helper.isMobile;
+exports.isMobileDevice = helper.isMobileDevice;
 exports.isNumeric = helper.isNumeric;
 exports.isObjectShallowModified = helper.isObjectShallowModified;
 exports.isSuperDataModified = helper.isSuperDataModified;
@@ -537,6 +539,10 @@ Object.defineProperty(exports, 'LoopStatus', {
 });
 exports.getActionByType = Action.getActionByType;
 exports.registerAction = Action.registerAction;
+exports.registerActionMappingIgnoreKey = Action.registerActionMappingIgnoreKey;
+exports.registerActionMappingIgnoreMap = Action.registerActionMappingIgnoreMap;
+exports.registerComponentActionMappingIgnoreKey = Action.registerComponentActionMappingIgnoreKey;
+exports.registerComponentActionMappingIgnoreMap = Action.registerComponentActionMappingIgnoreMap;
 exports.runAction = Action.runAction;
 exports.runActions = Action.runActions;
 exports.FormItem = Item.FormItem;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -63,7 +63,9 @@ function removeLocaleData(name, key) {
 }
 var fns = {};
 function format(str, data) {
-    return str.replace(/(\\)?\{\{([\s\S]+?)\}\}/g, function (_, escape, key) {
+    if (!str.includes('{{'))
+        return str; // 先快速检查，避免无谓的正则执行
+    return str.replace(/(\\)?\{\{([^{}]+?)\}\}/g, function (_, escape, key) {
         if (escape) {
             return _.substring(1);
         }

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -1083,8 +1083,9 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
         });
     };
     Form.prototype.buildActions = function () {
-        var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig;
-        if (typeof actions !== 'undefined' ||
+        var _a = this.props, actions = _a.actions, submitText = _a.submitText, body = _a.body, __ = _a.translate, loadingConfig = _a.loadingConfig, wrapWithPanel = _a.wrapWithPanel;
+        if (wrapWithPanel === false ||
+            typeof actions !== 'undefined' ||
             !submitText ||
             (Array.isArray(body) &&
                 body.some(function (item) {

package/lib/renderers/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/Options.d.ts

@@ -134,7 +134,7 @@ export interface OptionsControlProps extends FormControlProps, Omit<FormOptionsC
     selectedOptions: Array<Option>;
     setOptions: (value: Array<any>, skipNormalize?: boolean) => void;
     setLoading: (value: boolean) => void;
-    reloadOptions: (setError?: boolean, isInit?: boolean, data?: Record<string, any>) => void;
+    reloadOptions: (subpath?: string, query?: any) => void;
     deferLoad: (option: Option) => void;
     leftDeferLoad: (option: Option, leftOptions: Option) => void;
     expandTreeOptions: (nodePathArr: any[]) => void;
@@ -185,7 +185,7 @@ export declare class OptionsControlBase<T extends OptionsProps = OptionsProps, S
     formatValueArray(valueArray: Array<Option>): string | Option | Option[];
     handleToggleAll(): Promise<void>;
     toggleValue(option: Option, originValue?: any): string | Option | Option[];
-    reload(): Promise<import("../types").Payload | null> | undefined;
+    reload(subpath?: string, query?: any): Promise<import("../types").Payload | null> | undefined;
     reloadOptions(setError?: boolean, isInit?: boolean, data?: T["data"]): Promise<import("../types").Payload | null> | undefined;
     deferLoad(option: Option): Promise<void>;
     leftDeferLoad(option: Option, leftOptions: Option): void;

package/lib/renderers/Options.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -20,10 +20,10 @@ var findIndex = require('lodash/findIndex');
 var normalizeOptions = require('../utils/normalizeOptions.js');
 var optionValueCompare = require('../utils/optionValueCompare.js');
 require('../utils/index.js');
+var object = require('../utils/object.js');
 var isPureVariable = require('../utils/isPureVariable.js');
 var resolveVariableAndFilter = require('../utils/resolveVariableAndFilter.js');
 var rendererEvent = require('../utils/renderer-event.js');
-var object = require('../utils/object.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -387,8 +387,14 @@ var OptionsControlBase = /** @class */ (function (_super) {
         return newValue;
     };
     // 当有 action 触发，如果指定了 reload 目标组件，有可能会来到这里面来
-    OptionsControlBase.prototype.reload = function () {
-        return this.reloadOptions();
+    OptionsControlBase.prototype.reload = function (subpath, query) {
+        var _a, _b;
+        var data = this.props.data;
+        if (query) {
+            (_b = (_a = this.props).onBulkChange) === null || _b === void 0 ? void 0 : _b.call(_a, query);
+            data = object.extendObject(data, query);
+        }
+        return this.reloadOptions(false, false, data);
     };
     OptionsControlBase.prototype.reloadOptions = function (setError, isInit, data) {
         if (isInit === void 0) { isInit = false; }
@@ -925,7 +931,7 @@ var OptionsControlBase = /** @class */ (function (_super) {
     tslib.__decorate([
         helper.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:paramtypes", [String, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], OptionsControlBase.prototype, "reload", null);
     tslib.__decorate([

package/lib/renderers/Placeholder.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/builtin.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/register.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 

package/lib/renderers/wrapControl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -13,6 +13,7 @@ var debounce = require('lodash/debounce');
 var isEqual = require('lodash/isEqual');
 var combo = require('../store/combo.js');
 var helper = require('../utils/helper.js');
+var validations = require('../utils/validations.js');
 var formula = require('../utils/formula.js');
 var Scoped = require('../Scoped.js');
 var formItem = require('../store/formItem.js');
@@ -53,7 +54,7 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     trailing: true,
                     leading: false
                 });
-                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
+                var _c = _this.props, form = _c.formStore, formItem$1 = _c.formItem, rootStore = _c.rootStore, store = _c.store, onChange = _c.onChange, data = _c.data, inputGroupControl = _c.inputGroupControl, colIndex = _c.colIndex, rowIndex = _c.rowIndex, _d = _c.$schema, id = _d.id, type = _d.type, required = _d.required, validations$1 = _d.validations, validationErrors = _d.validationErrors, unique = _d.unique, value = _d.value, extraName = _d.extraName, multiple = _d.multiple, delimiter = _d.delimiter, valueField = _d.valueField, labelField = _d.labelField, joinValues = _d.joinValues, extractValue = _d.extractValue, selectFirst = _d.selectFirst, autoFill = _d.autoFill, clearValueOnHidden = _d.clearValueOnHidden, validateApi = _d.validateApi, minLength = _d.minLength, maxLength = _d.maxLength, validateOnChange = _d.validateOnChange, label = _d.label, pagination = _d.pagination;
                 _this.getValue = _this.getValue.bind(_this);
                 _this.setValue = _this.setValue.bind(_this);
                 _this.handleChange = _this.handleChange.bind(_this);
@@ -84,9 +85,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                     rowIndex: rowIndex !== undefined ? rowIndex : undefined
                 });
                 _this.model = model;
+                // 如果组件有默认验证器类型，则合并
+                var rules = validations$1 && model && config.validations
+                    ? tslib.__assign(tslib.__assign({}, validations$1), validations.str2rules(config.validations)) : validations$1;
                 // @issue 打算干掉这个
                 formItem$1 === null || formItem$1 === void 0 ? void 0 : formItem$1.addSubFormItem(model);
-                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value), rules: validations, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
+                model.config(tslib.__assign(tslib.__assign({}, pick__default["default"](tslib.__assign(tslib.__assign({}, ComposedComponent.defaultProps), _this.props.$schema), ['multiple'])), { id: id, type: type, required: props.required || required, unique: unique, value: value, isValueSchemaExp: formula.isExpression(value) &&
+                        value.replace(/\s/g, '') !== "${".concat(name, "}"), rules: rules, messages: validationErrors, delimiter: delimiter, valueField: valueField, labelField: labelField, joinValues: joinValues, extractValue: extractValue, selectFirst: selectFirst, autoFill: autoFill, clearValueOnHidden: clearValueOnHidden, validateApi: validateApi, minLength: minLength, maxLength: maxLength, validateOnChange: validateOnChange, label: label, inputGroupControl: inputGroupControl, extraName: extraName, pagination: pagination }));
                 // issue 这个逻辑应该在 combo 里面自己实现。
                 if (_this.model.unique &&
                     ((_b = form === null || form === void 0 ? void 0 : form.parentStore) === null || _b === void 0 ? void 0 : _b.storeType) === combo.ComboStore.name) {
@@ -189,7 +194,9 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 ], prevProps.$schema, props.$schema, function (changes) {
                     model.config(tslib.__assign(tslib.__assign({}, changes), { 
                         // todo 优化后面两个
-                        isValueSchemaExp: formula.isExpression(props.$schema.value), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
+                        isValueSchemaExp: formula.isExpression(props.$schema.value) &&
+                            props.$schema.value.replace(/\s/g, '') !==
+                                "${".concat(props.$schema.name, "}"), inputGroupControl: props === null || props === void 0 ? void 0 : props.inputGroupControl }));
                     if (changes.hasOwnProperty('name')) {
                         _this.setInitialValue(_this.props.$schema.value);
                     }
@@ -210,6 +217,8 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
                 }
                 else if (typeof props.defaultValue !== 'undefined' &&
                     formula.isExpression(props.defaultValue) &&
+                    props.defaultValue.replace(/\s/g, '') !==
+                        "${".concat(props.name, "}") &&
                     (!isEqual__default["default"](props.defaultValue, prevProps.defaultValue) ||
                         (props.data !== prevProps.data &&
                             formula.isNeedFormula(props.defaultValue, props.data, prevProps.data)))) {
@@ -270,8 +279,13 @@ var _J$F_ = (__react_jsx__["default"] || __react_jsx__).Fragment;
             };
             class_1.prototype.setInitialValue = function (value) {
                 var model = this.model;
-                var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData;
+                var _a = this.props, form = _a.formStore, data = _a.data, canAccessSuperData = _a.canAccessSuperData, name = _a.name;
                 var isExp = formula.isExpression(value);
+                if (isExp && value.replace(/\s/g, '') === "${".concat(name, "}")) {
+                    console.warn('value 不要使用表达式关联自己');
+                    isExp = false;
+                    value = undefined;
+                }
                 var initialValue = model.extraName
                     ? [
                         getVariable.getVariable(data, model.name, canAccessSuperData !== null && canAccessSuperData !== void 0 ? canAccessSuperData : form === null || form === void 0 ? void 0 : form.canAccessSuperData),

package/lib/store/app.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.11.0
+ * amis-core v6.12.0-ab.2
  * Copyright 2018-2025 fex
  */
 
@@ -12,6 +12,7 @@ var mobxStateTree = require('mobx-state-tree');
 var helper = require('../utils/helper.js');
 var service = require('./service.js');
 require('../utils/api.js');
+require('file-saver');
 require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');