@veltra/desktop 1.7.13 → 1.7.15
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/batch-edit/batch-edit-form.js +9 -3
- package/dist/components/batch-edit/batch-edit-form.js.map +1 -1
- package/dist/components/batch-edit/batch-edit-list.js +2 -1
- package/dist/components/batch-edit/batch-edit-list.js.map +1 -1
- package/dist/components/batch-edit/batch-edit.js +57 -30
- package/dist/components/batch-edit/batch-edit.js.map +1 -1
- package/dist/components/batch-edit/style.d.ts +1 -0
- package/dist/components/batch-edit/style.js +1 -0
- package/dist/components/batch-edit/style2.css +14 -0
- package/dist/components/batch-edit/use-dialog-effect.js +20 -0
- package/dist/components/batch-edit/use-dialog-effect.js.map +1 -0
- package/dist/components/batch-edit/use-edit-state.js +22 -3
- package/dist/components/batch-edit/use-edit-state.js.map +1 -1
- package/dist/components/batch-edit/use-handlers.js +5 -0
- package/dist/components/batch-edit/use-handlers.js.map +1 -1
- package/dist/components/batch-edit/use-shortcut-key.js +5 -2
- package/dist/components/batch-edit/use-shortcut-key.js.map +1 -1
- package/dist/components/file-viewer/file-viewer.js +21 -14
- package/dist/components/file-viewer/file-viewer.js.map +1 -1
- package/dist/components/file-viewer/helper.js +2 -0
- package/dist/components/file-viewer/helper.js.map +1 -1
- package/dist/components/file-viewer/previewers/ofd-previewer.js +196 -0
- package/dist/components/file-viewer/previewers/ofd-previewer.js.map +1 -0
- package/dist/components/file-viewer/style2.css +27 -0
- package/dist/components/table-editor/style2.css +23 -3
- package/dist/components/table-editor/table-editor.js +213 -63
- package/dist/components/table-editor/table-editor.js.map +1 -1
- package/dist/components/tip/style2.css +63 -0
- package/dist/components/tip/tip.js +6 -1
- package/dist/components/tip/tip.js.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/packages/ofd-core/dist/color.js +69 -0
- package/dist/packages/ofd-core/dist/color.js.map +1 -0
- package/dist/packages/ofd-core/dist/ctm.js +55 -0
- package/dist/packages/ofd-core/dist/ctm.js.map +1 -0
- package/dist/packages/ofd-core/dist/error.js +14 -0
- package/dist/packages/ofd-core/dist/error.js.map +1 -0
- package/dist/packages/ofd-core/dist/font.js +384 -0
- package/dist/packages/ofd-core/dist/font.js.map +1 -0
- package/dist/packages/ofd-core/dist/index.js +6 -0
- package/dist/packages/ofd-core/dist/number.js +13 -0
- package/dist/packages/ofd-core/dist/number.js.map +1 -0
- package/dist/packages/ofd-core/dist/page-objects.js +181 -0
- package/dist/packages/ofd-core/dist/page-objects.js.map +1 -0
- package/dist/packages/ofd-core/dist/parse.js +65 -0
- package/dist/packages/ofd-core/dist/parse.js.map +1 -0
- package/dist/packages/ofd-core/dist/render.js +361 -0
- package/dist/packages/ofd-core/dist/render.js.map +1 -0
- package/dist/packages/ofd-core/dist/xml.js +199 -0
- package/dist/packages/ofd-core/dist/xml.js.map +1 -0
- package/dist/packages/ofd-core/dist/zip.js +93 -0
- package/dist/packages/ofd-core/dist/zip.js.map +1 -0
- package/dist/style.d.ts +1 -1
- package/dist/style.js +1 -1
- package/dist/types/batch-edit.d.ts +6 -0
- package/dist/types/file-viewer.d.ts +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/table-editor.d.ts +28 -7
- package/dist/types/tip.d.ts +5 -1
- package/package.json +8 -7
- package/src/components/batch-edit/__test__/batch-edit.test.ts +191 -4
- package/src/components/batch-edit/batch-edit-form.vue +17 -3
- package/src/components/batch-edit/batch-edit-list.vue +2 -1
- package/src/components/batch-edit/batch-edit.vue +22 -4
- package/src/components/batch-edit/style.scss +20 -0
- package/src/components/batch-edit/style.ts +1 -0
- package/src/components/batch-edit/use-dialog-effect.ts +9 -3
- package/src/components/batch-edit/use-edit-state.ts +32 -4
- package/src/components/batch-edit/use-handlers.ts +10 -0
- package/src/components/batch-edit/use-shortcut-key.ts +6 -2
- package/src/components/file-viewer/__test__/helper.test.ts +13 -0
- package/src/components/file-viewer/file-viewer.vue +23 -16
- package/src/components/file-viewer/helper.ts +2 -0
- package/src/components/file-viewer/previewers/ofd-previewer.vue +216 -0
- package/src/components/file-viewer/style.scss +33 -0
- package/src/components/table-editor/__test__/table-editor.test.ts +471 -0
- package/src/components/table-editor/style.scss +42 -4
- package/src/components/table-editor/table-editor.vue +265 -38
- package/src/components/tip/style.scss +15 -0
- package/src/components/tip/tip.vue +1 -1
- package/src/types/batch-edit.ts +6 -0
- package/src/types/file-viewer.ts +1 -1
- package/src/types/table-editor.ts +29 -7
- package/src/types/tip.ts +6 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { describe, expect, it } from 'vitest'
|
|
1
|
+
import { describe, expect, it, vi } from 'vitest'
|
|
2
2
|
import { createApp, h, nextTick, reactive, ref } from 'vue'
|
|
3
3
|
|
|
4
4
|
import { UInput } from '../../input'
|
|
@@ -6,7 +6,13 @@ import { USelect } from '../../select'
|
|
|
6
6
|
import { defineTableColumns } from '../../table'
|
|
7
7
|
import { UBatchEdit } from '../index'
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
interface MountOptions {
|
|
10
|
+
props?: Record<string, any>
|
|
11
|
+
/** 给「名称」输入框附加校验规则 */
|
|
12
|
+
labelRules?: Record<string, any>
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
function mountBatchEdit(options: MountOptions = {}) {
|
|
10
16
|
const host = document.createElement('div')
|
|
11
17
|
document.body.appendChild(host)
|
|
12
18
|
|
|
@@ -42,11 +48,12 @@ function mountBatchEdit() {
|
|
|
42
48
|
columns,
|
|
43
49
|
model,
|
|
44
50
|
rowKey: 'id',
|
|
45
|
-
quickEdit: true
|
|
51
|
+
quickEdit: true,
|
|
52
|
+
...options.props
|
|
46
53
|
},
|
|
47
54
|
{
|
|
48
55
|
form: () => [
|
|
49
|
-
h(UInput, { field: 'label', label: '名称' }),
|
|
56
|
+
h(UInput, { field: 'label', label: '名称', rules: options.labelRules }),
|
|
50
57
|
h(USelect, {
|
|
51
58
|
field: 'behavior',
|
|
52
59
|
label: '行为',
|
|
@@ -197,3 +204,183 @@ describe('UBatchEdit quick-edit 切换编辑行', () => {
|
|
|
197
204
|
unmount()
|
|
198
205
|
})
|
|
199
206
|
})
|
|
207
|
+
|
|
208
|
+
function queryDialog() {
|
|
209
|
+
return document.body.querySelector<HTMLElement>('.u-batch-edit__form-dialog')
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
/** 等弹框(teleport 到 body)的进入 / 离开过渡走完 */
|
|
213
|
+
async function flushDialog() {
|
|
214
|
+
await nextTick()
|
|
215
|
+
await nextTick()
|
|
216
|
+
await new Promise((resolve) => setTimeout(resolve, 20))
|
|
217
|
+
await nextTick()
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
function clickEl(el: HTMLElement) {
|
|
221
|
+
el.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }))
|
|
222
|
+
}
|
|
223
|
+
|
|
224
|
+
function setInputValue(input: HTMLInputElement, value: string) {
|
|
225
|
+
input.value = value
|
|
226
|
+
input.dispatchEvent(
|
|
227
|
+
new InputEvent('input', { bubbles: true, data: value, inputType: 'insertText' })
|
|
228
|
+
)
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
function querySaveButton(dialog: HTMLElement) {
|
|
232
|
+
return dialog.querySelector<HTMLElement>('.u-batch-edit__form-actions button[title="保存"]')
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
function queryCancelButton(dialog: HTMLElement) {
|
|
236
|
+
return [...dialog.querySelectorAll<HTMLElement>('.u-batch-edit__form-actions button')].find(
|
|
237
|
+
(btn) => btn.textContent?.includes('取消')
|
|
238
|
+
)
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
describe('UBatchEdit formMode', () => {
|
|
242
|
+
it('默认(不传 formMode)仍渲染右侧面板,不出现弹框', async () => {
|
|
243
|
+
const { host, unmount } = mountBatchEdit()
|
|
244
|
+
|
|
245
|
+
await clickRow(host, 0)
|
|
246
|
+
const aside = host.querySelector<HTMLElement>('.u-batch-edit__form')
|
|
247
|
+
expect(aside).toBeTruthy()
|
|
248
|
+
expect(aside!.style.display).not.toBe('none')
|
|
249
|
+
expect(queryDialog()).toBeNull()
|
|
250
|
+
|
|
251
|
+
unmount()
|
|
252
|
+
})
|
|
253
|
+
|
|
254
|
+
it('formMode="dialog" 时不渲染右列,触发编辑后以弹框打开表单', async () => {
|
|
255
|
+
const { host, model, unmount } = mountBatchEdit({
|
|
256
|
+
props: { formMode: 'dialog', quickEdit: false }
|
|
257
|
+
})
|
|
258
|
+
|
|
259
|
+
expect(host.querySelector('.u-batch-edit__form')).toBeNull()
|
|
260
|
+
expect(queryDialog()).toBeNull()
|
|
261
|
+
|
|
262
|
+
await clickRow(host, 0)
|
|
263
|
+
await flushDialog()
|
|
264
|
+
|
|
265
|
+
const dialog = queryDialog()
|
|
266
|
+
expect(dialog).toBeTruthy()
|
|
267
|
+
// 表格占满整行,右列不再渲染
|
|
268
|
+
expect(host.querySelector('.u-batch-edit__form')).toBeNull()
|
|
269
|
+
// 弹框内复用原表单头部 / 表单体 / 底部操作区
|
|
270
|
+
expect(dialog!.querySelector('.u-batch-edit__form-header')).toBeTruthy()
|
|
271
|
+
expect(dialog!.querySelector('.u-batch-edit__form-body')).toBeTruthy()
|
|
272
|
+
expect(dialog!.querySelector('.u-batch-edit__form-actions')).toBeTruthy()
|
|
273
|
+
// 编辑行已回显
|
|
274
|
+
expect(model.label).toBe('存草稿')
|
|
275
|
+
|
|
276
|
+
unmount()
|
|
277
|
+
})
|
|
278
|
+
|
|
279
|
+
it('弹框内保存走校验与 saveMethod,成功后关闭弹框', async () => {
|
|
280
|
+
const saveMethod = vi.fn()
|
|
281
|
+
const { host, data, unmount } = mountBatchEdit({
|
|
282
|
+
props: { formMode: 'dialog', quickEdit: false, saveMethod },
|
|
283
|
+
labelRules: { required: true }
|
|
284
|
+
})
|
|
285
|
+
|
|
286
|
+
// 打开新增弹框
|
|
287
|
+
clickEl(host.querySelector<HTMLElement>('.u-batch-edit__add-btn')!)
|
|
288
|
+
await flushDialog()
|
|
289
|
+
expect(queryDialog()).toBeTruthy()
|
|
290
|
+
|
|
291
|
+
// 必填校验失败:不调用 saveMethod,弹框保持打开
|
|
292
|
+
clickEl(querySaveButton(queryDialog()!)!)
|
|
293
|
+
await flushDialog()
|
|
294
|
+
expect(saveMethod).not.toHaveBeenCalled()
|
|
295
|
+
expect(queryDialog()).toBeTruthy()
|
|
296
|
+
|
|
297
|
+
// 填写后保存:走 saveMethod 并插入数据,成功后关闭弹框
|
|
298
|
+
setInputValue(queryDialog()!.querySelector<HTMLInputElement>('.u-input input')!, '新名称')
|
|
299
|
+
await nextTick()
|
|
300
|
+
await nextTick()
|
|
301
|
+
clickEl(querySaveButton(queryDialog()!)!)
|
|
302
|
+
await flushDialog()
|
|
303
|
+
|
|
304
|
+
expect(saveMethod).toHaveBeenCalledTimes(1)
|
|
305
|
+
expect(saveMethod.mock.calls[0]![0]).toMatchObject({ label: '新名称' })
|
|
306
|
+
expect(saveMethod.mock.calls[0]![1]).toBe('create')
|
|
307
|
+
expect(data.value).toHaveLength(3)
|
|
308
|
+
expect(data.value[2]).toMatchObject({ label: '新名称' })
|
|
309
|
+
expect(queryDialog()).toBeNull()
|
|
310
|
+
|
|
311
|
+
unmount()
|
|
312
|
+
})
|
|
313
|
+
|
|
314
|
+
it('弹框内取消 / 关闭按钮 / 遮罩点击均不保存,且 model 恢复初始值', async () => {
|
|
315
|
+
const saveMethod = vi.fn()
|
|
316
|
+
const { host, data, model, unmount } = mountBatchEdit({
|
|
317
|
+
props: { formMode: 'dialog', quickEdit: false, saveMethod }
|
|
318
|
+
})
|
|
319
|
+
|
|
320
|
+
// 编辑第 1 行后取消
|
|
321
|
+
await clickRow(host, 0)
|
|
322
|
+
await flushDialog()
|
|
323
|
+
setInputValue(queryDialog()!.querySelector<HTMLInputElement>('.u-input input')!, '改过的名称')
|
|
324
|
+
await nextTick()
|
|
325
|
+
await nextTick()
|
|
326
|
+
clickEl(queryCancelButton(queryDialog()!)!)
|
|
327
|
+
await flushDialog()
|
|
328
|
+
|
|
329
|
+
expect(saveMethod).not.toHaveBeenCalled()
|
|
330
|
+
expect(data.value[0]).toMatchObject({ label: '存草稿' })
|
|
331
|
+
// model 恢复初始快照,而不是残留上一行数据
|
|
332
|
+
expect(model.label).toBe('')
|
|
333
|
+
expect(model.submitType).toBeUndefined()
|
|
334
|
+
expect(queryDialog()).toBeNull()
|
|
335
|
+
|
|
336
|
+
// 取消后再新增:表单应为初始值(快照不被上一行污染)
|
|
337
|
+
clickEl(host.querySelector<HTMLElement>('.u-batch-edit__add-btn')!)
|
|
338
|
+
await flushDialog()
|
|
339
|
+
expect(queryDialog()!.querySelector<HTMLInputElement>('.u-input input')!.value).toBe('')
|
|
340
|
+
|
|
341
|
+
// 表单头部的关闭按钮同样不保存
|
|
342
|
+
setInputValue(queryDialog()!.querySelector<HTMLInputElement>('.u-input input')!, '随便写')
|
|
343
|
+
await nextTick()
|
|
344
|
+
await nextTick()
|
|
345
|
+
clickEl(queryDialog()!.querySelector<HTMLElement>('.u-batch-edit__form-close')!)
|
|
346
|
+
await flushDialog()
|
|
347
|
+
expect(saveMethod).not.toHaveBeenCalled()
|
|
348
|
+
expect(model.label).toBe('')
|
|
349
|
+
expect(data.value).toHaveLength(2)
|
|
350
|
+
expect(queryDialog()).toBeNull()
|
|
351
|
+
|
|
352
|
+
// 弹框自身关闭交互(点击遮罩)也不保存
|
|
353
|
+
await clickRow(host, 1)
|
|
354
|
+
await flushDialog()
|
|
355
|
+
setInputValue(queryDialog()!.querySelector<HTMLInputElement>('.u-input input')!, '改过的名称')
|
|
356
|
+
await nextTick()
|
|
357
|
+
await nextTick()
|
|
358
|
+
document
|
|
359
|
+
.querySelector<HTMLElement>('.u-dialog__overlay')!
|
|
360
|
+
.dispatchEvent(new MouseEvent('mousedown', { bubbles: true, cancelable: true }))
|
|
361
|
+
await flushDialog()
|
|
362
|
+
|
|
363
|
+
expect(saveMethod).not.toHaveBeenCalled()
|
|
364
|
+
expect(data.value[1]).toMatchObject({ label: '调接口' })
|
|
365
|
+
expect(model.label).toBe('')
|
|
366
|
+
expect(queryDialog()).toBeNull()
|
|
367
|
+
|
|
368
|
+
unmount()
|
|
369
|
+
})
|
|
370
|
+
})
|
|
371
|
+
|
|
372
|
+
describe('UBatchEdit 属性透传', () => {
|
|
373
|
+
it('style / class 等非 props 属性透传到根布局元素(组件为片段根,需手动继承)', async () => {
|
|
374
|
+
const { host, unmount } = mountBatchEdit({
|
|
375
|
+
props: { style: 'height: 500px', class: 'custom-batch-edit' }
|
|
376
|
+
})
|
|
377
|
+
await nextTick()
|
|
378
|
+
|
|
379
|
+
const root = host.querySelector<HTMLElement>('.u-batch-edit')
|
|
380
|
+
expect(root).toBeTruthy()
|
|
381
|
+
expect(root!.classList.contains('custom-batch-edit')).toBe(true)
|
|
382
|
+
expect(root!.style.height).toBe('500px')
|
|
383
|
+
|
|
384
|
+
unmount()
|
|
385
|
+
})
|
|
386
|
+
})
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<!--
|
|
3
|
-
|
|
2
|
+
<!-- 面板模式:表单常驻挂载(快照只在挂载时对传入的 model 拍一次),仅用 v-show 控制显隐;
|
|
3
|
+
弹框模式:表单随弹框挂载 / 卸载,model 初始快照由 use-edit-state 维护 -->
|
|
4
|
+
<aside
|
|
5
|
+
:class="[cls.e('form'), bem.is('dialog', props.formMode === 'dialog')]"
|
|
6
|
+
v-if="!!props.model"
|
|
7
|
+
v-show="state.formVisible"
|
|
8
|
+
>
|
|
4
9
|
<header :class="cls.e('form-header')">
|
|
5
10
|
<span :class="[cls.e('form-icon'), bem.is(state.formActionType)]">
|
|
6
11
|
<u-icon>
|
|
@@ -48,7 +53,7 @@
|
|
|
48
53
|
<span :class="cls.e('form-hint')">
|
|
49
54
|
<template v-if="props.readonly"> 只读模式 </template>
|
|
50
55
|
|
|
51
|
-
<span :class="{ [bem.is('concealed')]: !
|
|
56
|
+
<span :class="{ [bem.is('concealed')]: !shortcutActive }">
|
|
52
57
|
<template v-if="!(state.formActionType === 'update' && props.quickEdit)">
|
|
53
58
|
<u-kbd>Ctrl + S</u-kbd> 保存 ·
|
|
54
59
|
</template>
|
|
@@ -86,6 +91,7 @@ import { UKbd } from '../kbd'
|
|
|
86
91
|
import { UScroll } from '../scroll'
|
|
87
92
|
import { BatchEditDIKey } from './di'
|
|
88
93
|
import { FORM_ACTION_HEADER_MAP } from './form-action-header'
|
|
94
|
+
import { useDialogEffect } from './use-dialog-effect'
|
|
89
95
|
|
|
90
96
|
defineOptions({ name: 'UBatchEditForm' })
|
|
91
97
|
|
|
@@ -96,6 +102,14 @@ const { cls, props, state, handleClose, handleSave, staticFeatures, dynamicFeatu
|
|
|
96
102
|
|
|
97
103
|
const focused = toRef(batchEditCtx, 'focused')
|
|
98
104
|
|
|
105
|
+
// 弹框模式下,弹框自身关闭(遮罩点击 / 右上角关闭)时同步走 handleClose,不保存
|
|
106
|
+
useDialogEffect({ closeForm: handleClose })
|
|
107
|
+
|
|
108
|
+
/** 快捷键提示是否可见:面板模式随聚焦显隐;弹框模式弹框打开期间快捷键始终可用 */
|
|
109
|
+
const shortcutActive = computed(() => {
|
|
110
|
+
return props.formMode === 'dialog' ? state.formVisible : focused.value
|
|
111
|
+
})
|
|
112
|
+
|
|
99
113
|
const formComponentRef = shallowRef<FormExposed>()
|
|
100
114
|
|
|
101
115
|
defineExpose<_FormExposed>({
|
|
@@ -9,15 +9,29 @@
|
|
|
9
9
|
@focusin="handleFocusIn"
|
|
10
10
|
@focusout="handleFocusOut"
|
|
11
11
|
@keydown.capture="handleKeydown"
|
|
12
|
+
v-bind="$attrs"
|
|
12
13
|
>
|
|
13
14
|
<!-- 编辑列表 -->
|
|
14
15
|
<BatchEditList :slots="slots" />
|
|
15
16
|
|
|
16
17
|
<!-- 编辑表单 -->
|
|
17
|
-
<BatchEditForm ref="form" v-slot="scoped">
|
|
18
|
+
<BatchEditForm v-if="props.formMode === 'panel'" ref="form" v-slot="scoped">
|
|
18
19
|
<slot name="form" v-bind="scoped" />
|
|
19
20
|
</BatchEditForm>
|
|
20
21
|
</u-layout>
|
|
22
|
+
|
|
23
|
+
<!-- 弹框模式:表单经 UDialog 呈现(teleport 到 body),快捷键监听落在弹框上,Esc 与弹框自带的 keyup.esc 去重 -->
|
|
24
|
+
<u-dialog
|
|
25
|
+
v-if="props.formMode === 'dialog'"
|
|
26
|
+
v-model="state.formVisible"
|
|
27
|
+
:class="cls.e('form-dialog')"
|
|
28
|
+
@keydown.capture="handleKeydown"
|
|
29
|
+
@keyup.esc.stop
|
|
30
|
+
>
|
|
31
|
+
<BatchEditForm ref="form" v-slot="scoped">
|
|
32
|
+
<slot name="form" v-bind="scoped" />
|
|
33
|
+
</BatchEditForm>
|
|
34
|
+
</u-dialog>
|
|
21
35
|
</template>
|
|
22
36
|
|
|
23
37
|
<script lang="ts" setup>
|
|
@@ -25,6 +39,7 @@ import { bem } from '@veltra/utils'
|
|
|
25
39
|
import { computed, provide, useTemplateRef } from 'vue'
|
|
26
40
|
|
|
27
41
|
import type { BatchEditEmits, BatchEditProps, BatchEditSlots, FormExposed } from '../../types'
|
|
42
|
+
import { UDialog } from '../dialog'
|
|
28
43
|
import { ULayout } from '../layout'
|
|
29
44
|
import BatchEditForm from './batch-edit-form.vue'
|
|
30
45
|
import BatchEditList from './batch-edit-list.vue'
|
|
@@ -34,9 +49,12 @@ import { useFeatures } from './use-features'
|
|
|
34
49
|
import { useHandlers } from './use-handlers'
|
|
35
50
|
import { useShortcutKey } from './use-shortcut-key'
|
|
36
51
|
|
|
37
|
-
defineOptions({ name: 'UBatchEdit' })
|
|
52
|
+
defineOptions({ name: 'UBatchEdit', inheritAttrs: false })
|
|
38
53
|
|
|
39
|
-
const props = withDefaults(defineProps<BatchEditProps>(), {
|
|
54
|
+
const props = withDefaults(defineProps<BatchEditProps>(), {
|
|
55
|
+
cols: () => ['1fr', '420px'],
|
|
56
|
+
formMode: 'panel'
|
|
57
|
+
})
|
|
40
58
|
|
|
41
59
|
const emit = defineEmits<BatchEditEmits>()
|
|
42
60
|
|
|
@@ -61,7 +79,7 @@ const { handleFocusIn, handleFocusOut, handleKeydown, focused } = useShortcutKey
|
|
|
61
79
|
})
|
|
62
80
|
|
|
63
81
|
const cols = computed(() => {
|
|
64
|
-
return state.formVisible ? props.cols : undefined
|
|
82
|
+
return props.formMode === 'panel' && state.formVisible ? props.cols : undefined
|
|
65
83
|
})
|
|
66
84
|
|
|
67
85
|
provide(BatchEditDIKey, {
|
|
@@ -52,6 +52,14 @@ $root-name: batch-edit;
|
|
|
52
52
|
overflow: hidden;
|
|
53
53
|
isolation: isolate;
|
|
54
54
|
min-height: 0;
|
|
55
|
+
|
|
56
|
+
// 弹框模式:背景 / 圆角 / 阴影由弹框外壳提供,表单只保留内部布局并限高滚动
|
|
57
|
+
@include m.is(dialog) {
|
|
58
|
+
max-height: min(600px, 80vh);
|
|
59
|
+
background-color: transparent;
|
|
60
|
+
border-radius: 0;
|
|
61
|
+
box-shadow: none;
|
|
62
|
+
}
|
|
55
63
|
}
|
|
56
64
|
|
|
57
65
|
@include m.e(form-header) {
|
|
@@ -171,3 +179,15 @@ $root-name: batch-edit;
|
|
|
171
179
|
flex-shrink: 0;
|
|
172
180
|
}
|
|
173
181
|
}
|
|
182
|
+
|
|
183
|
+
// ---------- 弹框模式 ----------
|
|
184
|
+
// 弹框 teleport 到 body,不在 .u-batch-edit 内,样式置于顶层
|
|
185
|
+
#{fn.bem(batch-edit, form-dialog)} {
|
|
186
|
+
width: 560px;
|
|
187
|
+
max-width: calc(100vw - 32px);
|
|
188
|
+
|
|
189
|
+
// 表单自带头部(图标 / 标题 / 关闭按钮),弹框头部不再展示
|
|
190
|
+
#{fn.bem(dialog, header)} {
|
|
191
|
+
display: none;
|
|
192
|
+
}
|
|
193
|
+
}
|
|
@@ -10,12 +10,18 @@ interface Options {
|
|
|
10
10
|
/**
|
|
11
11
|
* 在表单上的副作用。
|
|
12
12
|
* 包括:关闭表单
|
|
13
|
+
*
|
|
14
|
+
* sync 触发:弹框关闭会随即卸载表单组件,默认 pre 时序下 watcher 可能随组件卸载被丢弃
|
|
13
15
|
*/
|
|
14
16
|
export function useDialogEffect(options: Options) {
|
|
15
17
|
const dialogCtx = inject(DialogDIKey, undefined)
|
|
16
18
|
if (!dialogCtx) return
|
|
17
19
|
|
|
18
|
-
watch(
|
|
19
|
-
|
|
20
|
-
|
|
20
|
+
watch(
|
|
21
|
+
dialogCtx.visible,
|
|
22
|
+
(visible) => {
|
|
23
|
+
!visible && options.closeForm?.()
|
|
24
|
+
},
|
|
25
|
+
{ flush: 'sync' }
|
|
26
|
+
)
|
|
21
27
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { o } from '@cat-kit/core'
|
|
1
|
+
import { copy, o } from '@cat-kit/core'
|
|
2
2
|
import { nextTick, shallowReactive, shallowRef, watch, type ShallowRef } from 'vue'
|
|
3
3
|
|
|
4
4
|
import type { BatchEditProps, BatchEditStates, FormExposed } from '../../types'
|
|
@@ -24,9 +24,37 @@ export function useEditState(options: Options) {
|
|
|
24
24
|
/** 是否正在以编程方式重置/回显表单,此期间禁止 quick-edit 回写行数据 */
|
|
25
25
|
const syncing = shallowRef(false)
|
|
26
26
|
|
|
27
|
+
/**
|
|
28
|
+
* model 初始快照。
|
|
29
|
+
* 面板模式由常驻挂载的 UForm 自行维护快照;dialog 模式表单随弹框卸载,
|
|
30
|
+
* UForm 快照会在每次打开时按已回显的 model 重拍,故这里单独保留一份供恢复
|
|
31
|
+
*/
|
|
32
|
+
const initialModel = shallowRef<Record<string, any>>()
|
|
33
|
+
|
|
34
|
+
watch(
|
|
35
|
+
() => props.model,
|
|
36
|
+
(model) => {
|
|
37
|
+
initialModel.value = props.formMode === 'dialog' && model ? copy(model) : undefined
|
|
38
|
+
},
|
|
39
|
+
{ immediate: true }
|
|
40
|
+
)
|
|
41
|
+
|
|
42
|
+
/** 重置表单数据到 model 初始快照 */
|
|
43
|
+
function resetModel() {
|
|
44
|
+
if (props.formMode !== 'dialog') {
|
|
45
|
+
formRef.value?.reset()
|
|
46
|
+
return
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
formRef.value?.clearValidate()
|
|
50
|
+
if (!props.model || !initialModel.value) return
|
|
51
|
+
for (const key of Object.keys(initialModel.value)) {
|
|
52
|
+
o(props.model).set(key, copy(initialModel.value[key]))
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
|
|
27
56
|
function resetState() {
|
|
28
|
-
|
|
29
|
-
formRef.value?.reset()
|
|
57
|
+
resetModel()
|
|
30
58
|
|
|
31
59
|
if (state.row) {
|
|
32
60
|
state.row.isCurrent = false
|
|
@@ -47,7 +75,7 @@ export function useEditState(options: Options) {
|
|
|
47
75
|
// 先重置回 model 初始快照,再同步回显行数据。
|
|
48
76
|
// 同一 tick 内的连续写入会被表单字段 watcher 合并,
|
|
49
77
|
// 重置产生的默认值不会触发 field:update 回写行数据
|
|
50
|
-
|
|
78
|
+
resetModel()
|
|
51
79
|
|
|
52
80
|
if (row) {
|
|
53
81
|
if (props.model) {
|
|
@@ -170,6 +170,12 @@ export function useHandlers(options: Options): EditReturned {
|
|
|
170
170
|
}
|
|
171
171
|
insert(item)
|
|
172
172
|
|
|
173
|
+
// 弹框模式保存成功即关闭,不走面板的连续新增
|
|
174
|
+
if (props.formMode === 'dialog') {
|
|
175
|
+
resetState()
|
|
176
|
+
return
|
|
177
|
+
}
|
|
178
|
+
|
|
173
179
|
// 推进插入点,便于连续新增;并重置表单到初始默认值
|
|
174
180
|
const next = last(state.indexPath) + 1
|
|
175
181
|
state.indexPath = [...state.indexPath.slice(0, -1), next]
|
|
@@ -190,6 +196,10 @@ export function useHandlers(options: Options): EditReturned {
|
|
|
190
196
|
Object.keys(item).forEach((key) => {
|
|
191
197
|
o(row.data).set(key, o(item).get(key))
|
|
192
198
|
})
|
|
199
|
+
|
|
200
|
+
if (props.formMode === 'dialog') {
|
|
201
|
+
resetState()
|
|
202
|
+
}
|
|
193
203
|
})
|
|
194
204
|
|
|
195
205
|
const handleDelete = runWithLoading(async (row: TableRow) => {
|
|
@@ -38,12 +38,16 @@ export function useShortcutKey(options: Options) {
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
/**
|
|
41
|
-
*
|
|
41
|
+
* 键盘快捷键:
|
|
42
42
|
* - Esc 关闭表单
|
|
43
43
|
* - ⌘/Ctrl + S 保存(快速编辑模式下编辑行时除外)
|
|
44
|
+
*
|
|
45
|
+
* 面板模式仅组件获焦时生效;弹框模式表单被 teleport 到 body,
|
|
46
|
+
* 组件聚焦状态覆盖不到,改为弹框打开期间生效
|
|
44
47
|
*/
|
|
45
48
|
function handleKeydown(e: KeyboardEvent) {
|
|
46
|
-
|
|
49
|
+
const active = props.formMode === 'dialog' ? state.formVisible : focused.value
|
|
50
|
+
if (!active) return
|
|
47
51
|
if (props.readonly && e.key !== 'Escape') return
|
|
48
52
|
|
|
49
53
|
if (e.key === 'Escape') return runEscape(e)
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest'
|
|
2
|
+
|
|
3
|
+
import { FILE_VIEWER_KIND_LABEL, inferKind } from '../helper'
|
|
4
|
+
|
|
5
|
+
describe('file-viewer helper', () => {
|
|
6
|
+
it('.ofd 按 OFD 类别识别,不落入 text 兜底', () => {
|
|
7
|
+
expect(inferKind('invoice.ofd')).toBe('ofd')
|
|
8
|
+
})
|
|
9
|
+
|
|
10
|
+
it('OFD 类别的展示标签为 OFD', () => {
|
|
11
|
+
expect(FILE_VIEWER_KIND_LABEL.ofd).toBe('OFD')
|
|
12
|
+
})
|
|
13
|
+
})
|
|
@@ -169,7 +169,7 @@
|
|
|
169
169
|
:class="isTransformable ? cls.e('previewer') : undefined"
|
|
170
170
|
:style="previewerStyle"
|
|
171
171
|
@error="handleChildError"
|
|
172
|
-
@zoom-change="
|
|
172
|
+
@zoom-change="handlePreviewerZoomChange"
|
|
173
173
|
/>
|
|
174
174
|
</div>
|
|
175
175
|
<div v-else :class="cls.e('empty')">
|
|
@@ -238,10 +238,12 @@ const MIN_SCALE = 0.5
|
|
|
238
238
|
const MAX_SCALE = 3
|
|
239
239
|
/** 每次缩放固定增减 10% */
|
|
240
240
|
const SCALE_STEP = 0.1
|
|
241
|
-
/** 使用 CSS transform 缩放的类型(PDF
|
|
241
|
+
/** 使用 CSS transform 缩放的类型(PDF / OFD 由各自 previewer 内部缩放) */
|
|
242
242
|
const TRANSFORMABLE_KINDS = new Set<FileViewerKind>(['image'])
|
|
243
243
|
/** 工具栏显示缩放控件的类型 */
|
|
244
|
-
const ZOOMABLE_KINDS = new Set<FileViewerKind>(['image', 'pdf'])
|
|
244
|
+
const ZOOMABLE_KINDS = new Set<FileViewerKind>(['image', 'pdf', 'ofd'])
|
|
245
|
+
/** 缩放由 previewer 内部实现、组件只透传命令并回显级别的类型 */
|
|
246
|
+
const DELEGATED_ZOOM_KINDS = new Set<FileViewerKind>(['pdf', 'ofd'])
|
|
245
247
|
|
|
246
248
|
const activeId = defineModel<string | undefined>('modelValue', { default: undefined })
|
|
247
249
|
const openModel = defineModel<boolean | undefined>('open', { default: undefined })
|
|
@@ -253,7 +255,7 @@ const previewerRef = shallowRef<{
|
|
|
253
255
|
resetZoom?: () => void
|
|
254
256
|
}>()
|
|
255
257
|
const scale = ref(1)
|
|
256
|
-
const
|
|
258
|
+
const previewerZoomLevel = ref(1)
|
|
257
259
|
const offsetX = ref(0)
|
|
258
260
|
const offsetY = ref(0)
|
|
259
261
|
const isDragging = ref(false)
|
|
@@ -268,6 +270,7 @@ const PreviewerMap: Record<FileViewerKind, ReturnType<typeof defineAsyncComponen
|
|
|
268
270
|
pdf: defineAsyncComponent(() => import('./previewers/pdf-previewer.vue')),
|
|
269
271
|
sheet: defineAsyncComponent(() => import('./previewers/sheet-previewer.vue')),
|
|
270
272
|
docx: defineAsyncComponent(() => import('./previewers/docx-previewer.vue')),
|
|
273
|
+
ofd: defineAsyncComponent(() => import('./previewers/ofd-previewer.vue')),
|
|
271
274
|
text: defineAsyncComponent(() => import('./previewers/text-previewer.vue'))
|
|
272
275
|
}
|
|
273
276
|
|
|
@@ -312,11 +315,15 @@ const isTransformable = computed(
|
|
|
312
315
|
|
|
313
316
|
const isZoomable = computed(() => !!activeFile.value && ZOOMABLE_KINDS.has(activeFile.value.kind))
|
|
314
317
|
|
|
315
|
-
const
|
|
318
|
+
const isDelegatedZoom = computed(
|
|
319
|
+
() => !!activeFile.value && DELEGATED_ZOOM_KINDS.has(activeFile.value.kind)
|
|
320
|
+
)
|
|
316
321
|
|
|
317
322
|
const canPan = computed(() => isTransformable.value && scale.value > 1)
|
|
318
323
|
|
|
319
|
-
const displayZoomLevel = computed(() =>
|
|
324
|
+
const displayZoomLevel = computed(() =>
|
|
325
|
+
isDelegatedZoom.value ? previewerZoomLevel.value : scale.value
|
|
326
|
+
)
|
|
320
327
|
|
|
321
328
|
const zoomPercent = computed(() => `${Math.round(displayZoomLevel.value * 100)}%`)
|
|
322
329
|
|
|
@@ -325,8 +332,8 @@ const zoomInDisabled = computed(() => !isZoomable.value || displayZoomLevel.valu
|
|
|
325
332
|
const zoomOutDisabled = computed(() => !isZoomable.value || displayZoomLevel.value <= MIN_SCALE)
|
|
326
333
|
|
|
327
334
|
const isTransformReset = computed(() => {
|
|
328
|
-
if (
|
|
329
|
-
return Math.abs(
|
|
335
|
+
if (isDelegatedZoom.value) {
|
|
336
|
+
return Math.abs(previewerZoomLevel.value - 1) < 0.02
|
|
330
337
|
}
|
|
331
338
|
return scale.value === 1 && offsetX.value === 0 && offsetY.value === 0
|
|
332
339
|
})
|
|
@@ -378,7 +385,7 @@ function setScale(value: number) {
|
|
|
378
385
|
|
|
379
386
|
function zoomIn() {
|
|
380
387
|
if (!isZoomable.value) return
|
|
381
|
-
if (
|
|
388
|
+
if (isDelegatedZoom.value) {
|
|
382
389
|
previewerRef.value?.zoomIn?.()
|
|
383
390
|
return
|
|
384
391
|
}
|
|
@@ -387,7 +394,7 @@ function zoomIn() {
|
|
|
387
394
|
|
|
388
395
|
function zoomOut() {
|
|
389
396
|
if (!isZoomable.value) return
|
|
390
|
-
if (
|
|
397
|
+
if (isDelegatedZoom.value) {
|
|
391
398
|
previewerRef.value?.zoomOut?.()
|
|
392
399
|
return
|
|
393
400
|
}
|
|
@@ -395,9 +402,9 @@ function zoomOut() {
|
|
|
395
402
|
}
|
|
396
403
|
|
|
397
404
|
function resetTransform() {
|
|
398
|
-
if (
|
|
405
|
+
if (isDelegatedZoom.value) {
|
|
399
406
|
previewerRef.value?.resetZoom?.()
|
|
400
|
-
|
|
407
|
+
previewerZoomLevel.value = 1
|
|
401
408
|
return
|
|
402
409
|
}
|
|
403
410
|
scale.value = 1
|
|
@@ -407,8 +414,8 @@ function resetTransform() {
|
|
|
407
414
|
isDragging.value = false
|
|
408
415
|
}
|
|
409
416
|
|
|
410
|
-
function
|
|
411
|
-
|
|
417
|
+
function handlePreviewerZoomChange(level: number) {
|
|
418
|
+
previewerZoomLevel.value = level
|
|
412
419
|
}
|
|
413
420
|
|
|
414
421
|
function isZoomWheel(e: WheelEvent): boolean {
|
|
@@ -462,7 +469,7 @@ function handleViewportPointerEnd(e: PointerEvent) {
|
|
|
462
469
|
}
|
|
463
470
|
|
|
464
471
|
function handleViewportDblclick() {
|
|
465
|
-
if (
|
|
472
|
+
if (isDelegatedZoom.value) return
|
|
466
473
|
if (!isTransformable.value) return
|
|
467
474
|
if (scale.value === 1) {
|
|
468
475
|
setScale(2)
|
|
@@ -521,7 +528,7 @@ watch(
|
|
|
521
528
|
watch(
|
|
522
529
|
() => activeFile.value?.id,
|
|
523
530
|
async () => {
|
|
524
|
-
|
|
531
|
+
previewerZoomLevel.value = 1
|
|
525
532
|
await nextTick()
|
|
526
533
|
resetTransform()
|
|
527
534
|
}
|
|
@@ -47,6 +47,7 @@ export function inferKind(name: string, explicit?: FileViewerKind): FileViewerKi
|
|
|
47
47
|
if (ext === 'pdf') return 'pdf'
|
|
48
48
|
if (SHEET_EXTS.has(ext)) return 'sheet'
|
|
49
49
|
if (ext === 'docx') return 'docx'
|
|
50
|
+
if (ext === 'ofd') return 'ofd'
|
|
50
51
|
if (TEXT_EXTS.has(ext)) return 'text'
|
|
51
52
|
return 'text'
|
|
52
53
|
}
|
|
@@ -57,6 +58,7 @@ export const FILE_VIEWER_KIND_LABEL: Record<FileViewerKind, string> = {
|
|
|
57
58
|
pdf: 'PDF',
|
|
58
59
|
sheet: 'XLS',
|
|
59
60
|
docx: 'DOC',
|
|
61
|
+
ofd: 'OFD',
|
|
60
62
|
text: 'TXT'
|
|
61
63
|
}
|
|
62
64
|
|