amis-core 6.4.1 → 6.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/Root.js +1 -1
- package/esm/RootRenderer.js +1 -1
- package/esm/SchemaRenderer.js +16 -5
- package/esm/Scoped.d.ts +1 -1
- package/esm/Scoped.js +5 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +10 -4
- package/esm/actions/Action.js +6 -5
- package/esm/actions/AjaxAction.js +3 -3
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.js +2 -2
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +4 -4
- package/esm/actions/CustomAction.js +2 -1
- package/esm/actions/DialogAction.js +2 -1
- package/esm/actions/DrawerAction.js +2 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.js +2 -1
- package/esm/actions/LinkAction.js +1 -1
- package/esm/actions/LoopAction.js +2 -1
- package/esm/actions/PageAction.js +1 -1
- package/esm/actions/ParallelAction.js +1 -1
- package/esm/actions/PrintAction.d.ts +1 -1
- package/esm/actions/PrintAction.js +12 -6
- package/esm/actions/StatusAction.js +1 -1
- package/esm/actions/SwitchAction.js +3 -3
- package/esm/actions/ToastAction.js +1 -1
- package/esm/actions/WaitAction.js +1 -1
- package/esm/components/CustomStyle.js +3 -2
- package/esm/components/ErrorBoundary.js +1 -1
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.js +2 -1
- package/esm/components/PopOver.js +2 -1
- package/esm/env.d.ts +2 -4
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/index.js +4 -4
- package/esm/locale.js +2 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.d.ts +1 -1
- package/esm/renderers/Form.js +43 -9
- package/esm/renderers/Item.d.ts +27 -60
- package/esm/renderers/Item.js +75 -6
- package/esm/renderers/Options.js +40 -13
- package/esm/renderers/Placeholder.js +1 -1
- package/esm/renderers/builtin.js +1 -1
- package/esm/renderers/register.js +1 -1
- package/esm/renderers/wrapControl.js +19 -9
- package/esm/store/app.d.ts +2 -0
- package/esm/store/app.js +2 -1
- package/esm/store/combo.d.ts +6 -0
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.d.ts +2 -0
- package/esm/store/crud.js +2 -1
- package/esm/store/form.d.ts +2 -0
- package/esm/store/form.js +2 -1
- package/esm/store/formItem.js +12 -2
- package/esm/store/iRenderer.d.ts +2 -0
- package/esm/store/iRenderer.js +13 -1
- package/esm/store/index.js +1 -1
- package/esm/store/list.d.ts +2 -0
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.d.ts +2 -0
- package/esm/store/modal.js +1 -1
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.d.ts +2 -0
- package/esm/store/pagination.js +2 -1
- package/esm/store/root.d.ts +2 -0
- package/esm/store/root.js +2 -1
- package/esm/store/service.d.ts +2 -0
- package/esm/store/service.js +2 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +6 -0
- package/esm/store/table.js +2 -1
- package/esm/store/table2.d.ts +2 -0
- package/esm/store/table2.js +1 -1
- package/esm/theme.js +1 -1
- package/esm/types.d.ts +2 -0
- package/esm/utils/Animation.js +1 -1
- package/esm/utils/ColorScale.js +1 -1
- package/esm/utils/DataSchema.js +1 -1
- package/esm/utils/DataScope.js +2 -1
- package/esm/utils/RootClose.js +1 -1
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/api.js +21 -3
- package/esm/utils/arraySlice.js +1 -1
- package/esm/utils/attachmentAdpator.js +1 -1
- package/esm/utils/autobind.js +1 -1
- package/esm/utils/browser.js +1 -1
- package/esm/utils/columnsSplit.js +1 -1
- package/esm/utils/concatData.js +1 -1
- package/esm/utils/dataMapping.js +1 -1
- package/esm/utils/date.d.ts +3 -1
- package/esm/utils/date.js +11 -5
- package/esm/utils/debug.js +1 -1
- package/esm/utils/decodeEntity.js +1 -1
- package/esm/utils/dom.js +1 -1
- package/esm/utils/errors.js +1 -1
- package/esm/utils/escapeHtml.js +1 -1
- package/esm/utils/filter-schema.js +7 -4
- package/esm/utils/filter.js +1 -1
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +2 -1
- package/esm/utils/getVariable.js +1 -1
- package/esm/utils/grammar.js +1 -1
- package/esm/utils/handleAction.js +1 -1
- package/esm/utils/helper.d.ts +1 -1
- package/esm/utils/helper.js +10 -6
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/isPureVariable.js +1 -1
- package/esm/utils/json-schema-2-amis-schema.js +1 -1
- package/esm/utils/keyToPath.js +1 -1
- package/esm/utils/labelToString.js +1 -1
- package/esm/utils/makeSorter.js +1 -1
- package/esm/utils/math.js +1 -1
- package/esm/utils/memoryParse.js +1 -1
- package/esm/utils/normalizeLink.js +1 -1
- package/esm/utils/normalizeOptions.d.ts +1 -1
- package/esm/utils/normalizeOptions.js +3 -2
- package/esm/utils/object.js +1 -1
- package/esm/utils/offset.js +1 -1
- package/esm/utils/offsetParent.js +1 -1
- package/esm/utils/optionValueCompare.js +1 -1
- package/esm/utils/position.js +1 -1
- package/esm/utils/prettyBytes.js +1 -1
- package/esm/utils/printElement.js +1 -1
- package/esm/utils/renderer-event.js +7 -6
- package/esm/utils/replaceText.js +1 -1
- package/esm/utils/resize-sensor.js +1 -1
- package/esm/utils/resolveCondition.d.ts +2 -1
- package/esm/utils/resolveCondition.js +60 -8
- package/esm/utils/resolveVariable.js +1 -1
- package/esm/utils/resolveVariableAndFilter.js +1 -1
- package/esm/utils/resolveVariableAndFilterForAsync.js +1 -1
- package/esm/utils/scrollPosition.js +1 -1
- package/esm/utils/string2regExp.js +1 -1
- package/esm/utils/stripNumber.js +2 -2
- package/esm/utils/style-helper.js +15 -8
- package/esm/utils/style.js +2 -1
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.js +2 -1
- package/esm/utils/tpl-lodash.js +2 -1
- package/esm/utils/tpl.d.ts +8 -1
- package/esm/utils/tpl.js +18 -5
- package/esm/utils/uncontrollable.js +1 -1
- package/esm/utils/validateId.js +1 -1
- package/esm/utils/validations.js +2 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.d.ts +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +16 -5
- package/lib/Scoped.d.ts +1 -1
- package/lib/Scoped.js +5 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +10 -4
- package/lib/actions/Action.js +5 -4
- package/lib/actions/AjaxAction.js +2 -2
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.js +2 -2
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +4 -4
- package/lib/actions/CustomAction.js +2 -1
- package/lib/actions/DialogAction.js +2 -1
- package/lib/actions/DrawerAction.js +2 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.js +2 -1
- package/lib/actions/LinkAction.js +1 -1
- package/lib/actions/LoopAction.js +2 -1
- package/lib/actions/PageAction.js +1 -1
- package/lib/actions/ParallelAction.js +1 -1
- package/lib/actions/PrintAction.d.ts +1 -1
- package/lib/actions/PrintAction.js +12 -6
- package/lib/actions/StatusAction.js +1 -1
- package/lib/actions/SwitchAction.js +2 -2
- package/lib/actions/ToastAction.js +1 -1
- package/lib/actions/WaitAction.js +1 -1
- package/lib/components/CustomStyle.js +3 -2
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +2 -1
- package/lib/components/PopOver.js +2 -1
- package/lib/env.d.ts +2 -4
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/index.js +4 -2
- package/lib/locale.js +2 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.d.ts +1 -1
- package/lib/renderers/Form.js +43 -9
- package/lib/renderers/Item.d.ts +27 -60
- package/lib/renderers/Item.js +75 -6
- package/lib/renderers/Options.js +40 -13
- package/lib/renderers/Placeholder.js +1 -1
- package/lib/renderers/builtin.js +1 -1
- package/lib/renderers/register.js +1 -1
- package/lib/renderers/wrapControl.js +19 -9
- package/lib/store/app.d.ts +2 -0
- package/lib/store/app.js +2 -1
- package/lib/store/combo.d.ts +30 -24
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.d.ts +2 -0
- package/lib/store/crud.js +2 -1
- package/lib/store/form.d.ts +12 -10
- package/lib/store/form.js +2 -1
- package/lib/store/formItem.js +12 -2
- package/lib/store/iRenderer.d.ts +2 -0
- package/lib/store/iRenderer.js +13 -1
- package/lib/store/index.js +1 -1
- package/lib/store/list.d.ts +2 -0
- package/lib/store/list.js +1 -1
- package/lib/store/manager.js +1 -1
- package/lib/store/modal.d.ts +2 -0
- package/lib/store/modal.js +1 -1
- package/lib/store/node.js +1 -1
- package/lib/store/pagination.d.ts +2 -0
- package/lib/store/pagination.js +2 -1
- package/lib/store/root.d.ts +2 -0
- package/lib/store/root.js +2 -1
- package/lib/store/service.d.ts +2 -0
- package/lib/store/service.js +2 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +26 -20
- package/lib/store/table.js +2 -1
- package/lib/store/table2.d.ts +2 -0
- package/lib/store/table2.js +1 -1
- package/lib/theme.js +1 -1
- package/lib/types.d.ts +2 -0
- package/lib/utils/Animation.js +1 -1
- package/lib/utils/ColorScale.js +1 -1
- package/lib/utils/DataSchema.js +1 -1
- package/lib/utils/DataScope.js +2 -1
- package/lib/utils/RootClose.js +1 -1
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/api.js +23 -3
- package/lib/utils/arraySlice.js +1 -1
- package/lib/utils/attachmentAdpator.js +1 -1
- package/lib/utils/autobind.js +1 -1
- package/lib/utils/browser.js +1 -1
- package/lib/utils/columnsSplit.js +1 -1
- package/lib/utils/concatData.js +1 -1
- package/lib/utils/dataMapping.js +1 -1
- package/lib/utils/date.d.ts +3 -1
- package/lib/utils/date.js +11 -5
- package/lib/utils/debug.js +1 -1
- package/lib/utils/decodeEntity.js +1 -1
- package/lib/utils/dom.js +1 -1
- package/lib/utils/errors.js +1 -1
- package/lib/utils/escapeHtml.js +1 -1
- package/lib/utils/filter-schema.js +6 -3
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +2 -1
- package/lib/utils/getVariable.js +1 -1
- package/lib/utils/grammar.js +1 -1
- package/lib/utils/handleAction.js +1 -1
- package/lib/utils/helper.d.ts +1 -1
- package/lib/utils/helper.js +9 -5
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/isPureVariable.js +1 -1
- package/lib/utils/json-schema-2-amis-schema.js +1 -1
- package/lib/utils/keyToPath.js +1 -1
- package/lib/utils/labelToString.js +1 -1
- package/lib/utils/makeSorter.js +1 -1
- package/lib/utils/math.js +1 -1
- package/lib/utils/memoryParse.js +1 -1
- package/lib/utils/normalizeLink.js +1 -1
- package/lib/utils/normalizeOptions.d.ts +1 -1
- package/lib/utils/normalizeOptions.js +3 -2
- package/lib/utils/object.js +1 -1
- package/lib/utils/offset.js +1 -1
- package/lib/utils/offsetParent.js +1 -1
- package/lib/utils/optionValueCompare.js +1 -1
- package/lib/utils/position.js +1 -1
- package/lib/utils/prettyBytes.js +1 -1
- package/lib/utils/printElement.js +1 -1
- package/lib/utils/renderer-event.js +6 -5
- package/lib/utils/replaceText.js +1 -1
- package/lib/utils/resize-sensor.js +1 -1
- package/lib/utils/resolveCondition.d.ts +2 -1
- package/lib/utils/resolveCondition.js +60 -7
- package/lib/utils/resolveVariable.js +1 -1
- package/lib/utils/resolveVariableAndFilter.js +1 -1
- package/lib/utils/resolveVariableAndFilterForAsync.js +1 -1
- package/lib/utils/scrollPosition.js +1 -1
- package/lib/utils/string2regExp.js +1 -1
- package/lib/utils/stripNumber.js +3 -3
- package/lib/utils/style-helper.js +15 -8
- package/lib/utils/style.js +2 -1
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.js +2 -1
- package/lib/utils/tpl-lodash.js +2 -1
- package/lib/utils/tpl.d.ts +8 -1
- package/lib/utils/tpl.js +17 -3
- package/lib/utils/uncontrollable.js +1 -1
- package/lib/utils/validateId.js +1 -1
- package/lib/utils/validations.js +2 -1
- package/package.json +3 -2
- package/esm/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +0 -12
- package/esm/node_modules/@babel/runtime/helpers/esm/createClass.js +0 -26
- package/esm/node_modules/@babel/runtime/helpers/esm/defineProperty.js +0 -23
- package/esm/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +0 -19
- package/esm/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +0 -14
- package/esm/node_modules/@babel/runtime/helpers/esm/typeof.js +0 -16
- package/esm/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +0 -184
- package/esm/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +0 -56
- package/esm/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +0 -119
- package/esm/node_modules/@rc-component/mini-decimal/es/numberUtil.js +0 -105
- package/esm/node_modules/@rc-component/mini-decimal/es/supportUtil.js +0 -10
- package/lib/node_modules/@babel/runtime/helpers/esm/classCallCheck.js +0 -16
- package/lib/node_modules/@babel/runtime/helpers/esm/createClass.js +0 -30
- package/lib/node_modules/@babel/runtime/helpers/esm/defineProperty.js +0 -27
- package/lib/node_modules/@babel/runtime/helpers/esm/toPrimitive.js +0 -23
- package/lib/node_modules/@babel/runtime/helpers/esm/toPropertyKey.js +0 -18
- package/lib/node_modules/@babel/runtime/helpers/esm/typeof.js +0 -20
- package/lib/node_modules/@rc-component/mini-decimal/es/BigIntDecimal.js +0 -188
- package/lib/node_modules/@rc-component/mini-decimal/es/MiniDecimal.js +0 -61
- package/lib/node_modules/@rc-component/mini-decimal/es/NumberDecimal.js +0 -123
- package/lib/node_modules/@rc-component/mini-decimal/es/numberUtil.js +0 -114
- package/lib/node_modules/@rc-component/mini-decimal/es/supportUtil.js +0 -14
package/esm/Root.js
CHANGED
package/esm/RootRenderer.js
CHANGED
package/esm/SchemaRenderer.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -22,6 +22,7 @@ import { reaction } from 'mobx';
|
|
|
22
22
|
import 'amis-formula';
|
|
23
23
|
import 'moment';
|
|
24
24
|
import 'lodash/isPlainObject';
|
|
25
|
+
import '@rc-component/mini-decimal';
|
|
25
26
|
import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
|
|
26
27
|
import './utils/filter.js';
|
|
27
28
|
import { buildStyle } from './utils/style.js';
|
|
@@ -35,6 +36,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
|
|
|
35
36
|
'className',
|
|
36
37
|
'style',
|
|
37
38
|
'data',
|
|
39
|
+
'originData',
|
|
38
40
|
'children',
|
|
39
41
|
'ref',
|
|
40
42
|
'visible',
|
|
@@ -164,9 +166,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
164
166
|
this.ref = ref;
|
|
165
167
|
};
|
|
166
168
|
SchemaRenderer.prototype.childRef = function (ref) {
|
|
169
|
+
var _this = this;
|
|
167
170
|
while (ref && ref.getWrappedInstance) {
|
|
168
171
|
ref = ref.getWrappedInstance();
|
|
169
172
|
}
|
|
173
|
+
if (ref && !ref.props) {
|
|
174
|
+
Object.defineProperty(ref, 'props', {
|
|
175
|
+
get: function () { return _this.props; }
|
|
176
|
+
});
|
|
177
|
+
}
|
|
170
178
|
this.cRef = ref;
|
|
171
179
|
};
|
|
172
180
|
SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
|
|
@@ -249,7 +257,9 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
249
257
|
? null
|
|
250
258
|
: React.isValidElement(schema.children)
|
|
251
259
|
? schema.children
|
|
252
|
-
: schema.children
|
|
260
|
+
: typeof schema.children !== 'function'
|
|
261
|
+
? null
|
|
262
|
+
: schema.children(__assign(__assign(__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
|
|
253
263
|
}
|
|
254
264
|
else if (schema.component && isValidElementType(schema.component)) {
|
|
255
265
|
var isSFC = !(schema.component.prototype instanceof React.Component);
|
|
@@ -304,10 +314,11 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
304
314
|
if (renderer.storeType) {
|
|
305
315
|
exprProps = {};
|
|
306
316
|
}
|
|
307
|
-
var
|
|
317
|
+
var supportRef = ((_e = Component.prototype) === null || _e === void 0 ? void 0 : _e.isReactComponent) ||
|
|
318
|
+
Component.$$typeof === Symbol.for('react.forward_ref');
|
|
308
319
|
var props = __assign(__assign(__assign(__assign(__assign({}, theme.getRendererConfig(renderer.name)), restSchema), chainEvents(rest, restSchema)), exprProps), {
|
|
309
320
|
// value: defaultValue, // 备注: 此处并没有将value传递给渲染器
|
|
310
|
-
defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema,
|
|
321
|
+
defaultData: (_f = restSchema.defaultData) !== null && _f !== void 0 ? _f : defaultData, defaultValue: (_g = restSchema.defaultValue) !== null && _g !== void 0 ? _g : defaultValue, defaultActiveKey: defaultActiveKey, propKey: propKey, $path: $path, $schema: schema, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent, mobileUI: schema.useMobileUI === false ? false : rest.mobileUI });
|
|
311
322
|
// style 支持公式
|
|
312
323
|
if (schema.style) {
|
|
313
324
|
props.style = buildStyle(schema.style, detectData);
|
|
@@ -345,7 +356,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
|
|
|
345
356
|
finally { if (e_1) throw e_1.error; }
|
|
346
357
|
}
|
|
347
358
|
}
|
|
348
|
-
var component =
|
|
359
|
+
var component = supportRef ? (React.createElement(Component, __assign({}, props, { ref: this.childRef }))) : (React.createElement(Component, __assign({}, props, { forwardedRef: this.childRef })));
|
|
349
360
|
return this.props.env.enableAMISDebug ? (React.createElement(DebugWrapper, { renderer: renderer }, component)) : (component);
|
|
350
361
|
};
|
|
351
362
|
SchemaRenderer.displayName = 'Renderer';
|
package/esm/Scoped.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export interface ScopedComponentType extends React.Component<RendererProps> {
|
|
|
24
24
|
focus?: () => void;
|
|
25
25
|
doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
|
|
26
26
|
receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
|
|
27
|
-
reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData) => void;
|
|
27
|
+
reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData, silent?: boolean, replace?: boolean, args?: any) => void;
|
|
28
28
|
context: any;
|
|
29
29
|
setData?: (value?: object, replace?: boolean, index?: number) => void;
|
|
30
30
|
}
|
package/esm/Scoped.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -13,6 +13,7 @@ import 'moment';
|
|
|
13
13
|
import { createObject } from './utils/object.js';
|
|
14
14
|
import { memoParse } from './utils/tokenize.js';
|
|
15
15
|
import { isPureVariable } from './utils/isPureVariable.js';
|
|
16
|
+
import '@rc-component/mini-decimal';
|
|
16
17
|
import { getVariable } from './utils/getVariable.js';
|
|
17
18
|
import { dataMapping } from './utils/dataMapping.js';
|
|
18
19
|
import './utils/filter.js';
|
|
@@ -147,6 +148,9 @@ function createScopedTools(path, parent, env, rendererType) {
|
|
|
147
148
|
unRegisterComponent: function (component) {
|
|
148
149
|
// 自己本身实际上注册在父级 Scoped 上。
|
|
149
150
|
if (component.props.$path === path && parent) {
|
|
151
|
+
// 如果是自己,尝试把自己从父级 Scoped 上移除,否则在某些场景下会导致父级的 children 一直增长。
|
|
152
|
+
var idx_1 = parent.children.indexOf(self);
|
|
153
|
+
~idx_1 && parent.children.splice(idx_1, 1);
|
|
150
154
|
return parent.unRegisterComponent(component);
|
|
151
155
|
}
|
|
152
156
|
var idx = components.indexOf(component);
|
package/esm/StatusScoped.js
CHANGED
package/esm/WithRootStore.js
CHANGED
package/esm/WithStore.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -15,6 +15,7 @@ import 'amis-formula';
|
|
|
15
15
|
import 'moment';
|
|
16
16
|
import { createObject, extendObject } from './utils/object.js';
|
|
17
17
|
import { tokenize } from './utils/tokenize.js';
|
|
18
|
+
import '@rc-component/mini-decimal';
|
|
18
19
|
import { dataMapping } from './utils/dataMapping.js';
|
|
19
20
|
import './utils/filter.js';
|
|
20
21
|
import { RootStoreContext } from './WithRootStore.js';
|
|
@@ -152,7 +153,7 @@ function HocStoreFactory(renderer) {
|
|
|
152
153
|
// 目前主要的问题是,如果 combo 中表单项名字和 combo 本身的名字一样,会导致里面的值会被覆盖成数组
|
|
153
154
|
((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
|
|
154
155
|
? undefined
|
|
155
|
-
: syncDataFromSuper(__assign(__assign({}, store.
|
|
156
|
+
: syncDataFromSuper(__assign(__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
156
157
|
}
|
|
157
158
|
else {
|
|
158
159
|
store.initData(createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
|
|
@@ -198,11 +199,16 @@ function HocStoreFactory(renderer) {
|
|
|
198
199
|
return render(region, node, __assign(__assign({ data: this.store.data, dataUpdatedAt: this.store.updatedAt }, subProps), { scope: this.store.data, store: this.store }));
|
|
199
200
|
};
|
|
200
201
|
StoreFactory.prototype.render = function () {
|
|
201
|
-
var _a
|
|
202
|
+
var _a;
|
|
203
|
+
var _b = this.props; _b.detectField; var rest = __rest(_b, ["detectField"]);
|
|
202
204
|
if (this.state.hidden || this.state.visible === false) {
|
|
203
205
|
return null;
|
|
204
206
|
}
|
|
205
|
-
|
|
207
|
+
var refConfig = ((_a = Component.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
|
|
208
|
+
Component.$$typeof === Symbol.for('react.forward_ref')
|
|
209
|
+
? { ref: this.refFn }
|
|
210
|
+
: { forwardedRef: this.refFn };
|
|
211
|
+
return (React.createElement(Component, __assign({}, rest /* todo */, this.state, refConfig, { data: this.store.data, dataUpdatedAt: this.store.updatedAt, store: this.store, scope: this.store.data, render: this.renderChild })));
|
|
206
212
|
};
|
|
207
213
|
StoreFactory.displayName = "WithStore(".concat(Component.displayName || Component.name, ")");
|
|
208
214
|
StoreFactory.ComposedComponent = Component;
|
package/esm/actions/Action.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { __awaiter, __generator, __values, __assign, __spreadArray, __read } from 'tslib';
|
|
7
7
|
import omit from 'lodash/omit';
|
|
8
8
|
import '../utils/helper.js';
|
|
9
|
-
import {
|
|
9
|
+
import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
|
|
10
10
|
import 'amis-formula';
|
|
11
11
|
import 'moment';
|
|
12
12
|
import { createObject } from '../utils/object.js';
|
|
13
|
+
import '@rc-component/mini-decimal';
|
|
13
14
|
import { dataMapping } from '../utils/dataMapping.js';
|
|
14
15
|
import '../utils/filter.js';
|
|
15
16
|
|
|
@@ -204,7 +205,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
204
205
|
expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
|
|
205
206
|
isStop = false;
|
|
206
207
|
if (!expression) return [3 /*break*/, 2];
|
|
207
|
-
return [4 /*yield*/,
|
|
208
|
+
return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
|
|
208
209
|
case 1:
|
|
209
210
|
isStop = !(_w.sent());
|
|
210
211
|
_w.label = 2;
|
|
@@ -214,7 +215,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
214
215
|
}
|
|
215
216
|
preventDefault = false;
|
|
216
217
|
if (!action.preventDefault) return [3 /*break*/, 4];
|
|
217
|
-
return [4 /*yield*/,
|
|
218
|
+
return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
|
|
218
219
|
case 3:
|
|
219
220
|
preventDefault = _w.sent();
|
|
220
221
|
_w.label = 4;
|
|
@@ -285,7 +286,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
|
|
|
285
286
|
}
|
|
286
287
|
stopPropagation = false;
|
|
287
288
|
if (!action.stopPropagation) return [3 /*break*/, 7];
|
|
288
|
-
return [4 /*yield*/,
|
|
289
|
+
return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
|
|
289
290
|
case 6:
|
|
290
291
|
stopPropagation = _w.sent();
|
|
291
292
|
_w.label = 7;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -7,7 +7,7 @@ import { __awaiter, __generator, __assign } from 'tslib';
|
|
|
7
7
|
import { normalizeApiResponseData, normalizeApi } from '../utils/api.js';
|
|
8
8
|
import { ServerError } from '../utils/errors.js';
|
|
9
9
|
import { isEmpty } from '../utils/helper.js';
|
|
10
|
-
import {
|
|
10
|
+
import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
|
|
11
11
|
import { registerAction } from './Action.js';
|
|
12
12
|
import { createObject } from '../utils/object.js';
|
|
13
13
|
|
|
@@ -47,7 +47,7 @@ var AjaxAction = /** @class */ (function () {
|
|
|
47
47
|
messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
|
|
48
48
|
api = normalizeApi(action.api);
|
|
49
49
|
if (!(api.sendOn !== undefined)) return [3 /*break*/, 2];
|
|
50
|
-
return [4 /*yield*/,
|
|
50
|
+
return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(api.sendOn, (_d = action.data) !== null && _d !== void 0 ? _d : {}, false)];
|
|
51
51
|
case 1:
|
|
52
52
|
sendOn = _q.sent();
|
|
53
53
|
if (!sendOn) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -64,7 +64,7 @@ var CmptAction = /** @class */ (function () {
|
|
|
64
64
|
}
|
|
65
65
|
// 刷新
|
|
66
66
|
if (action.actionType === 'reload') {
|
|
67
|
-
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,
|
|
67
|
+
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)];
|
|
68
68
|
}
|
|
69
69
|
if (!(action.actionType === 'validateFormItem' &&
|
|
70
70
|
((_o = 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];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -17,15 +17,15 @@ var CopyAction = /** @class */ (function () {
|
|
|
17
17
|
function CopyAction() {
|
|
18
18
|
}
|
|
19
19
|
CopyAction.prototype.run = function (action, renderer, event) {
|
|
20
|
-
var _a, _b, _c, _d, _e
|
|
20
|
+
var _a, _b, _c, _d, _e;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function () {
|
|
22
|
-
return __generator(this, function (
|
|
22
|
+
return __generator(this, function (_f) {
|
|
23
23
|
if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.copy)) {
|
|
24
24
|
throw new Error('env.copy is required!');
|
|
25
25
|
}
|
|
26
26
|
if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.content) {
|
|
27
27
|
(_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, {
|
|
28
|
-
format: (
|
|
28
|
+
format: (_e = action.args) === null || _e === void 0 ? void 0 : _e.copyFormat
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
31
|
return [2 /*return*/];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -23,6 +23,7 @@ import '../utils/filter.js';
|
|
|
23
23
|
import 'lodash/isObject';
|
|
24
24
|
import 'lodash/isString';
|
|
25
25
|
import 'lodash/isBoolean';
|
|
26
|
+
import '@rc-component/mini-decimal';
|
|
26
27
|
import '../utils/image.js';
|
|
27
28
|
import 'lodash/isEqual';
|
|
28
29
|
import { registerAction, runActions } from './Action.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -24,6 +24,7 @@ import '../utils/filter.js';
|
|
|
24
24
|
import 'lodash/isObject';
|
|
25
25
|
import 'lodash/isString';
|
|
26
26
|
import 'lodash/isBoolean';
|
|
27
|
+
import '@rc-component/mini-decimal';
|
|
27
28
|
import '../utils/image.js';
|
|
28
29
|
import 'lodash/isEqual';
|
|
29
30
|
import { registerAction } from './Action.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -24,6 +24,7 @@ import '../utils/filter.js';
|
|
|
24
24
|
import 'lodash/isObject';
|
|
25
25
|
import 'lodash/isString';
|
|
26
26
|
import 'lodash/isBoolean';
|
|
27
|
+
import '@rc-component/mini-decimal';
|
|
27
28
|
import '../utils/image.js';
|
|
28
29
|
import 'lodash/isEqual';
|
|
29
30
|
import { registerAction } from './Action.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -31,6 +31,7 @@ import { resolveVariableAndFilterForAsync } from '../utils/resolveVariableAndFil
|
|
|
31
31
|
import '../utils/resize-sensor.js';
|
|
32
32
|
import 'react-overlays/useRootClose';
|
|
33
33
|
import '../utils/SimpleMap.js';
|
|
34
|
+
import '@rc-component/mini-decimal';
|
|
34
35
|
import 'lodash/mapValues';
|
|
35
36
|
import 'lodash/camelCase';
|
|
36
37
|
import 'lodash/cloneDeep';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,6 +9,7 @@ import { registerAction, LoopStatus, runActions } from './Action.js';
|
|
|
9
9
|
import 'amis-formula';
|
|
10
10
|
import 'moment';
|
|
11
11
|
import { createObject } from '../utils/object.js';
|
|
12
|
+
import '@rc-component/mini-decimal';
|
|
12
13
|
import { resolveVariable } from '../utils/resolveVariable.js';
|
|
13
14
|
import 'lodash/isPlainObject';
|
|
14
15
|
import '../utils/filter.js';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { RendererEvent } from '../utils/renderer-event';
|
|
2
2
|
import { RendererAction, ListenerAction, ListenerContext } from './Action';
|
|
3
3
|
export interface IPrintAction extends ListenerAction {
|
|
4
|
-
actionType: '
|
|
4
|
+
actionType: 'print';
|
|
5
5
|
args: {
|
|
6
6
|
id?: string;
|
|
7
7
|
ids?: string[];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -18,17 +18,23 @@ var PrintAction = /** @class */ (function () {
|
|
|
18
18
|
function PrintAction() {
|
|
19
19
|
}
|
|
20
20
|
PrintAction.prototype.run = function (action, renderer, event) {
|
|
21
|
-
var _a, _b;
|
|
21
|
+
var _a, _b, _c, _d;
|
|
22
22
|
return __awaiter(this, void 0, void 0, function () {
|
|
23
|
-
var element, elements_1;
|
|
24
|
-
return __generator(this, function (
|
|
25
|
-
|
|
23
|
+
var targetComponent, element, elements_1;
|
|
24
|
+
return __generator(this, function (_e) {
|
|
25
|
+
// 兼容之前的 word 打印
|
|
26
|
+
if (action.componentId) {
|
|
27
|
+
targetComponent = (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentById(action.componentId);
|
|
28
|
+
(_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);
|
|
29
|
+
return [2 /*return*/];
|
|
30
|
+
}
|
|
31
|
+
if ((_c = action.args) === null || _c === void 0 ? void 0 : _c.id) {
|
|
26
32
|
element = document.querySelector("[data-id='".concat(action.args.id, "']"));
|
|
27
33
|
if (element) {
|
|
28
34
|
printElements([element]);
|
|
29
35
|
}
|
|
30
36
|
}
|
|
31
|
-
else if ((
|
|
37
|
+
else if ((_d = action.args) === null || _d === void 0 ? void 0 : _d.ids) {
|
|
32
38
|
elements_1 = [];
|
|
33
39
|
action.args.ids.forEach(function (id) {
|
|
34
40
|
var element = document.querySelector("[data-id='".concat(id, "']"));
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { __awaiter, __generator, __values } from 'tslib';
|
|
7
|
-
import {
|
|
7
|
+
import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
|
|
8
8
|
import { registerAction, runActions } from './Action.js';
|
|
9
9
|
|
|
10
10
|
/**
|
|
@@ -29,7 +29,7 @@ var SwitchAction = /** @class */ (function () {
|
|
|
29
29
|
if (!branch.expression) {
|
|
30
30
|
return [3 /*break*/, 4];
|
|
31
31
|
}
|
|
32
|
-
return [4 /*yield*/,
|
|
32
|
+
return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(branch.expression, mergeData)];
|
|
33
33
|
case 2:
|
|
34
34
|
isPass = _d.sent();
|
|
35
35
|
if (!isPass) return [3 /*break*/, 4];
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,7 +9,8 @@ import { insertCustomStyle, removeCustomStyle, insertEditCustomStyle } from '../
|
|
|
9
9
|
var styleIdCount = new Map();
|
|
10
10
|
function CustomStyle (props) {
|
|
11
11
|
var config = props.config, env = props.env, data = props.data;
|
|
12
|
-
var themeCss = config.themeCss, classNames = config.classNames,
|
|
12
|
+
var themeCss = config.themeCss, classNames = config.classNames, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
|
|
13
|
+
var id = config.id ? "".concat(config.id) : config.id;
|
|
13
14
|
useEffect(function () {
|
|
14
15
|
if (styleIdCount.has(id)) {
|
|
15
16
|
styleIdCount.set(id, styleIdCount.get(id) + 1);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -26,6 +26,7 @@ import '../utils/filter.js';
|
|
|
26
26
|
import 'lodash/isObject';
|
|
27
27
|
import 'lodash/isString';
|
|
28
28
|
import 'lodash/isBoolean';
|
|
29
|
+
import '@rc-component/mini-decimal';
|
|
29
30
|
import '../utils/image.js';
|
|
30
31
|
import 'lodash/isEqual';
|
|
31
32
|
import '../actions/Action.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.
|
|
2
|
+
* amis-core v6.6.0
|
|
3
3
|
* Copyright 2018-2024 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -24,6 +24,7 @@ import '../utils/filter.js';
|
|
|
24
24
|
import 'lodash/isObject';
|
|
25
25
|
import 'lodash/isString';
|
|
26
26
|
import 'lodash/isBoolean';
|
|
27
|
+
import '@rc-component/mini-decimal';
|
|
27
28
|
import '../utils/image.js';
|
|
28
29
|
import 'lodash/isEqual';
|
|
29
30
|
import '../actions/Action.js';
|
package/esm/env.d.ts
CHANGED
|
@@ -112,11 +112,9 @@ export interface EnvProps {
|
|
|
112
112
|
env: RendererEnv;
|
|
113
113
|
}
|
|
114
114
|
export declare function withRendererEnv<T extends React.ComponentType<React.ComponentProps<T> & EnvProps>>(ComposedComponent: T): {
|
|
115
|
-
new (props:
|
|
116
|
-
env?: RendererEnv | undefined;
|
|
117
|
-
}) | Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
|
|
115
|
+
new (props: JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
|
|
118
116
|
env?: RendererEnv | undefined;
|
|
119
|
-
}
|
|
117
|
+
}): {
|
|
120
118
|
render(): React.JSX.Element;
|
|
121
119
|
context: unknown;
|
|
122
120
|
setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<JSX.LibraryManagedAttributes<T, Omit<React.ComponentProps<T>, "env">> & {
|
package/esm/env.js
CHANGED
package/esm/envOverwrite.js
CHANGED
package/esm/factory.js
CHANGED