amis-core 3.6.3 → 6.0.0

package/lib/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -10,6 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 require('../utils/helper.js');
 var Action = require('./Action.js');
+var factory = require('../factory.js');
 var object = require('../utils/object.js');
 
 /**
@@ -23,12 +24,12 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, path, beforeSetData, res, component, msg, result, e_1;
-            var _t, _u;
-            return tslib.__generator(this, function (_v) {
-                switch (_v.label) {
+            var key, dataMergeMode, path, beforeSetData, res, component, msg, _5, dispatchEvent_1, data, valid, e_1, result, e_2;
+            var _6, _7, _8, _9, _10;
+            return tslib.__generator(this, function (_11) {
+                switch (_11.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
@@ -38,11 +39,11 @@ var CmptAction = /** @class */ (function () {
                         if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _v.sent();
+                        res = _11.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _v.label = 2;
+                        _11.label = 2;
                     case 2:
                         component = key
                             ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
@@ -69,33 +70,71 @@ 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)];
                         }
-                        _v.label = 3;
+                        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];
+                        _5 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _5.dispatchEvent, data = _5.data;
+                        _11.label = 3;
                     case 3:
-                        _v.trys.push([3, 5, , 6]);
-                        return [4 /*yield*/, ((_m = component === null || component === void 0 ? void 0 : component.doAction) === null || _m === void 0 ? void 0 : _m.call(component, action, action.args, true))];
+                        _11.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
                     case 4:
-                        result = _v.sent();
-                        if (['validate', 'submit'].includes(action.actionType)) {
-                            event.setData(object.createObject(event.data, (_t = {},
-                                _t[action.outputVar || "".concat(action.actionType, "Result")] = {
+                        valid = _11.sent();
+                        if (valid) {
+                            event.setData(object.createObject(event.data, (_6 = {},
+                                _6[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
-                                    payload: (_o = result === null || result === void 0 ? void 0 : result.__payload) !== null && _o !== void 0 ? _o : (_q = (_p = component === null || component === void 0 ? void 0 : component.props) === null || _p === void 0 ? void 0 : _p.store) === null || _q === void 0 ? void 0 : _q.data,
-                                    responseData: result === null || result === void 0 ? void 0 : result.__response
+                                    value: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.formItem) === null || _s === void 0 ? void 0 : _s.value
                                 },
-                                _t)));
+                                _6)));
+                            dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
                         }
-                        return [2 /*return*/, result];
+                        else {
+                            event.setData(object.createObject(event.data, (_7 = {},
+                                _7[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: (((_u = (_t = component === null || component === void 0 ? void 0 : component.props) === null || _t === void 0 ? void 0 : _t.formItem) === null || _u === void 0 ? void 0 : _u.errors) || []).join(','),
+                                    value: (_w = (_v = component === null || component === void 0 ? void 0 : component.props) === null || _v === void 0 ? void 0 : _v.formItem) === null || _w === void 0 ? void 0 : _w.value
+                                },
+                                _7)));
+                            dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
+                        }
+                        return [3 /*break*/, 6];
                     case 5:
-                        e_1 = _v.sent();
-                        event.setData(object.createObject(event.data, (_u = {},
-                            _u[action.outputVar || "".concat(action.actionType, "Result")] = {
-                                error: e_1.message,
-                                errors: e_1.name === 'ValidateError' ? e_1.detail : e_1,
-                                payload: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.store) === null || _s === void 0 ? void 0 : _s.data
+                        e_1 = _11.sent();
+                        event.setData(object.createObject(event.data, (_8 = {},
+                            _8[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                error: e_1.message || '未知错误',
+                                value: (_y = (_x = component === null || component === void 0 ? void 0 : component.props) === null || _x === void 0 ? void 0 : _x.formItem) === null || _y === void 0 ? void 0 : _y.value
                             },
-                            _u)));
+                            _8)));
+                        dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
+                    case 7:
+                        _11.trys.push([7, 9, , 10]);
+                        return [4 /*yield*/, ((_z = component === null || component === void 0 ? void 0 : component.doAction) === null || _z === void 0 ? void 0 : _z.call(component, action, action.args, true))];
+                    case 8:
+                        result = _11.sent();
+                        if (['validate', 'submit'].includes(action.actionType)) {
+                            event.setData(object.createObject(event.data, (_9 = {},
+                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: '',
+                                    payload: (_0 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _0 !== void 0 ? _0 : (_2 = (_1 = component === null || component === void 0 ? void 0 : component.props) === null || _1 === void 0 ? void 0 : _1.store) === null || _2 === void 0 ? void 0 : _2.data,
+                                    responseData: result === null || result === void 0 ? void 0 : result.__response
+                                },
+                                _9)));
+                        }
+                        return [2 /*return*/, result];
+                    case 9:
+                        e_2 = _11.sent();
+                        event.setData(object.createObject(event.data, (_10 = {},
+                            _10[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                error: e_2.message,
+                                errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
+                                payload: (_4 = (_3 = component === null || component === void 0 ? void 0 : component.props) === null || _3 === void 0 ? void 0 : _3.store) === null || _4 === void 0 ? void 0 : _4.data
+                            },
+                            _10)));
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
                 }
             });
         });

package/lib/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,10 +9,11 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var api = require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('amis-formula');
 require('lodash/isPlainObject');
+require('amis-formula');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');

package/lib/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -13,10 +13,11 @@ var cx = require('classnames');
 var ReactDOM = require('react-dom');
 var React = require('react');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('amis-formula');
 require('lodash/isPlainObject');
+require('amis-formula');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');

package/lib/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -12,10 +12,11 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var theme = require('../theme.js');
 require('../utils/api.js');
+require('../utils/browser.js');
 require('../utils/ColorScale.js');
 require('../utils/columnsSplit.js');
-require('amis-formula');
 require('lodash/isPlainObject');
+require('amis-formula');
 require('../utils/DataSchema.js');
 require('../utils/DataScope.js');
 require('moment');

package/lib/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -15,8 +15,10 @@ require('./renderers/register.js');
 var api = require('./utils/api.js');
 var attachmentAdpator = require('./utils/attachmentAdpator.js');
 var autobind = require('./utils/autobind.js');
+var browser = require('./utils/browser.js');
 var ColorScale = require('./utils/ColorScale.js');
 var columnsSplit = require('./utils/columnsSplit.js');
+var concatData = require('./utils/concatData.js');
 var dataMapping = require('./utils/dataMapping.js');
 var DataSchema = require('./utils/DataSchema.js');
 var DataScope = require('./utils/DataScope.js');
@@ -133,7 +135,7 @@ var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var classPrefix = theme.getClassPrefix();
 // @ts-ignore
-var version = '3.6.3';
+var version = '6.0.0';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }
@@ -231,8 +233,10 @@ exports.wrapFetcher = api.wrapFetcher;
 exports.attachmentAdpator = attachmentAdpator.attachmentAdpator;
 exports.autobindMethod = autobind.autobindMethod;
 exports.bind = autobind.bind;
+exports.chromeVersion = browser.chromeVersion;
 exports.ColorScale = ColorScale.ColorScale;
 exports.columnsSplit = columnsSplit.columnsSplit;
+exports.concatData = concatData.concatData;
 exports.dataMapping = dataMapping.dataMapping;
 exports.resolveMapping = dataMapping.resolveMapping;
 exports.resolveMappingObject = dataMapping.resolveMappingObject;

package/lib/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/polyfills.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.6.3
+ * amis-core v6.0.0
  * Copyright 2018-2023 fex
  */