amis-core 6.4.1 → 6.6.0

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var tpl = require('../utils/tpl.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
 
@@ -212,7 +213,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
                 isStop = false;
                 if (!expression) return [3 /*break*/, 2];
-                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(expression, mergeData, true)];
+                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
             case 1:
                 isStop = !(_w.sent());
                 _w.label = 2;
@@ -222,7 +223,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 }
                 preventDefault = false;
                 if (!action.preventDefault) return [3 /*break*/, 4];
-                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(action.preventDefault, mergeData, false)];
+                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
             case 3:
                 preventDefault = _w.sent();
                 _w.label = 4;
@@ -293,7 +294,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 }
                 stopPropagation = false;
                 if (!action.stopPropagation) return [3 /*break*/, 7];
-                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(action.stopPropagation, mergeData, false)];
+                return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
             case 6:
                 stopPropagation = _w.sent();
                 _w.label = 7;

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -51,7 +51,7 @@ var AjaxAction = /** @class */ (function () {
                         messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
                         api$1 = api.normalizeApi(action.api);
                         if (!(api$1.sendOn !== undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(api$1.sendOn, (_d = action.data) !== null && _d !== void 0 ? _d : {}, false)];
+                        return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(api$1.sendOn, (_d = action.data) !== null && _d !== void 0 ? _d : {}, false)];
                     case 1:
                         sendOn = _q.sent();
                         if (!sendOn) {

package/lib/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -68,7 +68,7 @@ var CmptAction = /** @class */ (function () {
                         }
                         // 刷新
                         if (action.actionType === 'reload') {
-                            return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, undefined, undefined, dataMergeMode === 'override', action.args)];
+                            return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', action.args)];
                         }
                         if (!(action.actionType === 'validateFormItem' &&
                             ((_o = factory.getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 7];

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -21,15 +21,15 @@ var CopyAction = /** @class */ (function () {
     function CopyAction() {
     }
     CopyAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            return tslib.__generator(this, function (_g) {
+            return tslib.__generator(this, function (_f) {
                 if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.copy)) {
                     throw new Error('env.copy is required!');
                 }
                 if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.content) {
                     (_d = (_c = event.context.env) === null || _c === void 0 ? void 0 : _c.copy) === null || _d === void 0 ? void 0 : _d.call(_c, action.args.content, {
-                        format: (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.copyFormat) !== null && _f !== void 0 ? _f : 'text/html'
+                        format: (_e = action.args) === null || _e === void 0 ? void 0 : _e.copyFormat
                     });
                 }
                 return [2 /*return*/];

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -27,6 +27,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -27,6 +27,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -37,6 +37,7 @@ require('react');
 require('react-overlays/useRootClose');
 require('react-dom');
 require('../utils/SimpleMap.js');
+require('@rc-component/mini-decimal');
 require('lodash/mapValues');
 require('lodash/camelCase');
 require('lodash/cloneDeep');

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,6 +13,7 @@ var Action = require('./Action.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('@rc-component/mini-decimal');
 var resolveVariable = require('../utils/resolveVariable.js');
 require('lodash/isPlainObject');
 require('../utils/filter.js');

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/PrintAction.d.ts

@@ -1,7 +1,7 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IPrintAction extends ListenerAction {
-    actionType: 'copy';
+    actionType: 'print';
     args: {
         id?: string;
         ids?: string[];

package/lib/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -22,17 +22,23 @@ var PrintAction = /** @class */ (function () {
     function PrintAction() {
     }
     PrintAction.prototype.run = function (action, renderer, event) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var element, elements_1;
-            return tslib.__generator(this, function (_c) {
-                if ((_a = action.args) === null || _a === void 0 ? void 0 : _a.id) {
+            var targetComponent, element, elements_1;
+            return tslib.__generator(this, function (_e) {
+                // 兼容之前的 word 打印
+                if (action.componentId) {
+                    targetComponent = (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentById(action.componentId);
+                    (_b = targetComponent === null || targetComponent === void 0 ? void 0 : targetComponent.doAction) === null || _b === void 0 ? void 0 : _b.call(targetComponent, action, event.data, true, action.args);
+                    return [2 /*return*/];
+                }
+                if ((_c = action.args) === null || _c === void 0 ? void 0 : _c.id) {
                     element = document.querySelector("[data-id='".concat(action.args.id, "']"));
                     if (element) {
                         printElement.printElements([element]);
                     }
                 }
-                else if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.ids) {
+                else if ((_d = action.args) === null || _d === void 0 ? void 0 : _d.ids) {
                     elements_1 = [];
                     action.args.ids.forEach(function (id) {
                         var element = document.querySelector("[data-id='".concat(id, "']"));

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -33,7 +33,7 @@ var SwitchAction = /** @class */ (function () {
                         if (!branch.expression) {
                             return [3 /*break*/, 4];
                         }
-                        return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(branch.expression, mergeData)];
+                        return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(branch.expression, mergeData)];
                     case 2:
                         isPass = _d.sent();
                         if (!isPass) return [3 /*break*/, 4];

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -13,7 +13,8 @@ var styleHelper = require('../utils/style-helper.js');
 var styleIdCount = new Map();
 function CustomStyle (props) {
     var config = props.config, env = props.env, data = props.data;
-    var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var themeCss = config.themeCss, classNames = config.classNames, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
+    var id = config.id ? "".concat(config.id) : config.id;
     React.useEffect(function () {
         if (styleIdCount.has(id)) {
             styleIdCount.set(id, styleIdCount.get(id) + 1);

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -30,6 +30,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -29,6 +29,7 @@ require('../utils/filter.js');
 require('lodash/isObject');
 require('lodash/isString');
 require('lodash/isBoolean');
+require('@rc-component/mini-decimal');
 require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');

package/lib/env.d.ts

@@ -112,11 +112,9 @@ export interface EnvProps {
     env: RendererEnv;
 }
 export declare function withRendererEnv<T extends React.ComponentType<React.ComponentProps<T> & EnvProps>>(ComposedComponent: T): {
-    new (props: (JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
-        env?: RendererEnv | undefined;
-    }) | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
+    new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
         env?: RendererEnv | undefined;
-    }>): {
+    }): {
         render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -139,7 +139,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '6.4.1';
+var version = '6.6.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -431,6 +431,7 @@ exports.register = tplBuiltin.register;
 exports.asyncFilter = tpl.asyncFilter;
 exports.evalExpression = tpl.evalExpression;
 exports.evalExpressionWithConditionBuilder = tpl.evalExpressionWithConditionBuilder;
+exports.evalExpressionWithConditionBuilderAsync = tpl.evalExpressionWithConditionBuilderAsync;
 exports.evalJS = tpl.evalJS;
 exports.filter = tpl.filter;
 exports.registerTplEnginer = tpl.registerTplEnginer;
@@ -461,6 +462,7 @@ exports.valueMap = styleHelper.valueMap;
 exports.getConditionComputers = resolveCondition.getConditionComputers;
 exports.registerConditionComputer = resolveCondition.registerConditionComputer;
 exports.resolveCondition = resolveCondition.resolveCondition;
+exports.resolveConditionAsync = resolveCondition.resolveConditionAsync;
 exports.setConditionComputeErrorHandler = resolveCondition.setConditionComputeErrorHandler;
 exports.arraySlice = arraySlice.arraySlice;
 exports.isIntegerInRange = math.isIntegerInRange;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var moment = require('moment');
 require('amis-formula');
 require('lodash/isPlainObject');
 var resolveVariable = require('./utils/resolveVariable.js');
+require('@rc-component/mini-decimal');
 require('./utils/filter.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 

package/lib/renderers/Form.d.ts

@@ -150,7 +150,7 @@ export interface FormSchemaBase {
     /**
      * 配置表单项默认的展示方式。
      */
-    mode?: 'normal' | 'inline' | 'horizontal';
+    mode?: 'normal' | 'inline' | 'horizontal' | 'flex';
     /**
      * 表单项显示为几列
      */

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.4.1
+ * amis-core v6.6.0
  * Copyright 2018-2024 fex
  */
 
@@ -21,6 +21,7 @@ var Scoped = require('../Scoped.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
 var api = require('../utils/api.js');
@@ -555,7 +556,7 @@ var Form = /** @class */ (function (_super) {
             return;
         }
         store.changeValue(name, value, changePristine);
-        if (!changePristine) {
+        if (!changePristine || typeof value !== 'undefined') {
             (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
         }
         if (store.persistData && store.inited) {
@@ -569,17 +570,17 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.emitChange = function (submit, emitedFromWatch) {
         if (emitedFromWatch === void 0) { emitedFromWatch = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, originData, diff, changeProps, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _b.trys.push([0, , 4, 5]);
                         this.emitting = true;
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data, originData = _a.originData;
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
                         }
-                        diff = helper.difference(store.data, store.pristine);
+                        diff = helper.difference(store.data, originData !== null && originData !== void 0 ? originData : store.upStreamData);
                         if (emitedFromWatch &&
                             (!Object.keys(diff).length || isEqual__default["default"](store.data, this.emittedData))) {
                             return [2 /*return*/];
@@ -1119,6 +1120,7 @@ var Form = /** @class */ (function (_super) {
         var _this = this;
         if (otherProps === void 0) { otherProps = {}; }
         children = children || [];
+        var cx = this.props.classnames;
         if (!Array.isArray(children)) {
             children = [children];
         }
@@ -1137,10 +1139,40 @@ var Form = /** @class */ (function (_super) {
             if (!children.length) {
                 return null;
             }
-            var cx_1 = this.props.classnames;
-            return (_J$X_("div", { className: cx_1('Form-row') }, children.map(function (control, key) {
+            return (_J$X_("div", { className: cx('Form-row') }, children.map(function (control, key) {
                 return ~['hidden', 'formula'].indexOf(control.type) ||
-                    control.mode === 'inline' ? (_this.renderChild(control, key, otherProps)) : (_J$X_("div", { key: key, className: cx_1("Form-col", control.columnClassName) }, _this.renderChild(control, '', tslib.__assign(tslib.__assign({}, otherProps), { mode: 'row' }))));
+                    control.mode === 'inline' ? (_this.renderChild(control, key, otherProps)) : (_J$X_("div", { key: key, className: cx("Form-col", control.columnClassName) }, _this.renderChild(control, '', tslib.__assign(tslib.__assign({}, otherProps), { mode: 'row' }))));
+            })));
+        }
+        if (this.props.mode === 'flex') {
+            var rows_1 = [];
+            children.forEach(function (child) {
+                if (typeof child.row === 'number') {
+                    if (rows_1[child.row]) {
+                        rows_1[child.row].push(child);
+                    }
+                    else {
+                        rows_1[child.row] = [child];
+                    }
+                }
+                else {
+                    // 没有 row 的，就单启一行
+                    rows_1.push([child]);
+                }
+            });
+            return (_J$X_(React__default["default"].Fragment, null, rows_1.map(function (children, index) {
+                return (_J$X_("div", { className: cx('Form-flex'), role: "flex-row", key: index }, children.map(function (control, key) {
+                    var _a;
+                    var split = (_a = control.colSize) === null || _a === void 0 ? void 0 : _a.split('/');
+                    var colSize = (split === null || split === void 0 ? void 0 : split[0]) && (split === null || split === void 0 ? void 0 : split[1])
+                        ? (split[0] / split[1]) * 100 + '%'
+                        : control.colSize;
+                    return ~['hidden', 'formula'].indexOf(control.type) ? (_this.renderChild(control, key, otherProps)) : (_J$X_("div", { key: control.id || key, className: cx("Form-flex-col", control.columnClassName), style: {
+                            flex: colSize && !['1', 'auto'].includes(colSize)
+                                ? "0 0 ".concat(colSize)
+                                : ''
+                        }, role: "flex-col" }, _this.renderChild(control, '', tslib.__assign(tslib.__assign({}, otherProps), { mode: 'flex' }))));
+                })));
             })));
         }
         return children.map(function (control, key) {
@@ -1171,7 +1203,9 @@ var Form = /** @class */ (function (_super) {
             formSubmited: form.submited,
             formMode: mode,
             formHorizontal: horizontal,
-            formLabelAlign: labelAlign !== 'left' ? 'right' : labelAlign,
+            formLabelAlign: !labelAlign || !['left', 'right', 'top'].includes(labelAlign)
+                ? 'right'
+                : labelAlign,
             formLabelWidth: labelWidth,
             controlWidth: controlWidth,
             /**