@svadmin/ui 0.114.0 → 0.115.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.
@@ -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.114.0";
14
+ const buildVersion = "0.115.0";
15
15
  const version = $derived(suppliedVersion ?? (
16
16
  buildVersion.startsWith('__')
17
17
  ? (i18n.locale === 'zh-CN' ? '开发构建(未提供版本)' : 'Development build (version unavailable)')
@@ -3,17 +3,21 @@
3
3
 
4
4
  import { captureAdminContext, useTranslation, withValidatedAuditProvider } from '@svadmin/core';
5
5
 
6
- import type { AuditEntry, AuditLogProvider } from '@svadmin/core';
6
+ import type { AuditEntry, AuditLogProvider, AuditQueryParams } from '@svadmin/core';
7
7
  import * as Sheet from './ui/sheet/index.js';
8
8
  import { History, Loader2 } from '@lucide/svelte';
9
9
 
10
+ export type AuditLogDrawerLoader = (params: AuditQueryParams) => Promise<AuditEntry[]>;
11
+
10
12
  const i18n = useTranslation();
11
13
  const adminContext = captureAdminContext();
12
14
 
13
- let { open = $bindable(false), resource, recordId } = $props<{
15
+ let { open = $bindable(false), resource, recordId, loadEntries } = $props<{
14
16
  open: boolean;
15
17
  resource: string;
16
18
  recordId?: string | number;
19
+ /** Optional loader; defaults to the AdminContext auditLogProvider. */
20
+ loadEntries?: AuditLogDrawerLoader;
17
21
  }>();
18
22
 
19
23
  let logs = $state<AuditEntry[]>([]);
@@ -23,6 +27,7 @@
23
27
 
24
28
  $effect(() => {
25
29
  const scopedProvider = adminContext.auditLogProvider;
30
+ const scopedLoader = loadEntries;
26
31
  const scopedResource = resource;
27
32
  const scopedRecordId = recordId;
28
33
  const shouldLoad = open;
@@ -32,8 +37,12 @@
32
37
  );
33
38
 
34
39
  clearAuditScope();
35
- if (shouldLoad && scopedProvider) {
36
- void loadAuditLogs(scopedProvider, scopedResource, providerMeta);
40
+ if (shouldLoad) {
41
+ if (scopedLoader) {
42
+ void loadAuditLogsWithLoader(scopedLoader, definedOptions({ resource: scopedResource, meta: providerMeta }));
43
+ } else if (scopedProvider) {
44
+ void loadAuditLogs(scopedProvider, scopedResource, providerMeta);
45
+ }
37
46
  }
38
47
 
39
48
  return cancelAuditRequest;
@@ -54,13 +63,28 @@
54
63
  scopedProvider: AuditLogProvider,
55
64
  scopedResource: string,
56
65
  providerMeta: Record<string, unknown> | undefined,
66
+ ) {
67
+ return loadAuditLogsWithLoader(
68
+ params => withValidatedAuditProvider(scopedProvider).get(params),
69
+ definedOptions({ resource: scopedResource, meta: providerMeta }),
70
+ false,
71
+ );
72
+ }
73
+
74
+ async function loadAuditLogsWithLoader(
75
+ loader: AuditLogDrawerLoader,
76
+ params: AuditQueryParams,
77
+ validateResponse = true,
57
78
  ) {
58
79
  const epoch = requestEpoch;
59
80
  isLoading = true;
60
81
  try {
61
- const entries = await withValidatedAuditProvider(scopedProvider).get(
62
- definedOptions({ resource: scopedResource, meta: providerMeta }),
63
- );
82
+ const entries = validateResponse
83
+ ? await withValidatedAuditProvider({
84
+ create: async (createParams) => createParams,
85
+ get: loader,
86
+ }).get(params)
87
+ : await loader(params);
64
88
  if (epoch === requestEpoch) logs = entries;
65
89
  } catch (error) {
66
90
  if (epoch === requestEpoch) {
@@ -1,7 +1,11 @@
1
+ import type { AuditEntry, AuditQueryParams } from '@svadmin/core';
2
+ export type AuditLogDrawerLoader = (params: AuditQueryParams) => Promise<AuditEntry[]>;
1
3
  type $$ComponentProps = {
2
4
  open: boolean;
3
5
  resource: string;
4
6
  recordId?: string | number;
7
+ /** Optional loader; defaults to the AdminContext auditLogProvider. */
8
+ loadEntries?: AuditLogDrawerLoader;
5
9
  };
6
10
  declare const AuditLogDrawer: import("svelte").Component<$$ComponentProps, {}, "open">;
7
11
  type AuditLogDrawer = ReturnType<typeof AuditLogDrawer>;
@@ -12,6 +12,8 @@
12
12
  assignees?: string[];
13
13
  }
14
14
 
15
+ export type WorkflowNodeRenderer = Snippet<[WorkflowNode]>;
16
+
15
17
  export interface WorkflowDesignerProps {
16
18
  /** List of workflow steps in linear or branching order */
17
19
  nodes?: WorkflowNode[];
@@ -23,6 +25,8 @@
23
25
  onaddnode?: (targetNodeId: string, type: 'approver' | 'condition' | 'notifier') => void;
24
26
  /** Callback when a node is removed */
25
27
  ondeletenode?: (nodeId: string) => void;
28
+ /** Optional renderer per node type; defaults to the built-in node card. */
29
+ nodeTypes?: Partial<Record<WorkflowNode['type'], WorkflowNodeRenderer>>;
26
30
  /** Extra header or toolbar slot */
27
31
  extra?: Snippet;
28
32
  /** Additional CSS classes */
@@ -39,6 +43,7 @@
39
43
  onnodeclick,
40
44
  onaddnode,
41
45
  ondeletenode,
46
+ nodeTypes,
42
47
  extra,
43
48
  class: className = '',
44
49
  }: WorkflowDesignerProps = $props();
@@ -116,67 +121,105 @@
116
121
  <div class="relative flex flex-col items-center gap-0">
117
122
  {#each nodes as node, index (node.id)}
118
123
  {@const colors = getNodeTypeColor(node.type)}
119
- <!-- Node Card -->
120
- <div class="group/node relative flex w-72 flex-col rounded-[4px] border border-border bg-card shadow-xs transition-all hover:shadow-md">
121
- <!-- Node Header -->
122
- <div class={cn('flex items-center justify-between px-3 py-1.5 rounded-t-[3px]', colors.headerBg, colors.headerText)}>
123
- <div class="flex items-center gap-1.5 text-xs font-medium">
124
- <span>{node.title}</span>
124
+ {@const customNode = nodeTypes?.[node.type]}
125
+ {#if customNode}
126
+ <div class="group/node relative flex w-72 flex-col rounded-[4px] border border-border bg-card shadow-xs transition-all hover:shadow-md">
127
+ <div
128
+ role="button"
129
+ tabindex="0"
130
+ class="w-full text-left focus-visible:outline-none"
131
+ aria-label={`编辑 ${node.title}`}
132
+ onclick={() => onnodeclick?.(node)}
133
+ onkeydown={(event) => {
134
+ if (event.key === 'Enter' || event.key === ' ') {
135
+ event.preventDefault();
136
+ onnodeclick?.(node);
137
+ }
138
+ }}
139
+ >
140
+ {@render customNode(node)}
125
141
  </div>
126
142
 
127
- <div class="flex items-center gap-1">
128
- {#if node.status}
129
- <span class={cn('rounded-[2px] border px-1.5 py-0.2 text-[10px] font-normal leading-tight', getStatusTone(node.status))}>
130
- {node.status}
131
- </span>
132
- {/if}
133
-
134
- {#if !readonly && node.type !== 'start'}
135
- <button
136
- type="button"
137
- aria-label={`删除 ${node.title}`}
138
- class="opacity-0 transition-opacity group-hover/node:opacity-100 p-0.5 text-white/80 hover:text-white"
139
- onclick={(e) => {
140
- e.stopPropagation();
141
- ondeletenode?.(node.id);
142
- }}
143
- >
144
- <svg class="h-3.5 w-3.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
145
- <line x1="18" y1="6" x2="6" y2="18" />
146
- <line x1="6" y1="6" x2="18" y2="18" />
147
- </svg>
148
- </button>
149
- {/if}
150
- </div>
143
+ {#if !readonly && node.type !== 'start'}
144
+ <button
145
+ type="button"
146
+ aria-label={`删除 ${node.title}`}
147
+ class="absolute right-2 top-2 p-0.5 text-muted-foreground transition-colors hover:text-destructive"
148
+ onclick={(event) => {
149
+ event.stopPropagation();
150
+ ondeletenode?.(node.id);
151
+ }}
152
+ >
153
+ <svg class="h-3.5 w-3.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
154
+ <line x1="18" y1="6" x2="6" y2="18" />
155
+ <line x1="6" y1="6" x2="18" y2="18" />
156
+ </svg>
157
+ </button>
158
+ {/if}
151
159
  </div>
160
+ {:else}
161
+ <!-- Node Card -->
162
+ <div class="group/node relative flex w-72 flex-col rounded-[4px] border border-border bg-card shadow-xs transition-all hover:shadow-md">
163
+ <!-- Node Header -->
164
+ <div class={cn('flex items-center justify-between px-3 py-1.5 rounded-t-[3px]', colors.headerBg, colors.headerText)}>
165
+ <div class="flex items-center gap-1.5 text-xs font-medium">
166
+ <span>{node.title}</span>
167
+ </div>
152
168
 
153
- <!-- Node Body -->
154
- <button
155
- type="button"
156
- class="flex w-full flex-col items-start p-3 text-left transition-colors hover:bg-muted/30 focus-visible:outline-none"
157
- onclick={() => onnodeclick?.(node)}
158
- >
159
- <div class="text-xs text-foreground line-clamp-2">
160
- {node.content || '请设置节点属性'}
169
+ <div class="flex items-center gap-1">
170
+ {#if node.status}
171
+ <span class={cn('rounded-[2px] border px-1.5 py-0.2 text-[10px] font-normal leading-tight', getStatusTone(node.status))}>
172
+ {node.status}
173
+ </span>
174
+ {/if}
175
+
176
+ {#if !readonly && node.type !== 'start'}
177
+ <button
178
+ type="button"
179
+ aria-label={`删除 ${node.title}`}
180
+ class="opacity-0 transition-opacity group-hover/node:opacity-100 p-0.5 text-white/80 hover:text-white"
181
+ onclick={(e) => {
182
+ e.stopPropagation();
183
+ ondeletenode?.(node.id);
184
+ }}
185
+ >
186
+ <svg class="h-3.5 w-3.5" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
187
+ <line x1="18" y1="6" x2="6" y2="18" />
188
+ <line x1="6" y1="6" x2="18" y2="18" />
189
+ </svg>
190
+ </button>
191
+ {/if}
192
+ </div>
161
193
  </div>
162
194
 
163
- {#if node.assignees && node.assignees.length > 0}
164
- <div class="mt-2 flex flex-wrap gap-1">
165
- {#each node.assignees as assignee (assignee)}
166
- <span class="rounded-[2px] bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
167
- {assignee}
168
- </span>
169
- {/each}
195
+ <!-- Node Body -->
196
+ <button
197
+ type="button"
198
+ class="flex w-full flex-col items-start p-3 text-left transition-colors hover:bg-muted/30 focus-visible:outline-none"
199
+ onclick={() => onnodeclick?.(node)}
200
+ >
201
+ <div class="text-xs text-foreground line-clamp-2">
202
+ {node.content || '请设置节点属性'}
170
203
  </div>
171
- {/if}
172
204
 
173
- {#if node.error}
174
- <span class="mt-1 text-[11px] text-destructive">
175
- {node.error}
176
- </span>
177
- {/if}
178
- </button>
179
- </div>
205
+ {#if node.assignees && node.assignees.length > 0}
206
+ <div class="mt-2 flex flex-wrap gap-1">
207
+ {#each node.assignees as assignee (assignee)}
208
+ <span class="rounded-[2px] bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">
209
+ {assignee}
210
+ </span>
211
+ {/each}
212
+ </div>
213
+ {/if}
214
+
215
+ {#if node.error}
216
+ <span class="mt-1 text-[11px] text-destructive">
217
+ {node.error}
218
+ </span>
219
+ {/if}
220
+ </button>
221
+ </div>
222
+ {/if}
180
223
 
181
224
  <!-- Connecting line and Add Button -->
182
225
  {#if index < nodes.length - 1 || !readonly}
@@ -8,6 +8,7 @@ export interface WorkflowNode {
8
8
  error?: string;
9
9
  assignees?: string[];
10
10
  }
11
+ export type WorkflowNodeRenderer = Snippet<[WorkflowNode]>;
11
12
  export interface WorkflowDesignerProps {
12
13
  /** List of workflow steps in linear or branching order */
13
14
  nodes?: WorkflowNode[];
@@ -19,6 +20,8 @@ export interface WorkflowDesignerProps {
19
20
  onaddnode?: (targetNodeId: string, type: 'approver' | 'condition' | 'notifier') => void;
20
21
  /** Callback when a node is removed */
21
22
  ondeletenode?: (nodeId: string) => void;
23
+ /** Optional renderer per node type; defaults to the built-in node card. */
24
+ nodeTypes?: Partial<Record<WorkflowNode['type'], WorkflowNodeRenderer>>;
22
25
  /** Extra header or toolbar slot */
23
26
  extra?: Snippet;
24
27
  /** Additional CSS classes */
@@ -1,5 +1,5 @@
1
1
  <script lang="ts">
2
- import { useStorage } from '@svadmin/core';
2
+ import { useStorage, type StorageProvider } from '@svadmin/core';
3
3
  import { Upload, X, FileText, AlertCircle, Loader2 } from '@lucide/svelte';
4
4
 
5
5
  export interface UploadFieldProps {
@@ -11,6 +11,8 @@
11
11
  disabled?: boolean;
12
12
  label?: string;
13
13
  description?: string;
14
+ /** Optional storage adapter; defaults to the StorageProvider from AdminContext. */
15
+ storage?: StorageProvider;
14
16
  onchange?: (value: string | string[] | null) => void;
15
17
  }
16
18
 
@@ -23,15 +25,29 @@
23
25
  disabled = false,
24
26
  label,
25
27
  description,
28
+ storage,
26
29
  onchange,
27
30
  }: UploadFieldProps = $props();
28
31
 
29
32
  const inputId = $props.id();
30
- const storage = useStorage();
33
+ const contextStorage = useStorage();
31
34
 
32
35
  let isDragging = $state(false);
33
36
  let errorMessage = $state<string | null>(null);
34
37
  let uploadQueue = $state<Array<{ name: string; size: number; progress: number }>>([]);
38
+ let isUploading = $state(false);
39
+ let uploadProgress = $state(0);
40
+ let uploadedPaths = $state<Record<string, string>>({});
41
+
42
+ async function uploadFile(file: File, options: Parameters<StorageProvider['upload']>[1]) {
43
+ if (storage) return storage.upload(file, options);
44
+ return contextStorage.upload(file, options);
45
+ }
46
+
47
+ async function deleteFile(path: string): Promise<void> {
48
+ if (storage) return storage.delete(path);
49
+ return contextStorage.deleteFile(path);
50
+ }
35
51
 
36
52
  // Normalize initial value to array for uniform internal rendering
37
53
  let fileList = $derived.by<string[]>(() => {
@@ -66,11 +82,14 @@
66
82
  const queueItem = { name: file.name, size: file.size, progress: 0 };
67
83
  uploadQueue = [...uploadQueue, queueItem];
68
84
 
85
+ isUploading = true;
86
+ uploadProgress = 0;
69
87
  try {
70
- const res = await storage.upload(file, {
88
+ const res = await uploadFile(file, {
71
89
  path,
72
90
  filename: file.name,
73
91
  onProgress: (p) => {
92
+ uploadProgress = p.percentage;
74
93
  uploadQueue = uploadQueue.map((item) => item === queueItem ? { ...item, progress: p.percentage } : item);
75
94
  },
76
95
  });
@@ -80,9 +99,12 @@
80
99
  } else {
81
100
  currentUrls.splice(0, currentUrls.length, res.url);
82
101
  }
102
+ uploadedPaths = { ...uploadedPaths, [res.url]: res.path };
83
103
  } catch (err) {
84
104
  errorMessage = err instanceof Error ? err.message : 'Upload failed';
85
105
  } finally {
106
+ isUploading = false;
107
+ uploadProgress = 0;
86
108
  uploadQueue = uploadQueue.filter((q) => q !== queueItem);
87
109
  }
88
110
  }
@@ -114,11 +136,17 @@
114
136
 
115
137
  // Attempt backend delete if path is extractable
116
138
  try {
139
+ const trackedPath = uploadedPaths[urlToRemove];
117
140
  const urlObj = new URL(urlToRemove, 'https://dummy.local');
118
- const cleanPath = urlObj.pathname.replace(/^\/+/, '');
119
- await storage.deleteFile(cleanPath);
141
+ const cleanPath = trackedPath ?? urlObj.pathname.replace(/^\/+/, '');
142
+ await deleteFile(cleanPath);
120
143
  } catch {
121
144
  // Best-effort cleanup
145
+ } finally {
146
+ if (uploadedPaths[urlToRemove]) {
147
+ const { [urlToRemove]: _removed, ...remainingPaths } = uploadedPaths;
148
+ uploadedPaths = remainingPaths;
149
+ }
122
150
  }
123
151
  }
124
152
  </script>
@@ -151,9 +179,9 @@
151
179
  />
152
180
 
153
181
  <div class="flex flex-col items-center justify-center gap-1.5 py-2 pointer-events-none">
154
- {#if storage.isUploading}
182
+ {#if isUploading}
155
183
  <Loader2 class="h-6 w-6 text-primary animate-spin" />
156
- <span class="text-xs font-medium text-muted-foreground">Uploading... ({storage.uploadProgress}%)</span>
184
+ <span class="text-xs font-medium text-muted-foreground">Uploading... ({uploadProgress}%)</span>
157
185
  {:else}
158
186
  <Upload class="h-6 w-6 text-muted-foreground/80" />
159
187
  <div class="text-xs text-foreground font-medium">
@@ -1,3 +1,4 @@
1
+ import { type StorageProvider } from '@svadmin/core';
1
2
  export interface UploadFieldProps {
2
3
  value?: string | string[] | null;
3
4
  multiple?: boolean;
@@ -7,6 +8,8 @@ export interface UploadFieldProps {
7
8
  disabled?: boolean;
8
9
  label?: string;
9
10
  description?: string;
11
+ /** Optional storage adapter; defaults to the StorageProvider from AdminContext. */
12
+ storage?: StorageProvider;
10
13
  onchange?: (value: string | string[] | null) => void;
11
14
  }
12
15
  declare const UploadField: import("svelte").Component<UploadFieldProps, {}, "value">;
package/dist/index.d.ts CHANGED
@@ -59,6 +59,7 @@ export { default as AppShellPage } from './components/AppShellPage.svelte';
59
59
  export { default as ResourceOperationsPage } from './components/ResourceOperationsPage.svelte';
60
60
  export { default as RecordDetailDrawer } from './components/RecordDetailDrawer.svelte';
61
61
  export { default as AuditLogDrawer } from './components/AuditLogDrawer.svelte';
62
+ export type { AuditLogDrawerLoader } from './components/AuditLogDrawer.svelte';
62
63
  export { default as ResourceAccessGuard } from './components/ResourceAccessGuard.svelte';
63
64
  export { default as RouteAccessGuard } from './components/RouteAccessGuard.svelte';
64
65
  export { default as LoginPage } from './components/LoginPage.svelte';
@@ -491,7 +492,7 @@ export type { ProDescriptionsProps, ProDescriptionItem } from './components/ProD
491
492
  export { default as FormDependency } from './components/FormDependency.svelte';
492
493
  export type { FormDependencyProps } from './components/FormDependency.svelte';
493
494
  export { default as WorkflowDesigner } from './components/WorkflowDesigner.svelte';
494
- export type { WorkflowDesignerProps, WorkflowNode } from './components/WorkflowDesigner.svelte';
495
+ export type { WorkflowDesignerProps, WorkflowNode, WorkflowNodeRenderer } from './components/WorkflowDesigner.svelte';
495
496
  export { default as RoleSwitcher } from './components/RoleSwitcher.svelte';
496
497
  export type { RoleSwitcherProps, RoleItem } from './components/RoleSwitcher.svelte';
497
498
  export { default as RealtimeMonitorView } from './components/RealtimeMonitorView.svelte';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@svadmin/ui",
3
- "version": "0.114.0",
3
+ "version": "0.115.0",
4
4
  "description": "Pre-built admin UI components — AdminApp, AutoTable, AutoForm, Sidebar, Layout",
5
5
  "type": "module",
6
6
  "sideEffects": [