amis-core 3.4.1 → 3.4.3
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 +1 -1
- package/esm/Scoped.js +2 -2
- package/esm/StatusScoped.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +8 -4
- package/esm/actions/Action.js +1 -1
- package/esm/actions/AjaxAction.js +1 -1
- package/esm/actions/BreakAction.js +1 -1
- package/esm/actions/BroadcastAction.js +1 -1
- package/esm/actions/CmptAction.d.ts +1 -0
- package/esm/actions/CmptAction.js +23 -23
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +2 -2
- package/esm/actions/DialogAction.js +1 -1
- package/esm/actions/DrawerAction.js +5 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/LinkAction.js +1 -1
- package/esm/actions/LoopAction.js +1 -1
- package/esm/actions/PageAction.js +1 -1
- package/esm/actions/ParallelAction.js +1 -1
- package/esm/actions/StatusAction.js +1 -1
- package/esm/actions/SwitchAction.js +1 -1
- package/esm/actions/ToastAction.js +1 -1
- package/esm/components/CustomStyle.d.ts +1 -0
- package/esm/components/CustomStyle.js +21 -4
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.js +2 -1
- package/esm/components/PopOver.js +2 -2
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/index.js +3 -3
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +8 -2
- package/esm/renderers/Item.js +2 -2
- package/esm/renderers/Options.js +2 -2
- 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 +2 -2
- package/esm/store/app.js +2 -2
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.d.ts +0 -1
- package/esm/store/crud.js +32 -25
- package/esm/store/form.js +5 -2
- package/esm/store/formItem.js +2 -2
- package/esm/store/iRenderer.js +2 -2
- package/esm/store/index.js +1 -1
- package/esm/store/list.js +1 -1
- package/esm/store/manager.js +1 -1
- package/esm/store/modal.js +1 -1
- package/esm/store/node.js +1 -1
- package/esm/store/pagination.js +1 -1
- package/esm/store/root.js +2 -2
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +36 -18
- package/esm/store/table.js +12 -6
- package/esm/store/table2.d.ts +1 -1
- package/esm/store/table2.js +5 -4
- package/esm/theme.js +1 -1
- 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 +1 -1
- package/esm/utils/RootClose.js +1 -1
- package/esm/utils/SimpleMap.js +1 -1
- package/esm/utils/api.js +4 -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/columnsSplit.js +1 -1
- package/esm/utils/dataMapping.js +1 -1
- package/esm/utils/date.js +1 -1
- package/esm/utils/debug.d.ts +1 -1
- package/esm/utils/debug.js +5 -3
- 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 +16 -12
- package/esm/utils/filter.js +1 -1
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +1 -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 +2 -1
- package/esm/utils/helper.js +15 -10
- 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/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.js +1 -1
- 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/renderer-event.js +1 -1
- package/esm/utils/replaceText.js +1 -1
- package/esm/utils/resize-sensor.js +1 -1
- package/esm/utils/resolveCondition.js +1 -1
- 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 +1 -1
- package/esm/utils/style-helper.js +3 -2
- package/esm/utils/style.js +1 -1
- package/esm/utils/toNumber.js +1 -1
- package/esm/utils/tokenize.js +1 -1
- package/esm/utils/tpl-builtin.js +1 -1
- package/esm/utils/tpl-lodash.js +1 -1
- package/esm/utils/tpl.js +1 -1
- package/esm/utils/uncontrollable.js +1 -1
- package/esm/utils/validations.js +1 -1
- package/lib/Root.js +1 -1
- package/lib/RootRenderer.js +1 -1
- package/lib/SchemaRenderer.js +1 -1
- package/lib/Scoped.js +2 -2
- package/lib/StatusScoped.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +8 -4
- package/lib/actions/Action.js +1 -1
- package/lib/actions/AjaxAction.js +1 -1
- package/lib/actions/BreakAction.js +1 -1
- package/lib/actions/BroadcastAction.js +1 -1
- package/lib/actions/CmptAction.d.ts +1 -0
- package/lib/actions/CmptAction.js +23 -23
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +2 -2
- package/lib/actions/DialogAction.js +1 -1
- package/lib/actions/DrawerAction.js +5 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/LinkAction.js +1 -1
- package/lib/actions/LoopAction.js +1 -1
- package/lib/actions/PageAction.js +1 -1
- package/lib/actions/ParallelAction.js +1 -1
- package/lib/actions/StatusAction.js +1 -1
- package/lib/actions/SwitchAction.js +1 -1
- package/lib/actions/ToastAction.js +1 -1
- package/lib/components/CustomStyle.d.ts +1 -0
- package/lib/components/CustomStyle.js +21 -3
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +2 -1
- package/lib/components/PopOver.js +2 -2
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/index.js +3 -2
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +8 -2
- package/lib/renderers/Item.d.ts +1 -1
- package/lib/renderers/Item.js +2 -2
- package/lib/renderers/Options.js +2 -2
- 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 +2 -2
- package/lib/store/app.js +2 -2
- package/lib/store/combo.d.ts +24 -24
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.d.ts +0 -1
- package/lib/store/crud.js +32 -25
- package/lib/store/form.d.ts +10 -11
- package/lib/store/form.js +5 -2
- package/lib/store/formItem.js +2 -2
- package/lib/store/iRenderer.js +2 -2
- package/lib/store/index.js +1 -1
- package/lib/store/list.js +1 -1
- package/lib/store/manager.js +1 -1
- package/lib/store/modal.js +1 -1
- package/lib/store/node.js +1 -1
- package/lib/store/pagination.js +1 -1
- package/lib/store/root.js +2 -2
- package/lib/store/service.js +1 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +56 -38
- package/lib/store/table.js +12 -6
- package/lib/store/table2.d.ts +1 -1
- package/lib/store/table2.js +5 -4
- package/lib/theme.js +1 -1
- 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 +1 -1
- package/lib/utils/RootClose.js +1 -1
- package/lib/utils/SimpleMap.js +1 -1
- package/lib/utils/api.js +4 -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/columnsSplit.js +1 -1
- package/lib/utils/dataMapping.js +1 -1
- package/lib/utils/date.js +1 -1
- package/lib/utils/debug.d.ts +1 -1
- package/lib/utils/debug.js +4 -2
- 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 +16 -13
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +1 -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 +2 -1
- package/lib/utils/helper.js +15 -9
- 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/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.js +1 -1
- 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/renderer-event.js +1 -1
- package/lib/utils/replaceText.js +1 -1
- package/lib/utils/resize-sensor.js +1 -1
- package/lib/utils/resolveCondition.js +1 -1
- 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 +1 -1
- package/lib/utils/style-helper.js +4 -2
- package/lib/utils/style.js +1 -1
- package/lib/utils/toNumber.js +1 -1
- package/lib/utils/tokenize.js +1 -1
- package/lib/utils/tpl-builtin.js +1 -1
- package/lib/utils/tpl-lodash.js +1 -1
- package/lib/utils/tpl.js +1 -1
- package/lib/utils/uncontrollable.js +1 -1
- package/lib/utils/validations.js +1 -1
- package/package.json +3 -3
package/esm/store/table.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -37,7 +37,6 @@ var Column = types
|
|
|
37
37
|
toggable: true,
|
|
38
38
|
expandable: false,
|
|
39
39
|
checkdisable: false,
|
|
40
|
-
isPrimary: false,
|
|
41
40
|
searchable: types.maybe(types.frozen()),
|
|
42
41
|
enableSearch: true,
|
|
43
42
|
sortable: false,
|
|
@@ -53,6 +52,13 @@ var Column = types
|
|
|
53
52
|
remark: types.optional(types.frozen(), undefined),
|
|
54
53
|
className: types.union(types.string, types.frozen())
|
|
55
54
|
})
|
|
55
|
+
.views(function (self) { return ({
|
|
56
|
+
get isPrimary() {
|
|
57
|
+
var _a;
|
|
58
|
+
var table = getParent(self, 2);
|
|
59
|
+
return ((_a = table.filteredColumns[0]) === null || _a === void 0 ? void 0 : _a.id) === self.id;
|
|
60
|
+
}
|
|
61
|
+
}); })
|
|
56
62
|
.actions(function (self) { return ({
|
|
57
63
|
toggleToggle: function (min) {
|
|
58
64
|
if (min === void 0) { min = 1; }
|
|
@@ -754,9 +760,9 @@ var TableStore = iRendererStore
|
|
|
754
760
|
var originColumns_1 = self.columns.concat();
|
|
755
761
|
columns = columns.map(function (item, index) {
|
|
756
762
|
var origin = item.id
|
|
757
|
-
? originColumns_1.find(function (column) { return column.id === item.id; })
|
|
763
|
+
? originColumns_1.find(function (column) { return column.pristine.id === item.id; })
|
|
758
764
|
: originColumns_1[index];
|
|
759
|
-
return __assign(__assign({}, item), { id: guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint,
|
|
765
|
+
return __assign(__assign({}, item), { id: (origin === null || origin === void 0 ? void 0 : origin.id) || guid(), index: index, width: (origin === null || origin === void 0 ? void 0 : origin.width) || 0, minWidth: (origin === null || origin === void 0 ? void 0 : origin.minWidth) || 0, realWidth: (origin === null || origin === void 0 ? void 0 : origin.realWidth) || 0, rawIndex: index - PARTITION_INDEX, type: item.type || 'plain', pristine: item.pristine || item, toggled: item.toggled !== false, breakpoint: item.breakpoint,
|
|
760
766
|
/** 提前映射变量,方便后续view中使用 */
|
|
761
767
|
label: isPureVariable(item.label)
|
|
762
768
|
? resolveVariableAndFilter(item.label, self.data)
|
|
@@ -836,11 +842,11 @@ var TableStore = iRendererStore
|
|
|
836
842
|
if (!table) {
|
|
837
843
|
return;
|
|
838
844
|
}
|
|
839
|
-
var cols = [].slice.call(table.querySelectorAll(':scope>
|
|
845
|
+
var cols = [].slice.call(table.querySelectorAll(':scope>thead>tr>th[data-index]'));
|
|
840
846
|
cols.forEach(function (col) {
|
|
841
847
|
var index = parseInt(col.getAttribute('data-index'), 10);
|
|
842
848
|
var column = self.columns[index];
|
|
843
|
-
column.setRealWidth(col.
|
|
849
|
+
column.setRealWidth(col.offsetWidth);
|
|
844
850
|
});
|
|
845
851
|
}
|
|
846
852
|
function combineCell(arr, keys) {
|
package/esm/store/table2.d.ts
CHANGED
|
@@ -388,7 +388,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
|
|
|
388
388
|
reset(): void;
|
|
389
389
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | null;
|
|
390
390
|
isSelected: (row: IRow2) => boolean;
|
|
391
|
-
getRowByIndex: (rowIndex: number, levels?: Array<
|
|
391
|
+
getRowByIndex: (rowIndex: number, levels?: Array<number>, rows?: Array<IRow2>) => IRow2;
|
|
392
392
|
readonly moved: number;
|
|
393
393
|
readonly movedRows: (import("mobx-state-tree").ModelCreationType<import("mobx-state-tree/dist/internal").ExtractCFromProps<{
|
|
394
394
|
storeType: import("mobx-state-tree").IType<string | undefined, string, string>;
|
package/esm/store/table2.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -195,12 +195,13 @@ var TableStore2 = ServiceStore.named('TableStore2')
|
|
|
195
195
|
unSelectedItems: getUnSelectedRows().map(function (item) { return item.data; })
|
|
196
196
|
});
|
|
197
197
|
}
|
|
198
|
-
function getRowByIndex(rowIndex, levels) {
|
|
198
|
+
function getRowByIndex(rowIndex, levels, rows) {
|
|
199
|
+
rows = rows || self.rows;
|
|
199
200
|
if (levels && levels.length > 0) {
|
|
200
201
|
var index = +(levels.shift() || 0);
|
|
201
|
-
return getRowByIndex(
|
|
202
|
+
return getRowByIndex(rowIndex, levels, rows[index].children);
|
|
202
203
|
}
|
|
203
|
-
return
|
|
204
|
+
return rows[rowIndex];
|
|
204
205
|
}
|
|
205
206
|
function isSelected(row) {
|
|
206
207
|
return !!~self.selectedRows.indexOf(row);
|
package/esm/theme.js
CHANGED
package/esm/utils/Animation.js
CHANGED
package/esm/utils/ColorScale.js
CHANGED
package/esm/utils/DataSchema.js
CHANGED
package/esm/utils/DataScope.js
CHANGED
package/esm/utils/RootClose.js
CHANGED
package/esm/utils/SimpleMap.js
CHANGED
package/esm/utils/api.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -52,7 +52,7 @@ function buildApi(api, data, options) {
|
|
|
52
52
|
if (api.adaptor && typeof api.adaptor === 'string') {
|
|
53
53
|
api.adaptor = str2AsyncFunction(api.adaptor, 'payload', 'response', 'api', 'context');
|
|
54
54
|
}
|
|
55
|
-
if (!data
|
|
55
|
+
if (!data) {
|
|
56
56
|
return api;
|
|
57
57
|
}
|
|
58
58
|
else if (data instanceof FormData ||
|
|
@@ -144,6 +144,7 @@ function buildApi(api, data, options) {
|
|
|
144
144
|
if (ignoreData) {
|
|
145
145
|
return api;
|
|
146
146
|
}
|
|
147
|
+
var hasCustomData = api.data;
|
|
147
148
|
if (api.data) {
|
|
148
149
|
api.body = api.data = dataMapping(api.data, data, undefined, api.convertKeyToPath);
|
|
149
150
|
}
|
|
@@ -208,7 +209,7 @@ function buildApi(api, data, options) {
|
|
|
208
209
|
extendObject(data, __assign(__assign({}, api.query), data), false), undefined, false, true);
|
|
209
210
|
/** 同时设置了JSONQL和data时走兼容场景 */
|
|
210
211
|
api.body = api.data =
|
|
211
|
-
|
|
212
|
+
hasCustomData && api.jsonql
|
|
212
213
|
? {
|
|
213
214
|
data: api.data,
|
|
214
215
|
jsonql: api.jsonql
|
package/esm/utils/arraySlice.js
CHANGED
package/esm/utils/autobind.js
CHANGED
package/esm/utils/dataMapping.js
CHANGED
package/esm/utils/date.js
CHANGED
package/esm/utils/debug.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* amis 运行时调试功能,为了避免循环引用,这个组件不要依赖 amis 里的组件
|
|
3
3
|
*/
|
|
4
4
|
import React, { Component } from 'react';
|
|
5
|
-
export declare const JsonView: React.LazyExoticComponent<React.ComponentType<
|
|
5
|
+
export declare const JsonView: React.LazyExoticComponent<React.ComponentType<any>>;
|
|
6
6
|
export declare function enableDebug(): void;
|
|
7
7
|
export declare function disableDebug(): void;
|
|
8
8
|
interface DebugWrapperProps {
|
package/esm/utils/debug.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,13 +9,15 @@ import cx from 'classnames';
|
|
|
9
9
|
import { findDOMNode, render, unmountComponentAtNode } from 'react-dom';
|
|
10
10
|
import { observable, autorun } from 'mobx';
|
|
11
11
|
import { observer } from 'mobx-react';
|
|
12
|
-
import { uuidv4 } from './helper.js';
|
|
12
|
+
import { importLazyComponent, uuidv4 } from './helper.js';
|
|
13
13
|
import { position } from './position.js';
|
|
14
14
|
|
|
15
15
|
/**
|
|
16
16
|
* amis 运行时调试功能,为了避免循环引用,这个组件不要依赖 amis 里的组件
|
|
17
17
|
*/
|
|
18
|
-
var JsonView = React.lazy(function () {
|
|
18
|
+
var JsonView = React.lazy(function () {
|
|
19
|
+
return import('react-json-view').then(importLazyComponent);
|
|
20
|
+
});
|
|
19
21
|
/** @class */ ((function () {
|
|
20
22
|
function Log() {
|
|
21
23
|
this.cat = '';
|
package/esm/utils/dom.js
CHANGED
package/esm/utils/errors.js
CHANGED
package/esm/utils/escapeHtml.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { evalExpression, filter } from './tpl.js';
|
|
7
7
|
import { injectPropsToObject, mapObject } from './helper.js';
|
|
8
8
|
import isPlainObject from 'lodash/isPlainObject';
|
|
9
|
-
import
|
|
9
|
+
import { tokenize } from './tokenize.js';
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
12
|
* 处理 Props 数据,所有带 On 结束的做一次
|
|
@@ -28,13 +28,14 @@ function getExprProperties(schema, data, blackList, props) {
|
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
var parts = /^(.*)(On|Expr|(?:c|C)lassName)(Raw)?$/.exec(key);
|
|
31
|
+
var type = parts === null || parts === void 0 ? void 0 : parts[2];
|
|
31
32
|
var value = schema[key];
|
|
32
33
|
if (value &&
|
|
33
34
|
typeof value === 'string' &&
|
|
34
35
|
(parts === null || parts === void 0 ? void 0 : parts[1]) &&
|
|
35
|
-
(
|
|
36
|
+
(type === 'On' || type === 'Expr')) {
|
|
36
37
|
key = parts[1];
|
|
37
|
-
if (
|
|
38
|
+
if (type === 'On' || type === 'Expr') {
|
|
38
39
|
if (!ctx &&
|
|
39
40
|
props &&
|
|
40
41
|
typeof value === 'string' &&
|
|
@@ -43,7 +44,7 @@ function getExprProperties(schema, data, blackList, props) {
|
|
|
43
44
|
__props: props
|
|
44
45
|
});
|
|
45
46
|
}
|
|
46
|
-
if (
|
|
47
|
+
if (type === 'On') {
|
|
47
48
|
value = (props === null || props === void 0 ? void 0 : props[key]) || evalExpression(value, ctx || data);
|
|
48
49
|
}
|
|
49
50
|
else {
|
|
@@ -52,14 +53,17 @@ function getExprProperties(schema, data, blackList, props) {
|
|
|
52
53
|
}
|
|
53
54
|
exprProps[key] = value;
|
|
54
55
|
}
|
|
55
|
-
else if (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
56
|
+
else if ((type === 'className' || type === 'ClassName') &&
|
|
57
|
+
!(props === null || props === void 0 ? void 0 : props[key]) && // 如果 props 里面有则是 props 优先
|
|
58
|
+
value &&
|
|
59
|
+
(typeof value === 'string' || isPlainObject(value))) {
|
|
59
60
|
exprProps["".concat(key, "Raw")] = value;
|
|
60
|
-
exprProps[key] =
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
exprProps[key] =
|
|
62
|
+
typeof value === 'string'
|
|
63
|
+
? tokenize(value, data)
|
|
64
|
+
: mapObject(value, function (value) {
|
|
65
|
+
return typeof value === 'string' ? evalExpression(value, data) : value;
|
|
66
|
+
}, undefined, function (key) { return tokenize(key, data); });
|
|
63
67
|
}
|
|
64
68
|
});
|
|
65
69
|
return exprProps;
|
package/esm/utils/filter.js
CHANGED
package/esm/utils/formula.js
CHANGED
package/esm/utils/getVariable.js
CHANGED
package/esm/utils/grammar.js
CHANGED
package/esm/utils/helper.d.ts
CHANGED
|
@@ -273,7 +273,7 @@ export declare function qsparse(data: string, options?: any): qs.ParsedQs;
|
|
|
273
273
|
export declare function object2formData(data: any, options?: any, fd?: FormData): any;
|
|
274
274
|
export declare function chainFunctions(...fns: Array<(...args: Array<any>) => void>): (...args: Array<any>) => void;
|
|
275
275
|
export declare function chainEvents(props: any, schema: any): any;
|
|
276
|
-
export declare function mapObject(value: any,
|
|
276
|
+
export declare function mapObject(value: any, valueMapper: (value: any) => any, skipFn?: (value: any) => boolean, keyMapper?: (key: string) => string): any;
|
|
277
277
|
export declare function loadScript(src: string): Promise<void>;
|
|
278
278
|
export declare function loadStyle(href: string): Promise<void>;
|
|
279
279
|
export declare class SkipOperation extends Error {
|
|
@@ -364,3 +364,4 @@ export declare function differenceFromAll<T>(allOptions: Array<T>, options: Arra
|
|
|
364
364
|
*/
|
|
365
365
|
export declare function buildTrackExpression(schema: any): string;
|
|
366
366
|
export declare function evalTrackExpression(expression: string, data: Record<string, any>): string;
|
|
367
|
+
export declare function importLazyComponent(mod: any): any;
|
package/esm/utils/helper.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v3.4.
|
|
2
|
+
* amis-core v3.4.3
|
|
3
3
|
* Copyright 2018-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -1065,7 +1065,7 @@ function chainEvents(props, schema) {
|
|
|
1065
1065
|
});
|
|
1066
1066
|
return ret;
|
|
1067
1067
|
}
|
|
1068
|
-
function mapObject(value,
|
|
1068
|
+
function mapObject(value, valueMapper, skipFn, keyMapper) {
|
|
1069
1069
|
// 如果value值满足skipFn条件则不做map操作
|
|
1070
1070
|
skipFn =
|
|
1071
1071
|
skipFn && typeof skipFn === 'function'
|
|
@@ -1077,20 +1077,21 @@ function mapObject(value, fn, skipFn) {
|
|
|
1077
1077
|
}
|
|
1078
1078
|
return false;
|
|
1079
1079
|
};
|
|
1080
|
-
if (
|
|
1080
|
+
if (skipFn(value)) {
|
|
1081
1081
|
return value;
|
|
1082
1082
|
}
|
|
1083
1083
|
if (Array.isArray(value)) {
|
|
1084
|
-
return value.map(function (item) { return mapObject(item,
|
|
1084
|
+
return value.map(function (item) { return mapObject(item, valueMapper, skipFn, keyMapper); });
|
|
1085
1085
|
}
|
|
1086
1086
|
if (isObject(value)) {
|
|
1087
|
-
var tmpValue_1 =
|
|
1088
|
-
Object.keys(
|
|
1089
|
-
|
|
1087
|
+
var tmpValue_1 = {};
|
|
1088
|
+
Object.keys(value).forEach(function (key) {
|
|
1089
|
+
var newKey = keyMapper ? keyMapper(key) : key;
|
|
1090
|
+
tmpValue_1[newKey] = mapObject(value[key], valueMapper, skipFn, keyMapper);
|
|
1090
1091
|
});
|
|
1091
1092
|
return tmpValue_1;
|
|
1092
1093
|
}
|
|
1093
|
-
return
|
|
1094
|
+
return valueMapper(value);
|
|
1094
1095
|
}
|
|
1095
1096
|
function loadScript(src) {
|
|
1096
1097
|
return new Promise(function (ok, fail) {
|
|
@@ -1215,7 +1216,7 @@ function getScrollbarWidth() {
|
|
|
1215
1216
|
// 后续改用 FormulaExec['formula']
|
|
1216
1217
|
function resolveValueByName(data, name, canAccessSuper) {
|
|
1217
1218
|
return isPureVariable(name)
|
|
1218
|
-
? resolveVariableAndFilter(name, data)
|
|
1219
|
+
? resolveVariableAndFilter(name, data, '|raw')
|
|
1219
1220
|
: resolveVariable(name, data, canAccessSuper);
|
|
1220
1221
|
}
|
|
1221
1222
|
// 统一的获取 value 值方法
|
|
@@ -1538,5 +1539,9 @@ function evalTrackExpression(expression, data) {
|
|
|
1538
1539
|
})
|
|
1539
1540
|
.join('');
|
|
1540
1541
|
}
|
|
1542
|
+
// 很奇怪的问题,react-json-view import 有些情况下 mod.default 才是 esModule
|
|
1543
|
+
function importLazyComponent(mod) {
|
|
1544
|
+
return mod.default.__esModule ? mod.default : mod;
|
|
1545
|
+
}
|
|
1541
1546
|
|
|
1542
|
-
export { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };
|
|
1547
|
+
export { JSONTraverse, JSONValueMap, SkipOperation, ValidateError, __uri, anyChanged, autobind, buildTrackExpression, bulkBindFunctions, camel, chainEvents, chainFunctions, changedEffect, convertArrayValueToMoment, detectPropValueChanged, difference, differenceFromAll, eachTree, evalTrackExpression, everyTree, filterTree, findIndex, findObjectsWithKey, findTree, findTreeAll, findTreeIndex, flattenTree, flattenTreeWithLeafNodes, getLevelFromClassName, getPropValue, getRange, getScrollParent, getScrollbarWidth, getTree, getTreeAncestors, getTreeDepth, getTreeParent, getWidthRate, guid, hasAbility, hasFile, hasOwnPropertyInPath, hasVisibleExpression, hashCode, immutableExtends, importLazyComponent, injectPropsToObject, isArrayChildrenModified, isBreakpoint, isClickOnInput, isDisabled, isEmpty, isMobile, isNumeric, isObjectShallowModified, isSuperDataModified, isUnfolded, isVisible, lcFirst, loadScript, loadStyle, makeColumnClassBuild, makeHorizontalDeeper, mapObject, mapTree, noop, normalizeNodePath, object2formData, omitControls, padArr, parseQuery, pickEventsProps, preventDefault, promisify, qsparse, qsstringify, range, removeHTMLTag, repeatCount, rmUndefined, someTree, sortArray, spliceTree, syncDataFromSuper, ucFirst, until, uuid, uuidv4, visibilityFilter };
|
package/esm/utils/highlight.js
CHANGED
package/esm/utils/icon.js
CHANGED
package/esm/utils/image.js
CHANGED
package/esm/utils/keyToPath.js
CHANGED
package/esm/utils/makeSorter.js
CHANGED
package/esm/utils/math.js
CHANGED
package/esm/utils/memoryParse.js
CHANGED
package/esm/utils/object.js
CHANGED
package/esm/utils/offset.js
CHANGED
package/esm/utils/position.js
CHANGED
package/esm/utils/prettyBytes.js
CHANGED
package/esm/utils/replaceText.js
CHANGED