@svadmin/ui 0.108.4 → 0.108.6
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/dist/components/AboutSettings.svelte +1 -1
- package/dist/components/EmptyState.svelte +5 -5
- package/dist/components/FilterBuilder.svelte +10 -7
- package/dist/components/ListPagination.svelte +6 -6
- package/dist/components/enterprise/filter-tree.d.ts +4 -1
- package/dist/components/enterprise/filter-tree.js +28 -10
- package/dist/components/popup-portal-host.svelte +1 -1
- package/package.json +4 -4
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
const resources = $derived(adminContext.resources.filter((resource) => resource.meta?.['aboutVisible'] !== false));
|
|
12
12
|
const providerNames = $derived(adminContext.getDataProviderNames());
|
|
13
13
|
let { version: suppliedVersion, headingLevel = 'h1' }: { version?: string; headingLevel?: 'h1' | 'h2' } = $props();
|
|
14
|
-
const buildVersion = "0.108.
|
|
14
|
+
const buildVersion = "0.108.6";
|
|
15
15
|
const version = $derived(suppliedVersion ?? (
|
|
16
16
|
buildVersion.startsWith('__')
|
|
17
17
|
? (i18n.locale === 'zh-CN' ? '开发构建(未提供版本)' : 'Development build (version unavailable)')
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
const emptyDefaults = $derived(config.empty);
|
|
33
|
-
const componentEmpty = $derived(config.componentDefaults
|
|
34
|
-
const resolvedTitle = $derived(title ?? emptyDefaults.title ?? textDefault(componentEmpty
|
|
35
|
-
const resolvedDescription = $derived(description ?? emptyDefaults.description ?? textDefault(componentEmpty
|
|
36
|
-
const resolvedImage = $derived(image ?? emptyDefaults.image ?? textDefault(componentEmpty
|
|
37
|
-
const resolvedImageAlt = $derived(imageAlt ?? emptyDefaults.imageAlt ?? textDefault(componentEmpty
|
|
33
|
+
const componentEmpty = $derived(config.componentDefaults['Empty'] ?? {});
|
|
34
|
+
const resolvedTitle = $derived(title ?? emptyDefaults.title ?? textDefault(componentEmpty['title']) ?? i18n.t('empty.title'));
|
|
35
|
+
const resolvedDescription = $derived(description ?? emptyDefaults.description ?? textDefault(componentEmpty['description']) ?? i18n.t('empty.description'));
|
|
36
|
+
const resolvedImage = $derived(image ?? emptyDefaults.image ?? textDefault(componentEmpty['image']));
|
|
37
|
+
const resolvedImageAlt = $derived(imageAlt ?? emptyDefaults.imageAlt ?? textDefault(componentEmpty['imageAlt']) ?? '');
|
|
38
38
|
</script>
|
|
39
39
|
|
|
40
40
|
<div
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import type { CrudOperator, FieldDefinition, Filter } from '@svadmin/core';
|
|
10
10
|
import { isNumericFilterField as isNumericField } from '@svadmin/core';
|
|
11
11
|
import FilterCollectionInput from './FilterCollectionInput.svelte';
|
|
12
|
-
import { readFilterTree, compileFilterTree, filterOperators, parseFilterInput, isCollectionOperator, isNullOperator,
|
|
12
|
+
import { readFilterTree, compileFilterTree, filterOperators, parseFilterInput, isCollectionOperator, isListOperator, isRangeOperator, isNullOperator,
|
|
13
13
|
FILTER_EDITOR_LIMITS, type FilterGroupNode, type FilterNode, type FilterRuleNode, type FilterEditorIssue, type FilterIssueCode } from './enterprise/filter-tree.js';
|
|
14
14
|
|
|
15
15
|
export interface FilterRuleItem {
|
|
@@ -74,8 +74,11 @@
|
|
|
74
74
|
const full = $derived(nodeCount >= FILTER_EDITOR_LIMITS.nodes);
|
|
75
75
|
|
|
76
76
|
function snapshotNode(node: FilterNode): Filter {
|
|
77
|
-
|
|
78
|
-
|
|
77
|
+
if (node.kind === 'group') {
|
|
78
|
+
const value = node.children.map(snapshotNode);
|
|
79
|
+
return node.key ? { key: node.key, operator: node.operator, value } : { operator: node.operator, value };
|
|
80
|
+
}
|
|
81
|
+
return { field: node.field, operator: node.operator, value: Array.isArray(node.value) ? [...node.value] : node.value };
|
|
79
82
|
}
|
|
80
83
|
|
|
81
84
|
function unsupportedLogic(node: FilterNode, top = false): FilterIssueCode | undefined {
|
|
@@ -212,10 +215,10 @@
|
|
|
212
215
|
const previous = rule.operator;
|
|
213
216
|
rule.operator = operator;
|
|
214
217
|
if (isNullOperator(operator)) rule.value = null;
|
|
215
|
-
else if (operator
|
|
216
|
-
if (previous
|
|
217
|
-
} else if (
|
|
218
|
-
if (previous
|
|
218
|
+
else if (isRangeOperator(operator)) {
|
|
219
|
+
if (!isRangeOperator(previous)) rule.value = [null, null];
|
|
220
|
+
} else if (isListOperator(operator)) {
|
|
221
|
+
if (!isListOperator(previous)) rule.value = [null];
|
|
219
222
|
} else if (isCollectionOperator(previous) || isNullOperator(previous)) rule.value = undefined;
|
|
220
223
|
}
|
|
221
224
|
</script>
|
|
@@ -60,35 +60,35 @@
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
const paginationDefaults = $derived(config.pagination);
|
|
63
|
-
const paginationComponentDefaults = $derived(config.componentDefaults
|
|
63
|
+
const paginationComponentDefaults = $derived(config.componentDefaults['Pagination'] ?? {});
|
|
64
64
|
const resolvedPageSizeOptions = $derived(
|
|
65
65
|
pageSizeOptions
|
|
66
66
|
?? paginationDefaults.pageSizeOptions
|
|
67
|
-
?? numberList(paginationComponentDefaults
|
|
67
|
+
?? numberList(paginationComponentDefaults['pageSizeOptions'])
|
|
68
68
|
?? DEFAULT_PAGE_SIZE_OPTIONS,
|
|
69
69
|
);
|
|
70
70
|
const resolvedShowSummary = $derived(
|
|
71
71
|
showSummary
|
|
72
72
|
?? paginationDefaults.showSummary
|
|
73
|
-
?? booleanDefault(paginationComponentDefaults
|
|
73
|
+
?? booleanDefault(paginationComponentDefaults['showSummary'])
|
|
74
74
|
?? true,
|
|
75
75
|
);
|
|
76
76
|
const resolvedSimple = $derived(
|
|
77
77
|
simple
|
|
78
78
|
?? paginationDefaults.simple
|
|
79
|
-
?? booleanDefault(paginationComponentDefaults
|
|
79
|
+
?? booleanDefault(paginationComponentDefaults['simple'])
|
|
80
80
|
?? false,
|
|
81
81
|
);
|
|
82
82
|
const resolvedShowJumper = $derived(
|
|
83
83
|
showJumper
|
|
84
84
|
?? paginationDefaults.showJumper
|
|
85
|
-
?? booleanDefault(paginationComponentDefaults
|
|
85
|
+
?? booleanDefault(paginationComponentDefaults['showJumper'])
|
|
86
86
|
?? false,
|
|
87
87
|
);
|
|
88
88
|
const resolvedPageSize = $derived(
|
|
89
89
|
pageSize
|
|
90
90
|
?? paginationDefaults.pageSize
|
|
91
|
-
?? numberDefault(paginationComponentDefaults
|
|
91
|
+
?? numberDefault(paginationComponentDefaults['pageSize']),
|
|
92
92
|
);
|
|
93
93
|
|
|
94
94
|
const items = $derived(listPaginationItems(page, totalPages));
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type CrudOperator, type FieldDefinition, type Filter } from '@svadmin/core';
|
|
2
2
|
export declare const FILTER_EDITOR_LIMITS: Readonly<{
|
|
3
3
|
depth: 12;
|
|
4
4
|
nodes: 256;
|
|
@@ -18,6 +18,7 @@ export interface FilterGroupNode {
|
|
|
18
18
|
operator: 'and' | 'or';
|
|
19
19
|
children: FilterNode[];
|
|
20
20
|
wrapped?: boolean;
|
|
21
|
+
key?: string;
|
|
21
22
|
}
|
|
22
23
|
export type FilterNode = FilterRuleNode | FilterGroupNode;
|
|
23
24
|
export type FilterIssueCode = 'invalid-filter' | 'limit' | 'unknown-field' | 'operator' | 'logic' | 'value' | 'empty-group';
|
|
@@ -39,6 +40,8 @@ export type FilterTreeCompile = {
|
|
|
39
40
|
ok: false;
|
|
40
41
|
issues: FilterEditorIssue[];
|
|
41
42
|
};
|
|
43
|
+
export declare const isListOperator: (operator: CrudOperator) => boolean;
|
|
44
|
+
export declare const isRangeOperator: (operator: CrudOperator) => boolean;
|
|
42
45
|
export declare const isCollectionOperator: (operator: CrudOperator) => boolean;
|
|
43
46
|
export declare const isNullOperator: (operator: CrudOperator) => boolean;
|
|
44
47
|
export declare function filterOperators(field: Pick<FieldDefinition, 'type'> | undefined): CrudOperator[];
|
|
@@ -1,11 +1,21 @@
|
|
|
1
|
+
import { isCrudFieldOperator } from '@svadmin/core';
|
|
1
2
|
export const FILTER_EDITOR_LIMITS = Object.freeze({ depth: 12, nodes: 256, values: 1000 });
|
|
2
|
-
|
|
3
|
-
const comparison = ['eq', 'ne', 'lt', 'gt', 'lte', 'gte', 'in', 'nin', 'between', 'nbetween', 'null', 'nnull'];
|
|
4
|
-
const selection = ['eq', 'ne', 'in', 'nin', 'null', 'nnull'];
|
|
5
|
-
const text = ['eq', 'ne', 'contains', 'ncontains', 'startswith', 'endswith', 'in', 'nin', 'null', 'nnull'];
|
|
3
|
+
// 与 CRUD_FIELD_OPERATORS 对齐。带 s 的是大小写敏感变体;ina/nina 与 in/nin 一样接收数组值。
|
|
4
|
+
const comparison = ['eq', 'ne', 'eqs', 'nes', 'lt', 'gt', 'lte', 'gte', 'in', 'nin', 'ina', 'nina', 'between', 'nbetween', 'null', 'nnull'];
|
|
5
|
+
const selection = ['eq', 'ne', 'eqs', 'nes', 'in', 'nin', 'ina', 'nina', 'null', 'nnull'];
|
|
6
|
+
const text = ['eq', 'ne', 'eqs', 'nes', 'contains', 'ncontains', 'containss', 'ncontainss', 'startswith', 'nstartswith', 'startswiths', 'nstartswiths', 'endswith', 'nendswith', 'endswiths', 'nendswiths', 'in', 'nin', 'ina', 'nina', 'null', 'nnull'];
|
|
7
|
+
const operatorCoverage = true;
|
|
8
|
+
void operatorCoverage;
|
|
6
9
|
const scalar = (value) => value === null || typeof value === 'string' || typeof value === 'boolean' || (typeof value === 'number' && Number.isFinite(value));
|
|
10
|
+
function keyedGroup(node, children) {
|
|
11
|
+
return node.key ? { key: node.key, operator: node.operator, value: children } : { operator: node.operator, value: children };
|
|
12
|
+
}
|
|
7
13
|
const object = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
|
|
8
|
-
|
|
14
|
+
const listOperators = ['in', 'nin', 'ina', 'nina'];
|
|
15
|
+
const rangeOperators = ['between', 'nbetween'];
|
|
16
|
+
export const isListOperator = (operator) => listOperators.includes(operator);
|
|
17
|
+
export const isRangeOperator = (operator) => rangeOperators.includes(operator);
|
|
18
|
+
export const isCollectionOperator = (operator) => isListOperator(operator) || isRangeOperator(operator);
|
|
9
19
|
export const isNullOperator = (operator) => operator === 'null' || operator === 'nnull';
|
|
10
20
|
export function filterOperators(field) {
|
|
11
21
|
if (!field)
|
|
@@ -34,7 +44,7 @@ export function readFilterTree(input) {
|
|
|
34
44
|
try {
|
|
35
45
|
const id = `node-${count}`;
|
|
36
46
|
if ('field' in raw) {
|
|
37
|
-
if (typeof raw['field'] !== 'string' || !raw['field'] || !
|
|
47
|
+
if (typeof raw['field'] !== 'string' || !raw['field'] || !isCrudFieldOperator(raw['operator'])
|
|
38
48
|
|| Object.keys(raw).some((key) => !['field', 'operator', 'value'].includes(key))) {
|
|
39
49
|
issues.push({ path, code: 'invalid-filter' });
|
|
40
50
|
return;
|
|
@@ -47,10 +57,18 @@ export function readFilterTree(input) {
|
|
|
47
57
|
return { kind: 'rule', id, field: raw['field'], operator: raw['operator'], value: Array.isArray(value) ? [...value] : value };
|
|
48
58
|
}
|
|
49
59
|
if (!['and', 'or'].includes(String(raw['operator'])) || !Array.isArray(raw['value'])
|
|
50
|
-
|| Object.keys(raw).some((key) => !['operator', 'value'].includes(key))) {
|
|
60
|
+
|| Object.keys(raw).some((key) => !['operator', 'value', 'key'].includes(key))) {
|
|
51
61
|
issues.push({ path, code: 'invalid-filter' });
|
|
52
62
|
return;
|
|
53
63
|
}
|
|
64
|
+
let groupKey;
|
|
65
|
+
if ('key' in raw) {
|
|
66
|
+
if (typeof raw['key'] !== 'string' || raw['key'].length < 1 || raw['key'].length > 128) {
|
|
67
|
+
issues.push({ path, code: 'invalid-filter' });
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
groupKey = raw['key'];
|
|
71
|
+
}
|
|
54
72
|
if (raw['value'].length > FILTER_EDITOR_LIMITS.nodes) {
|
|
55
73
|
issues.push({ path, code: 'limit' });
|
|
56
74
|
return;
|
|
@@ -61,7 +79,7 @@ export function readFilterTree(input) {
|
|
|
61
79
|
if (node)
|
|
62
80
|
children.push(node);
|
|
63
81
|
}
|
|
64
|
-
return { kind: 'group', id, operator: raw['operator'], children };
|
|
82
|
+
return { kind: 'group', id, operator: raw['operator'], children, ...(groupKey ? { key: groupKey } : {}) };
|
|
65
83
|
}
|
|
66
84
|
finally {
|
|
67
85
|
active.delete(raw);
|
|
@@ -111,7 +129,7 @@ export function compileFilterTree(root, fields, preserved = new Map()) {
|
|
|
111
129
|
}
|
|
112
130
|
if (original && node.kind === 'group' && !('field' in original)
|
|
113
131
|
&& !node.children.length && !original.value.length && node.operator === original.operator) {
|
|
114
|
-
return
|
|
132
|
+
return keyedGroup(node, []);
|
|
115
133
|
}
|
|
116
134
|
if (node.kind === 'group') {
|
|
117
135
|
if (node.operator !== 'and' && node.operator !== 'or') {
|
|
@@ -130,7 +148,7 @@ export function compileFilterTree(root, fields, preserved = new Map()) {
|
|
|
130
148
|
if (filter)
|
|
131
149
|
children.push(filter);
|
|
132
150
|
}
|
|
133
|
-
return
|
|
151
|
+
return keyedGroup(node, children);
|
|
134
152
|
}
|
|
135
153
|
const field = fieldMap.get(node.field);
|
|
136
154
|
if (!field || field.filterable === false) {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
};
|
|
21
21
|
</script>
|
|
22
22
|
|
|
23
|
-
<ConfigProvider
|
|
23
|
+
<ConfigProvider {...useCustomContainer ? { getPopupContainer } : {}}>
|
|
24
24
|
<div class="workspace" data-testid="workspace-a">
|
|
25
25
|
<Dialog.Root open>
|
|
26
26
|
<Dialog.Trigger>Open dialog</Dialog.Trigger>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@svadmin/ui",
|
|
3
|
-
"version": "0.108.
|
|
3
|
+
"version": "0.108.6",
|
|
4
4
|
"description": "Pre-built admin UI components — AdminApp, AutoTable, AutoForm, Sidebar, Layout",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": [
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"@codemirror/lang-json": "^6.0.0",
|
|
89
89
|
"@codemirror/lang-markdown": "^6.0.0",
|
|
90
90
|
"@codemirror/lang-sql": "^6.0.0",
|
|
91
|
-
"@svadmin/core": "^0.
|
|
91
|
+
"@svadmin/core": "^0.70.0",
|
|
92
92
|
"@tanstack/svelte-query": "^6.1.48",
|
|
93
93
|
"codemirror": "^6.0.0",
|
|
94
94
|
"dashjs": "^4.7.4",
|
|
@@ -151,7 +151,7 @@
|
|
|
151
151
|
}
|
|
152
152
|
},
|
|
153
153
|
"dependencies": {
|
|
154
|
-
"@svadmin/devtools": "^0.4.
|
|
154
|
+
"@svadmin/devtools": "^0.4.4",
|
|
155
155
|
"@svadmin/devtools-contract": "^0.3.1",
|
|
156
156
|
"@vibeunion/devtools-devframe": "^0.1.0",
|
|
157
157
|
"typebox": "^1.3.34",
|
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
"@codemirror/lang-markdown": "^6.5.2",
|
|
190
190
|
"@codemirror/lang-sql": "^6.10.0",
|
|
191
191
|
"@happy-dom/global-registrator": "^20.11.12",
|
|
192
|
-
"@svadmin/ai-elements": "^0.13.
|
|
192
|
+
"@svadmin/ai-elements": "^0.13.6",
|
|
193
193
|
"@sveltejs/vite-plugin-svelte": "^7.3.0",
|
|
194
194
|
"@tailwindcss/cli": "4.3.3",
|
|
195
195
|
"@testing-library/dom": "^10.4.1",
|