amis-core 6.12.0-beta.10 → 6.12.0-beta.12
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 +1 -1
- package/esm/StatusScoped.js +1 -1
- package/esm/StyleManager.js +1 -1
- package/esm/WithRootStore.js +1 -1
- package/esm/WithStore.js +1 -1
- 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.js +1 -1
- package/esm/actions/ContinueAction.js +1 -1
- package/esm/actions/CopyAction.js +1 -1
- package/esm/actions/CustomAction.js +1 -1
- package/esm/actions/DialogAction.js +1 -1
- package/esm/actions/DrawerAction.js +1 -1
- package/esm/actions/EmailAction.js +1 -1
- package/esm/actions/EventAction.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/PrintAction.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/actions/WaitAction.js +1 -1
- package/esm/components/Animations.js +1 -1
- package/esm/components/CustomStyle.js +1 -1
- package/esm/components/ErrorBoundary.js +1 -1
- package/esm/components/LazyComponent.js +1 -1
- package/esm/components/Overlay.js +1 -1
- package/esm/components/PopOver.js +1 -1
- package/esm/env.js +1 -1
- package/esm/envOverwrite.js +1 -1
- package/esm/factory.js +1 -1
- package/esm/globalVar.js +1 -1
- package/esm/globalVarClientHandler.js +1 -1
- package/esm/globalVarDefaultValueHandler.js +1 -1
- package/esm/index.js +4 -4
- package/esm/locale.js +1 -1
- package/esm/polyfills.js +1 -1
- package/esm/renderers/Form.js +1 -1
- package/esm/renderers/Item.js +1 -1
- package/esm/renderers/Options.js +1 -1
- 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 +1 -1
- package/esm/store/app.js +1 -1
- package/esm/store/combo.js +1 -1
- package/esm/store/crud.d.ts +4 -2
- package/esm/store/crud.js +27 -22
- package/esm/store/form.js +1 -1
- package/esm/store/formItem.js +1 -1
- package/esm/store/iRenderer.js +1 -1
- package/esm/store/index.js +4 -2
- 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 +1 -1
- package/esm/store/service.js +1 -1
- package/esm/store/status.js +1 -1
- package/esm/store/table.d.ts +1 -0
- package/esm/store/table.js +28 -20
- package/esm/store/table2.js +4 -3
- 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/animations.js +1 -1
- package/esm/utils/api.js +1 -1
- 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.js +1 -1
- 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 +1 -1
- package/esm/utils/filter.js +1 -1
- package/esm/utils/formatDuration.js +1 -1
- package/esm/utils/formula.js +1 -1
- package/esm/utils/getPageId.d.ts +1 -0
- package/esm/utils/getPageId.js +16 -0
- 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.js +1 -1
- package/esm/utils/highlight.js +1 -1
- package/esm/utils/icon.js +1 -1
- package/esm/utils/image.js +1 -1
- package/esm/utils/index.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/loopTooMuch.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/printElement.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 +1 -1
- 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/validateId.js +1 -1
- package/esm/utils/validations.js +1 -1
- package/esm/utils/visitedCache.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 +1 -1
- package/lib/StatusScoped.js +1 -1
- package/lib/StyleManager.js +1 -1
- package/lib/WithRootStore.js +1 -1
- package/lib/WithStore.js +1 -1
- 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.js +1 -1
- package/lib/actions/ContinueAction.js +1 -1
- package/lib/actions/CopyAction.js +1 -1
- package/lib/actions/CustomAction.js +1 -1
- package/lib/actions/DialogAction.js +1 -1
- package/lib/actions/DrawerAction.js +1 -1
- package/lib/actions/EmailAction.js +1 -1
- package/lib/actions/EventAction.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/PrintAction.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/actions/WaitAction.js +1 -1
- package/lib/components/Animations.js +1 -1
- package/lib/components/CustomStyle.js +1 -1
- package/lib/components/ErrorBoundary.js +1 -1
- package/lib/components/LazyComponent.js +1 -1
- package/lib/components/Overlay.js +1 -1
- package/lib/components/PopOver.js +1 -1
- package/lib/env.js +1 -1
- package/lib/envOverwrite.js +1 -1
- package/lib/factory.js +1 -1
- package/lib/globalVar.js +1 -1
- package/lib/globalVarClientHandler.js +1 -1
- package/lib/globalVarDefaultValueHandler.js +1 -1
- package/lib/index.js +4 -4
- package/lib/locale.js +1 -1
- package/lib/polyfills.js +1 -1
- package/lib/renderers/Form.js +1 -1
- package/lib/renderers/Item.d.ts +1 -1
- package/lib/renderers/Item.js +1 -1
- package/lib/renderers/Options.js +1 -1
- 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 +1 -1
- package/lib/store/app.js +1 -1
- package/lib/store/combo.d.ts +1 -0
- package/lib/store/combo.js +1 -1
- package/lib/store/crud.d.ts +4 -2
- package/lib/store/crud.js +27 -22
- package/lib/store/form.d.ts +1 -0
- package/lib/store/form.js +1 -1
- package/lib/store/formItem.js +1 -1
- package/lib/store/iRenderer.js +1 -1
- package/lib/store/index.js +4 -2
- package/lib/store/list.d.ts +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 +1 -1
- package/lib/store/service.js +1 -1
- package/lib/store/status.js +1 -1
- package/lib/store/table.d.ts +2 -1
- package/lib/store/table.js +27 -19
- package/lib/store/table2.d.ts +1 -1
- package/lib/store/table2.js +4 -3
- 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/animations.js +1 -1
- package/lib/utils/api.js +1 -1
- 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.js +1 -1
- 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 +1 -1
- package/lib/utils/filter.js +1 -1
- package/lib/utils/formatDuration.js +1 -1
- package/lib/utils/formula.js +1 -1
- package/lib/utils/getPageId.d.ts +1 -0
- package/lib/utils/getPageId.js +20 -0
- 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.js +1 -1
- package/lib/utils/highlight.js +1 -1
- package/lib/utils/icon.js +1 -1
- package/lib/utils/image.js +1 -1
- package/lib/utils/index.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/loopTooMuch.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/printElement.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 +1 -1
- 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/validateId.js +1 -1
- package/lib/utils/validations.js +1 -1
- package/lib/utils/visitedCache.js +1 -1
- package/package.json +1 -1
package/lib/store/crud.d.ts
CHANGED
|
@@ -58,7 +58,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
|
|
|
58
58
|
items: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
|
|
59
59
|
selectedItems: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
|
|
60
60
|
unSelectedItems: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>, [undefined]>;
|
|
61
|
-
|
|
61
|
+
filterTogglable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
62
62
|
filterVisible: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
63
63
|
hasInnerModalOpen: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
64
64
|
}, {
|
|
@@ -139,12 +139,13 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
|
|
|
139
139
|
isTable2?: Boolean;
|
|
140
140
|
minLoadingTime?: number;
|
|
141
141
|
dataAppendTo?: 'top' | 'bottom';
|
|
142
|
+
totalField?: string;
|
|
142
143
|
}) => Promise<any>;
|
|
143
144
|
changePage: (page: number | string, perPage?: number | string) => void;
|
|
144
145
|
changePerPage: (perPage: number | string) => void;
|
|
145
146
|
selectAction: (action: ActionObject) => void;
|
|
146
147
|
saveRemote: (api: Api, data?: object, options?: fetchOptions) => Promise<any>;
|
|
147
|
-
setFilterTogglable: (
|
|
148
|
+
setFilterTogglable: (togglable: boolean, filterVisible?: boolean) => void;
|
|
148
149
|
setFilterVisible: (visible: boolean) => void;
|
|
149
150
|
setSelectedItems: (items: Array<any>) => void;
|
|
150
151
|
setUnSelectedItems: (items: Array<any>) => void;
|
|
@@ -152,6 +153,7 @@ export declare const CRUDStore: import("mobx-state-tree").IModelType<{
|
|
|
152
153
|
initFromScope: (scope: any, source: string, options: {
|
|
153
154
|
columns?: Array<any>;
|
|
154
155
|
matchFunc?: MatchFunc | null;
|
|
156
|
+
totalField?: string;
|
|
155
157
|
}) => void;
|
|
156
158
|
exportAsCSV: (options?: {
|
|
157
159
|
loadDataOnce?: boolean | undefined;
|
package/lib/store/crud.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.12
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -54,7 +54,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
54
54
|
items: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
|
|
55
55
|
selectedItems: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
|
|
56
56
|
unSelectedItems: mobxStateTree.types.optional(mobxStateTree.types.array(mobxStateTree.types.frozen()), []),
|
|
57
|
-
|
|
57
|
+
filterTogglable: false,
|
|
58
58
|
filterVisible: true,
|
|
59
59
|
hasInnerModalOpen: false
|
|
60
60
|
})
|
|
@@ -142,13 +142,13 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
142
142
|
}
|
|
143
143
|
var fetchInitData = mobxStateTree.flow(function getInitData(api$1, data, options) {
|
|
144
144
|
var startTime, rawItems, matchFunc, items, dir, data_1, ctx, json, elapsedTime, remainingTime_1, result, total, count, page, hasNext, oItems, oRows, columns, rest, items, _a, _b, key, rowsData, data_2, filteredItems, dir, e_1, env;
|
|
145
|
-
var _c, e_2,
|
|
146
|
-
var
|
|
145
|
+
var _c, _d, e_2, _e;
|
|
146
|
+
var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
|
|
147
147
|
if (options === void 0) { options = {}; }
|
|
148
|
-
return tslib.__generator(this, function (
|
|
149
|
-
switch (
|
|
148
|
+
return tslib.__generator(this, function (_r) {
|
|
149
|
+
switch (_r.label) {
|
|
150
150
|
case 0:
|
|
151
|
-
|
|
151
|
+
_r.trys.push([0, 6, , 7]);
|
|
152
152
|
startTime = Date.now();
|
|
153
153
|
rawItems = options.source
|
|
154
154
|
? resolveVariableAndFilter.resolveVariableAndFilter(options.source, object.createObject(self.mergedData, {
|
|
@@ -169,8 +169,10 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
169
169
|
dir = /desc/i.test(self.query.orderDir) ? -1 : 1;
|
|
170
170
|
items = helper.sortArray(items, self.query.orderBy, dir);
|
|
171
171
|
}
|
|
172
|
-
data_1 = tslib.__assign(tslib.__assign({}, self.data), { total
|
|
173
|
-
self.total =
|
|
172
|
+
data_1 = tslib.__assign(tslib.__assign({}, self.data), (_c = {}, _c[options.totalField || 'total'] = items.length, _c.items = items.slice((self.page - 1) * self.perPage, self.page * self.perPage), _c));
|
|
173
|
+
self.total =
|
|
174
|
+
parseInt((_f = data_1[options.totalField || 'total']) !== null && _f !== void 0 ? _f : data_1.count, 10) ||
|
|
175
|
+
0;
|
|
174
176
|
self.reInitData(data_1);
|
|
175
177
|
return [2 /*return*/];
|
|
176
178
|
}
|
|
@@ -180,17 +182,17 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
180
182
|
self.fetching = false;
|
|
181
183
|
}
|
|
182
184
|
options.silent || self.markFetching(true);
|
|
183
|
-
ctx = object.createObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), data), (
|
|
185
|
+
ctx = object.createObject(self.data, tslib.__assign(tslib.__assign(tslib.__assign({}, self.query), data), (_d = {}, _d[options.pageField || 'page'] = self.page, _d[options.perPageField || 'perPage'] = self.perPage, _d)));
|
|
184
186
|
// 一次性加载不要发送 perPage 属性
|
|
185
187
|
if (options.loadDataOnce) {
|
|
186
188
|
delete ctx[options.perPageField || 'perPage'];
|
|
187
189
|
}
|
|
188
190
|
return [4 /*yield*/, mobxStateTree.getEnv(self).fetcher(api$1, ctx, tslib.__assign(tslib.__assign({}, options), { cancelExecutor: function (executor) { return (fetchCancel = executor); } }))];
|
|
189
191
|
case 1:
|
|
190
|
-
json =
|
|
192
|
+
json = _r.sent();
|
|
191
193
|
fetchCancel = null;
|
|
192
194
|
if (!!json.ok) return [3 /*break*/, 2];
|
|
193
|
-
self.updateMessage((
|
|
195
|
+
self.updateMessage((_k = (_j = (_h = (_g = api$1 === null || api$1 === void 0 ? void 0 : api$1.messages) === null || _g === void 0 ? void 0 : _g.failed) !== null && _h !== void 0 ? _h : json.msg) !== null && _j !== void 0 ? _j : options.errorMessage) !== null && _k !== void 0 ? _k : self.__('CRUD.fetchFailed'), true);
|
|
194
196
|
!(api$1 === null || api$1 === void 0 ? void 0 : api$1.silent) &&
|
|
195
197
|
mobxStateTree.getEnv(self).notify('error', json.msg, json.msgTimeout !== undefined
|
|
196
198
|
? {
|
|
@@ -209,8 +211,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
209
211
|
if (!(remainingTime_1 > 0)) return [3 /*break*/, 4];
|
|
210
212
|
return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, remainingTime_1); })];
|
|
211
213
|
case 3:
|
|
212
|
-
|
|
213
|
-
|
|
214
|
+
_r.sent();
|
|
215
|
+
_r.label = 4;
|
|
214
216
|
case 4:
|
|
215
217
|
self.updatedAt = Date.now();
|
|
216
218
|
result = api.normalizeApiResponseData(json.data);
|
|
@@ -236,7 +238,7 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
236
238
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
237
239
|
finally {
|
|
238
240
|
try {
|
|
239
|
-
if (_b && !_b.done && (
|
|
241
|
+
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
240
242
|
}
|
|
241
243
|
finally { if (e_2) throw e_2.error; }
|
|
242
244
|
}
|
|
@@ -296,7 +298,9 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
296
298
|
self.reInitData(data_2, !!api$1.replaceData, api$1.concatDataFields);
|
|
297
299
|
options.syncResponse2Query !== false &&
|
|
298
300
|
updateQuery(pick__default["default"](rest, Object.keys(self.query)), undefined, options.pageField || 'page', options.perPageField || 'perPage');
|
|
299
|
-
self.total =
|
|
301
|
+
self.total =
|
|
302
|
+
parseInt((_l = data_2[options.totalField || 'total']) !== null && _l !== void 0 ? _l : data_2.count, 10) ||
|
|
303
|
+
0;
|
|
300
304
|
typeof page !== 'undefined' && (self.page = parseInt(page, 10));
|
|
301
305
|
// 分页情况不清楚,只能知道有没有下一页。
|
|
302
306
|
if (typeof hasNext !== 'undefined') {
|
|
@@ -304,17 +308,17 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
304
308
|
self.total = 0;
|
|
305
309
|
self.hasNext = !!hasNext;
|
|
306
310
|
}
|
|
307
|
-
self.updateMessage((
|
|
311
|
+
self.updateMessage((_q = (_p = (_o = (_m = api$1.messages) === null || _m === void 0 ? void 0 : _m.success) !== null && _o !== void 0 ? _o : json.msg) !== null && _p !== void 0 ? _p : options.successMessage) !== null && _q !== void 0 ? _q : json.defaultMsg);
|
|
308
312
|
// 配置了获取成功提示后提示,默认是空不会提示。
|
|
309
313
|
options &&
|
|
310
314
|
options.successMessage &&
|
|
311
315
|
mobxStateTree.getEnv(self).notify('success', self.msg);
|
|
312
|
-
|
|
316
|
+
_r.label = 5;
|
|
313
317
|
case 5:
|
|
314
318
|
self.markFetching(false);
|
|
315
319
|
return [2 /*return*/, json];
|
|
316
320
|
case 6:
|
|
317
|
-
e_1 =
|
|
321
|
+
e_1 = _r.sent();
|
|
318
322
|
env = mobxStateTree.getEnv(self);
|
|
319
323
|
if (!mobxStateTree.isAlive(self) || self.disposed) {
|
|
320
324
|
return [2 /*return*/];
|
|
@@ -403,8 +407,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
403
407
|
}
|
|
404
408
|
});
|
|
405
409
|
});
|
|
406
|
-
var setFilterTogglable = function (
|
|
407
|
-
self.
|
|
410
|
+
var setFilterTogglable = function (togglable, filterVisible) {
|
|
411
|
+
self.filterTogglable = togglable;
|
|
408
412
|
filterVisible !== void 0 && (self.filterVisible = filterVisible);
|
|
409
413
|
};
|
|
410
414
|
var setFilterVisible = function (visible) {
|
|
@@ -447,7 +451,8 @@ var CRUDStore = service.ServiceStore.named('CRUDStore')
|
|
|
447
451
|
var data = tslib.__assign(tslib.__assign({}, self.pristine), { items: items.length > self.perPage
|
|
448
452
|
? items.slice((self.page - 1) * self.perPage, self.page * self.perPage)
|
|
449
453
|
: items, count: items.length, total: items.length });
|
|
450
|
-
self.total =
|
|
454
|
+
self.total =
|
|
455
|
+
parseInt((_a = data[options.totalField || 'total']) !== null && _a !== void 0 ? _a : data.count, 10) || 0;
|
|
451
456
|
self.items.replace(items);
|
|
452
457
|
self.reInitData(data);
|
|
453
458
|
};
|
package/lib/store/form.d.ts
CHANGED
package/lib/store/form.js
CHANGED
package/lib/store/formItem.js
CHANGED
package/lib/store/iRenderer.js
CHANGED
package/lib/store/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.12
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -81,7 +81,9 @@ var RendererStore = mobxStateTree.types
|
|
|
81
81
|
}
|
|
82
82
|
}); });
|
|
83
83
|
var RegisterStore = function (store) {
|
|
84
|
-
|
|
84
|
+
// 外部注册的 store 优先级更高
|
|
85
|
+
// 方便外部扩充系统 Store
|
|
86
|
+
allowedStoreList.unshift(store);
|
|
85
87
|
};
|
|
86
88
|
var registerStore = RegisterStore;
|
|
87
89
|
|
package/lib/store/list.d.ts
CHANGED
|
@@ -86,7 +86,7 @@ export declare const ListStore: import("mobx-state-tree").IModelType<{
|
|
|
86
86
|
}, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>>;
|
|
87
87
|
primaryField: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
88
88
|
orderBy: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
89
|
-
orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"
|
|
89
|
+
orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"asc" | "desc", "asc" | "desc", "asc" | "desc">, [undefined]>;
|
|
90
90
|
draggable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
91
91
|
dragging: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
92
92
|
multiple: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
package/lib/store/list.js
CHANGED
package/lib/store/manager.js
CHANGED
package/lib/store/modal.js
CHANGED
package/lib/store/node.js
CHANGED
package/lib/store/pagination.js
CHANGED
package/lib/store/root.js
CHANGED
package/lib/store/service.js
CHANGED
package/lib/store/status.js
CHANGED
package/lib/store/table.d.ts
CHANGED
|
@@ -290,7 +290,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
|
|
|
290
290
|
expandedRows: import("mobx-state-tree").IArrayType<import("mobx-state-tree").ISimpleType<string>>;
|
|
291
291
|
primaryField: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
292
292
|
orderBy: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
293
|
-
orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"" | "
|
|
293
|
+
orderDir: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"" | "asc" | "desc", "" | "asc" | "desc", "" | "asc" | "desc">, [undefined]>;
|
|
294
294
|
loading: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
295
295
|
canAccessSuperData: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
296
296
|
draggable: import("mobx-state-tree").IType<boolean | undefined, boolean, boolean>;
|
|
@@ -345,6 +345,7 @@ export declare const TableStore: import("mobx-state-tree").IModelType<{
|
|
|
345
345
|
getDialogScoped(): import("..").IScopedContext | null;
|
|
346
346
|
getDrawerScoped(): import("..").IScopedContext | null;
|
|
347
347
|
} & {
|
|
348
|
+
readonly __: any;
|
|
348
349
|
getSelectionUpperLimit: () => number;
|
|
349
350
|
readonly columnsKey: string;
|
|
350
351
|
readonly columnsData: ({
|
package/lib/store/table.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.12
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -24,6 +24,7 @@ var sortBy = require('lodash/sortBy');
|
|
|
24
24
|
var helper = require('../utils/helper.js');
|
|
25
25
|
var tpl = require('../utils/tpl.js');
|
|
26
26
|
var manager = require('./manager.js');
|
|
27
|
+
var getPageId = require('../utils/getPageId.js');
|
|
27
28
|
|
|
28
29
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
29
30
|
|
|
@@ -615,9 +616,12 @@ var TableStore = iRenderer.iRendererStore
|
|
|
615
616
|
return selectionUpperLimit;
|
|
616
617
|
}
|
|
617
618
|
return {
|
|
619
|
+
get __() {
|
|
620
|
+
return mobxStateTree.getEnv(self).translate;
|
|
621
|
+
},
|
|
618
622
|
getSelectionUpperLimit: getSelectionUpperLimit,
|
|
619
623
|
get columnsKey() {
|
|
620
|
-
return
|
|
624
|
+
return getPageId.getPageId() + self.path;
|
|
621
625
|
},
|
|
622
626
|
get columnsData() {
|
|
623
627
|
return getColumnsExceptBuiltinTypes();
|
|
@@ -935,28 +939,32 @@ var TableStore = iRenderer.iRendererStore
|
|
|
935
939
|
label: '空'
|
|
936
940
|
});
|
|
937
941
|
}
|
|
938
|
-
if (self.showIndex) {
|
|
942
|
+
if (self.showIndex && !columns.some(function (item) { return item.type === '__index'; })) {
|
|
939
943
|
columns.unshift({
|
|
940
944
|
type: '__index',
|
|
945
|
+
label: self.__('Table.index'),
|
|
941
946
|
width: 50
|
|
942
947
|
});
|
|
943
948
|
}
|
|
944
|
-
columns.
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
949
|
+
columns.some(function (item) { return item.type === '__expandme'; }) ||
|
|
950
|
+
columns.unshift({
|
|
951
|
+
type: '__expandme',
|
|
952
|
+
toggable: false,
|
|
953
|
+
className: 'Table-expandCell'
|
|
954
|
+
});
|
|
955
|
+
columns.some(function (item) { return item.type === '__checkme'; }) ||
|
|
956
|
+
columns.unshift({
|
|
957
|
+
type: '__checkme',
|
|
958
|
+
fixed: 'left',
|
|
959
|
+
toggable: false,
|
|
960
|
+
className: 'Table-checkCell'
|
|
961
|
+
});
|
|
962
|
+
columns.some(function (item) { return item.type === '__dragme'; }) ||
|
|
963
|
+
columns.unshift({
|
|
964
|
+
type: '__dragme',
|
|
965
|
+
toggable: false,
|
|
966
|
+
className: 'Table-dragCell'
|
|
967
|
+
});
|
|
960
968
|
var originColumns_1 = self.columns.concat();
|
|
961
969
|
var ids_1 = [];
|
|
962
970
|
columns = columns.map(function (item, index) {
|
package/lib/store/table2.d.ts
CHANGED
|
@@ -139,7 +139,7 @@ export declare const TableStore2: import("mobx-state-tree").IModelType<{
|
|
|
139
139
|
expandedRowKeys: import("mobx-state-tree").IArrayType<import("mobx-state-tree").IType<any, any, any>>;
|
|
140
140
|
columnsTogglable: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<boolean | "auto", boolean | "auto", boolean | "auto">, [undefined]>;
|
|
141
141
|
orderBy: import("mobx-state-tree").IType<string | undefined, string, string>;
|
|
142
|
-
order: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"
|
|
142
|
+
order: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").ITypeUnion<"asc" | "desc", "asc" | "desc", "asc" | "desc">, [undefined]>;
|
|
143
143
|
query: import("mobx-state-tree").IOptionalIType<import("mobx-state-tree").IType<any, any, any>, [undefined]>;
|
|
144
144
|
pageNo: import("mobx-state-tree").IType<number | undefined, number, number>;
|
|
145
145
|
pageSize: import("mobx-state-tree").IType<number | undefined, number, number>;
|
package/lib/store/table2.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-core v6.12.0-beta.
|
|
2
|
+
* amis-core v6.12.0-beta.12
|
|
3
3
|
* Copyright 2018-2025 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -14,6 +14,7 @@ var isEqual = require('lodash/isEqual');
|
|
|
14
14
|
var helper = require('../utils/helper.js');
|
|
15
15
|
var api = require('../utils/api.js');
|
|
16
16
|
var service = require('./service.js');
|
|
17
|
+
var getPageId = require('../utils/getPageId.js');
|
|
17
18
|
var object = require('../utils/object.js');
|
|
18
19
|
|
|
19
20
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
@@ -366,7 +367,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
|
|
|
366
367
|
persistSaveToggledColumns();
|
|
367
368
|
}
|
|
368
369
|
function persistSaveToggledColumns() {
|
|
369
|
-
var key =
|
|
370
|
+
var key = getPageId.getPageId() +
|
|
370
371
|
self.path +
|
|
371
372
|
self.toggableColumns.map(function (item) { return item.name || item.index; }).join('-');
|
|
372
373
|
localStorage.setItem(key, JSON.stringify(self.activeToggaleColumns.map(function (item) { return item.index; })));
|
|
@@ -600,7 +601,7 @@ var TableStore2 = service.ServiceStore.named('TableStore2')
|
|
|
600
601
|
if (!mobxStateTree.isAlive(self)) {
|
|
601
602
|
return;
|
|
602
603
|
}
|
|
603
|
-
var key =
|
|
604
|
+
var key = getPageId.getPageId() +
|
|
604
605
|
self.path +
|
|
605
606
|
self.toggableColumns.map(function (item) { return item.name || item.index; }).join('-');
|
|
606
607
|
var data = localStorage.getItem(key);
|
package/lib/theme.js
CHANGED
package/lib/utils/Animation.js
CHANGED
package/lib/utils/ColorScale.js
CHANGED
package/lib/utils/DataSchema.js
CHANGED
package/lib/utils/DataScope.js
CHANGED
package/lib/utils/RootClose.js
CHANGED
package/lib/utils/SimpleMap.js
CHANGED
package/lib/utils/animations.js
CHANGED
package/lib/utils/api.js
CHANGED
package/lib/utils/arraySlice.js
CHANGED
package/lib/utils/autobind.js
CHANGED
package/lib/utils/browser.js
CHANGED
package/lib/utils/concatData.js
CHANGED
package/lib/utils/dataMapping.js
CHANGED
package/lib/utils/date.js
CHANGED
package/lib/utils/debug.js
CHANGED
package/lib/utils/dom.js
CHANGED
package/lib/utils/errors.js
CHANGED
package/lib/utils/escapeHtml.js
CHANGED
package/lib/utils/filter.js
CHANGED