mirror of
https://github.com/Tencent/tmagic-editor.git
synced 2026-07-29 01:15:48 +00:00
Compare commits
No commits in common. "master" and "v1.8.0-beta.14" have entirely different histories.
master
...
v1.8.0-bet
57
CHANGELOG.md
57
CHANGELOG.md
@ -1,60 +1,3 @@
|
||||
# [1.8.0-beta.19](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.18...v1.8.0-beta.19) (2026-07-28)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **form:** 新增 validateOnInit,默认关闭初始化时自动校验 ([b7c04ed](https://github.com/Tencent/tmagic-editor/commit/b7c04edcd518554d5117c2212bbfe8ef632a4b37))
|
||||
# [1.8.0-beta.18](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.17...v1.8.0-beta.18) (2026-07-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **editor:** 修复 IdleTask 任务异常或 clearTasks 时队列卡住的问题 ([3fe9cf9](https://github.com/Tencent/tmagic-editor/commit/3fe9cf9b664dc5b39c17b40efe1d3935c89f7553))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **form:** 支持 typeMatch 异步校验与 validator 返回值约定 ([a123747](https://github.com/Tencent/tmagic-editor/commit/a123747e9d250166c2bb0f1d3ce3a39dd5baea9f))
|
||||
# [1.8.0-beta.17](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.16...v1.8.0-beta.17) (2026-07-27)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **editor:** 修复 collectIdle 批次结算与中断时 Promise 挂起问题 ([b5abf31](https://github.com/Tencent/tmagic-editor/commit/b5abf310663f0bc34bd2c51c2e1a28de0bdf6ab9))
|
||||
* **editor:** 切换动作类型时清空关联配置字段 ([b564c9e](https://github.com/Tencent/tmagic-editor/commit/b564c9e4aacd215dd46c4b839cf0033ceedc8047))
|
||||
* **form,table:** groupList分界线、空状态、actions只存在一个 ([dec4ebf](https://github.com/Tencent/tmagic-editor/commit/dec4ebfa20483f699a676e41e0541d23ebe24d81))
|
||||
* **form:** 完善 mountFormInstance 清理逻辑,避免临时表单实例泄漏 ([bf8df74](https://github.com/Tencent/tmagic-editor/commit/bf8df74864b78891a8820462062624702a1d33d3))
|
||||
* **table:** 列操作点击后关闭popover ([596d86f](https://github.com/Tencent/tmagic-editor/commit/596d86f2ab08d3d4e6548b5e4bd5759d18e4493d))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **editor,stage:** 新增 containerHighlightAddOnly 配置 ([e6cf694](https://github.com/Tencent/tmagic-editor/commit/e6cf694a032652e4f2c05efbab4a07a252e2ffa1))
|
||||
# [1.8.0-beta.16](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.15...v1.8.0-beta.16) (2026-07-23)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* 参考建议可选值最多展示个数由 5 调整为 20 ([0e1986c](https://github.com/Tencent/tmagic-editor/commit/0e1986c81998e50461c294c1a27a8139e8ae9a13))
|
||||
# [1.8.0-beta.15](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.14...v1.8.0-beta.15) (2026-07-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **core:** 为背景图片 URL 添加引号 ([97e0cac](https://github.com/Tencent/tmagic-editor/commit/97e0cac44a2d6ceafaf95fbc4ae716bfe5d47f70))
|
||||
* **editor:** 使用属性面板中的源码删除样式无效 ([cde0805](https://github.com/Tencent/tmagic-editor/commit/cde08052924ddef1c51faeb68ce15d3195827adb))
|
||||
* **editor:** 右键菜单动态变化后修复菜单位置防止截断 ([6919a0a](https://github.com/Tencent/tmagic-editor/commit/6919a0a0b19efff92821fc8d52b61b2f7382a817))
|
||||
* 跳过无字段名称配置的类型校验 ([11bf037](https://github.com/Tencent/tmagic-editor/commit/11bf037054774937132743a40006364e49ee8fd5))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **design:** 优化 FormItem 和 colorPicker 样式 ([2e031cc](https://github.com/Tencent/tmagic-editor/commit/2e031cc1346fb6ea739f0d45a89213b6577dc7ee))
|
||||
* **editor:** 数据源字段选择器校验提示细化并支持 fieldConfig 类型校验 ([fe9e754](https://github.com/Tencent/tmagic-editor/commit/fe9e754b50f14e6034170b2284553ec1c4536150))
|
||||
* **form,design:** 一行多个表单默认右靠齐label ([48abab7](https://github.com/Tencent/tmagic-editor/commit/48abab7051b93b7ed336172c21ab3b908733f2e7))
|
||||
* **form,editor:** submitForm/validateForm 静默挂载时注入静默标记,vs-code 字段跳过 monaco 渲染 ([3b9d5da](https://github.com/Tencent/tmagic-editor/commit/3b9d5da0bc9f323e944c0e2adb4fc88642ce1915))
|
||||
* **form:** text 类型校验允许数字值,兼容数据源字段配置 ([1f389ff](https://github.com/Tencent/tmagic-editor/commit/1f389ff9fd77fb93ad749f3fdbbc8aa0fe8725ac))
|
||||
* 新增 page-structure-change 事件,支持页面增删统一通知 ([745f449](https://github.com/Tencent/tmagic-editor/commit/745f44939605528e8e2ccd0639478db98293a441))
|
||||
# [1.8.0-beta.14](https://github.com/Tencent/tmagic-editor/compare/v1.8.0-beta.13...v1.8.0-beta.14) (2026-07-23)
|
||||
|
||||
|
||||
|
||||
@ -1019,18 +1019,6 @@ alt: 按住alt键启动识别
|
||||
|
||||
|
||||
- **类型:** `'default' | 'alt' | ''`
|
||||
|
||||
## containerHighlightAddOnly
|
||||
|
||||
- **详情:**
|
||||
|
||||
是否只有新增组件(从组件列表拖入新组件)时才启用识别容器
|
||||
|
||||
开启后,在画布中拖动已有组件时不再识别容器,即已有组件不能通过拖动加入其他容器;新增组件仍然按 [containerHighlightType](#containerHighlightType) 配置的方式识别
|
||||
|
||||
- **默认值:** `false`
|
||||
|
||||
- **类型:** `boolean`
|
||||
|
||||
## stageRect
|
||||
|
||||
|
||||
@ -69,11 +69,10 @@
|
||||
|
||||
## delayedMarkContainer
|
||||
|
||||
- **类型**:`(event: MouseEvent, excludeElList?: Element[], isAdd?: boolean) => NodeJS.Timeout | undefined`
|
||||
- **类型**:`(event: MouseEvent, excludeElList?: Element[]) => NodeJS.Timeout | undefined`
|
||||
- **参数**:
|
||||
- `event`:鼠标事件
|
||||
- `excludeElList`:计算鼠标所在容器时要排除的元素列表
|
||||
- `isAdd`:当前操作是否为新增组件(从组件列表拖入新组件),`containerHighlightType` 为 `addOnly` 时只有新增才会标记容器
|
||||
- **详情**:
|
||||
|
||||
鼠标拖拽着元素,在容器上方悬停,延迟一段时间后,对容器进行标记,如果悬停时间够长将标记成功,悬停时间短,调用方通过返回的timeoutId取消标记
|
||||
|
||||
@ -69,8 +69,6 @@
|
||||
}
|
||||
```
|
||||
|
||||
`validator` 除了调用 `callback` 外,也兼容 async-validator 的返回值约定:返回 `false` 或 `Error` / 错误数组表示失败,返回 `true` 表示通过,返回 `Promise` 则以 resolve / reject 为结果,内部抛出的异常会转成校验失败。同步与异步 `typeMatch` 下这些约定行为一致,且只会上报一次结果(既调 `callback` 又返回 `Promise` 时以先到的为准)。
|
||||
|
||||
## 扩展自定义 type 规则
|
||||
|
||||
业务可覆盖内置规则,或为自定义字段 type 注册校验。自定义规则优先于内置规则。
|
||||
@ -109,26 +107,7 @@ deleteTypeMatchRule('foo');
|
||||
clearTypeMatchRules();
|
||||
```
|
||||
|
||||
自定义校验器签名:`(value, context) => string | undefined | Promise<string | undefined>`。返回错误文案表示失败,返回 `undefined` 表示通过。`context` 包含 `fieldType`、`mForm`、`props`、`message`。
|
||||
|
||||
### 异步校验
|
||||
|
||||
自定义校验器可以返回 `Promise`,用于需要异步确认取值是否合法的场景(如请求接口校验 id 是否存在)。内置规则均为同步。
|
||||
|
||||
```ts
|
||||
registerTypeMatchRule('mod-select', async (value, { message }) => {
|
||||
const exists = await checkModExists(value);
|
||||
if (!exists) {
|
||||
return message || `模块(${value})不存在`;
|
||||
}
|
||||
});
|
||||
```
|
||||
|
||||
异步校验器通过后才会执行同一条 rule 上的自定义 `validator`。需要注意几点:
|
||||
|
||||
- **校验器自身失败不算校验失败。** Promise 被 reject(如接口异常)时只打印错误、该字段按通过处理,避免网络故障阻塞操作。需要把失败暴露给用户时请在校验器内部 catch 并返回错误文案。
|
||||
- **建议自行缓存请求结果。** 每次校验都会执行校验器,无缓存会导致逐次输入都发请求;也可以给 rule 配 `trigger: 'blur'` 降低触发频率。
|
||||
- **只有最新一轮校验的结论会被采用。** 新一轮校验开始后,上一轮针对旧值、尚未返回的校验不再使用自己的结论,而是等最新一轮出结论后一起结算,因此旧结论不会晚到覆盖新结论,`form.validate()` 也不会对一个尚未校验完的值返回成功。
|
||||
自定义校验器签名:`(value, context) => string | undefined`。返回错误文案表示失败,返回 `undefined` 表示通过。`context` 包含 `fieldType`、`mForm`、`props`、`message`。
|
||||
|
||||
### 安装时注册
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "tmagic",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/cli",
|
||||
"main": "lib/index.js",
|
||||
"types": "lib/index.d.ts",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/core",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -51,7 +51,7 @@ export const style2Obj = (style: string) => {
|
||||
|
||||
export const fillBackgroundImage = (value: string) => {
|
||||
if (value && !/^url/.test(value) && !/^linear-gradient/.test(value)) {
|
||||
return `url("${value}")`;
|
||||
return `url(${value})`;
|
||||
}
|
||||
return value;
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ describe('style2Obj', () => {
|
||||
|
||||
describe('fillBackgroundImage', () => {
|
||||
test('裸路径会包裹 url()', () => {
|
||||
expect(fillBackgroundImage('a.png')).toBe('url("a.png")');
|
||||
expect(fillBackgroundImage('a.png')).toBe('url(a.png)');
|
||||
});
|
||||
|
||||
test('已经是 url() 不重复包裹', () => {
|
||||
@ -127,7 +127,7 @@ describe('transformStyle', () => {
|
||||
|
||||
test('backgroundImage: browser 下补全 url()', () => {
|
||||
expect(transformStyle({ backgroundImage: 'a.png' }, 'browser')).toEqual({
|
||||
backgroundImage: 'url("a.png")',
|
||||
backgroundImage: 'url(a.png)',
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/data-source",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/dep",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/design",
|
||||
"type": "module",
|
||||
"sideEffects": [
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
<template>
|
||||
<component
|
||||
:is="uiComponent"
|
||||
:class="['tmagic-design-card', { 'tmagic-design-card--flat': isFlat, 'm-flat-hide-body': isHideBody }]"
|
||||
v-bind="uiProps"
|
||||
>
|
||||
<component :is="uiComponent" :class="['tmagic-design-card', { 'tmagic-design-card--flat': isFlat }]" v-bind="uiProps">
|
||||
<template #header v-if="$slots.header">
|
||||
<slot name="header" class="header"></slot>
|
||||
</template>
|
||||
@ -34,7 +30,7 @@ const uiComponent = ui?.component || 'el-card';
|
||||
// 当祖先 `<MEditor>` / `<MForm>` 的 theme 是 `magic-admin` 时,整套设计语言默认走「无卡片感」,
|
||||
// 因此这里自动等价于 `flat=true`;调用方仍可显式传 `flat` 强制开启。
|
||||
const isFlat = computed(() => !!props.flat || isGlobalFlat.value);
|
||||
const isHideBody = computed(() => isFlat.value && props.bodyStyle?.display === 'none');
|
||||
|
||||
// 把 `flat` 从转发给底层 UI 库(el-card / t-card 等)的 props 中剥离:
|
||||
// 它仅作用于本组件的视觉修饰类,不需要也不应该作为属性落到底层组件 / DOM 上。
|
||||
const uiProps = computed<CardProps>(() => {
|
||||
|
||||
@ -47,12 +47,12 @@ const uiComponent = ui?.component || 'el-form-item';
|
||||
|
||||
const adapterType = getDesignConfig('adapterType');
|
||||
|
||||
const formInline = inject<boolean>('formInline', false);
|
||||
const formInRow = inject<boolean>('isInRow', false);
|
||||
const formInline = inject<boolean>('formInline');
|
||||
|
||||
const uiProps = computed<FormItemProps>(() => {
|
||||
const { extra, extraTips, ...rest } = ui?.props(props) || props;
|
||||
if (isGlobalFlat.value && rest.labelPosition === undefined) {
|
||||
return { ...rest, labelPosition: formInline || formInRow ? 'right' : 'left' };
|
||||
return { ...rest, labelPosition: formInline ? 'right' : 'left' };
|
||||
}
|
||||
return rest;
|
||||
});
|
||||
|
||||
@ -11,11 +11,7 @@
|
||||
border-right: 0;
|
||||
border-radius: 0;
|
||||
border-bottom: 0;
|
||||
&.m-flat-hide-body {
|
||||
.el-card__header {
|
||||
border-bottom: 0 !important;
|
||||
}
|
||||
}
|
||||
|
||||
&.m-fields-group-list-item {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
@ -33,10 +29,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
.m-fields-group-list-footer {
|
||||
margin-bottom: 4px;
|
||||
margin-top: 4px;
|
||||
}
|
||||
.el-card__body {
|
||||
padding: 0 16px 0 16px;
|
||||
// 这里每个form-item应该要有一个16px间距,但是除了tbody中的form-item
|
||||
@ -69,7 +61,7 @@
|
||||
}
|
||||
> .el-card__body {
|
||||
background-color: #fff;
|
||||
padding-top: 8px;
|
||||
padding-top: 16px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,7 +2,3 @@
|
||||
margin-left: 8px;
|
||||
width: calc(var(--el-input-width, 100%) - 40px);
|
||||
}
|
||||
|
||||
.tmagic-design-color-picker {
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/editor",
|
||||
"type": "module",
|
||||
"sideEffects": [
|
||||
|
||||
@ -218,7 +218,6 @@ const stageOptions: StageOptions = {
|
||||
containerHighlightClassName: props.containerHighlightClassName,
|
||||
containerHighlightDuration: props.containerHighlightDuration,
|
||||
containerHighlightType: props.containerHighlightType,
|
||||
containerHighlightAddOnly: props.containerHighlightAddOnly,
|
||||
disabledDragStart: props.disabledDragStart,
|
||||
renderType: props.renderType,
|
||||
guidesOptions: props.guidesOptions,
|
||||
|
||||
@ -128,42 +128,20 @@ const outsideClickHideHandler = (e: MouseEvent) => {
|
||||
hide();
|
||||
};
|
||||
|
||||
// 根据菜单实际尺寸修正位置,避免超出可视范围
|
||||
const fixPosition = () => {
|
||||
const menu = menuEl.value;
|
||||
if (!menu || !visible.value) return;
|
||||
|
||||
const menuHeight = menu.clientHeight;
|
||||
const menuWidth = menu.clientWidth;
|
||||
|
||||
let { top, left } = menuPosition.value;
|
||||
|
||||
if (top + menuHeight > document.body.clientHeight) {
|
||||
top = Math.max(0, document.body.clientHeight - menuHeight);
|
||||
}
|
||||
|
||||
if (left + menuWidth > document.body.clientWidth) {
|
||||
left = Math.max(0, document.body.clientWidth - menuWidth);
|
||||
}
|
||||
|
||||
if (top !== menuPosition.value.top || left !== menuPosition.value.left) {
|
||||
menuPosition.value = { top, left };
|
||||
}
|
||||
};
|
||||
|
||||
const setPosition = (e: { clientY: number; clientX: number }) => {
|
||||
const menuHeight = menuEl.value?.clientHeight || 0;
|
||||
|
||||
let top = e.clientY;
|
||||
if (menuHeight + e.clientY > document.body.clientHeight) {
|
||||
top = document.body.clientHeight - menuHeight;
|
||||
}
|
||||
|
||||
menuPosition.value = {
|
||||
top: e.clientY,
|
||||
top,
|
||||
left: e.clientX,
|
||||
};
|
||||
fixPosition();
|
||||
};
|
||||
|
||||
// 菜单大小动态变化(如菜单项更新)后重新修正位置
|
||||
const resizeObserver = new ResizeObserver(() => {
|
||||
fixPosition();
|
||||
});
|
||||
|
||||
const show = (e?: { clientY: number; clientX: number }) => {
|
||||
visible.value = true;
|
||||
|
||||
@ -208,18 +186,12 @@ const mouseenterHandler = () => {
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
if (menuEl.value) {
|
||||
resizeObserver.observe(menuEl.value);
|
||||
}
|
||||
|
||||
if (props.isSubMenu) return;
|
||||
|
||||
globalThis.addEventListener('mousedown', outsideClickHideHandler, true);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
resizeObserver.disconnect();
|
||||
|
||||
if (props.isSubMenu) return;
|
||||
|
||||
globalThis.removeEventListener('mousedown', outsideClickHideHandler, true);
|
||||
|
||||
@ -82,11 +82,6 @@ export interface EditorProps {
|
||||
containerHighlightDuration?: number;
|
||||
/** 拖入画布中容器时,识别容器的操作类型 */
|
||||
containerHighlightType?: ContainerHighlightType;
|
||||
/**
|
||||
* 是否仅在新增组件(从组件列表拖入新组件)时才启用识别容器,
|
||||
* 开启后在画布中拖动已有组件不会识别容器,默认 false
|
||||
*/
|
||||
containerHighlightAddOnly?: boolean;
|
||||
/** 画布大小 */
|
||||
stageRect?: StageRect;
|
||||
/** monaco editor 的配置 */
|
||||
@ -168,7 +163,6 @@ export const defaultEditorProps = {
|
||||
containerHighlightClassName: CONTAINER_HIGHLIGHT_CLASS_NAME,
|
||||
containerHighlightDuration: 800,
|
||||
containerHighlightType: ContainerHighlightType.DEFAULT,
|
||||
containerHighlightAddOnly: false,
|
||||
disabledShowSrc: false,
|
||||
disabledDataSource: false,
|
||||
disabledCodeBlock: false,
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
<template>
|
||||
<MagicCodeEditor
|
||||
v-if="!silentMode"
|
||||
:height="config.height"
|
||||
:type="diffMode ? 'diff' : undefined"
|
||||
:init-values="diffMode ? (lastValues || {})[name] : model[name]"
|
||||
@ -18,9 +17,9 @@
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, inject } from 'vue';
|
||||
import { computed } from 'vue';
|
||||
|
||||
import { type CodeConfig, type FieldProps, FORM_SILENT_MODE_KEY } from '@tmagic/form';
|
||||
import type { CodeConfig, FieldProps } from '@tmagic/form';
|
||||
|
||||
import MagicCodeEditor from '@editor/layouts/CodeEditor.vue';
|
||||
|
||||
@ -28,13 +27,6 @@ defineOptions({
|
||||
name: 'MFieldsVsCode',
|
||||
});
|
||||
|
||||
/**
|
||||
* 静默模式(submitForm/validateForm 隐藏挂载)下跳过 monaco 渲染:
|
||||
* 校验由 FormItem 针对 model 中的值完成,与编辑器实例无关;本组件挂载无值副作用
|
||||
* (save 仅由用户操作/编辑器内容变更触发),跳过可省去 monaco worker/model 的无谓实例化。
|
||||
*/
|
||||
const silentMode = inject(FORM_SILENT_MODE_KEY, false);
|
||||
|
||||
const emit = defineEmits<{
|
||||
change: [value: string | any];
|
||||
}>();
|
||||
|
||||
@ -37,12 +37,13 @@
|
||||
:model="entry.cardItem"
|
||||
:last-values="entry.lastCardItem"
|
||||
:is-compare="isCompareMode"
|
||||
:hide-expand="false"
|
||||
:hide-expand="true"
|
||||
:label-width="config.labelWidth || '100px'"
|
||||
@change="onChangeHandler"
|
||||
>
|
||||
<template #header>
|
||||
<div class="event-item-header">
|
||||
<div class="event-item-title">事件{{ Number(entry.index) + 1 }}</div>
|
||||
<MFormContainer
|
||||
class="fullWidth"
|
||||
:config="eventNameConfig"
|
||||
@ -209,12 +210,6 @@ const actionTypeConfig = computed(() => {
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
onChange: (_mForm: FormState, _v: string, { setModel }: any) => {
|
||||
setModel('to', '');
|
||||
setModel('method', '');
|
||||
setModel('codeId', '');
|
||||
setModel('dataSourceMethod', []);
|
||||
},
|
||||
};
|
||||
return { ...defaultActionTypeConfig, ...props.config.actionTypeConfig };
|
||||
});
|
||||
@ -227,7 +222,7 @@ const targetCompConfig = computed(() => {
|
||||
type: 'ui-select',
|
||||
labelPosition: 'left',
|
||||
display: (_mForm, { model }) => model.actionType === ActionType.COMP,
|
||||
onChange: (_mForm, _v, { setModel }) => {
|
||||
onChange: (_MForm, _v, { setModel }) => {
|
||||
setModel('method', '');
|
||||
},
|
||||
rules: [
|
||||
|
||||
@ -28,7 +28,6 @@ export const useStage = (stageOptions: StageOptions) => {
|
||||
containerHighlightClassName: stageOptions.containerHighlightClassName,
|
||||
containerHighlightDuration: stageOptions.containerHighlightDuration,
|
||||
containerHighlightType: stageOptions.containerHighlightType,
|
||||
containerHighlightAddOnly: stageOptions.containerHighlightAddOnly,
|
||||
disabledDragStart: stageOptions.disabledDragStart,
|
||||
renderType: stageOptions.renderType,
|
||||
canSelect: (el, event, stop) => {
|
||||
|
||||
@ -333,11 +333,11 @@ export const initServiceEvents = (
|
||||
Promise.all(
|
||||
nodes.map((node) => {
|
||||
if (node.type === NodeType.ROOT) {
|
||||
return Promise.resolve(true);
|
||||
return Promise.resolve();
|
||||
}
|
||||
return depService.collectIdle([node], { pageId: getPageIdByNode(node) }, deep, type);
|
||||
}),
|
||||
).then((results) => results.every(Boolean));
|
||||
);
|
||||
|
||||
watch(
|
||||
() => editorService.get('stage'),
|
||||
@ -351,7 +351,7 @@ export const initServiceEvents = (
|
||||
|
||||
if (!node) return;
|
||||
|
||||
if (!(await collectIdle([node], true, DepTargetType.DATA_SOURCE))) return;
|
||||
await collectIdle([node], true, DepTargetType.DATA_SOURCE);
|
||||
updateStageNode(node);
|
||||
});
|
||||
},
|
||||
@ -494,10 +494,8 @@ export const initServiceEvents = (
|
||||
|
||||
// 新增节点,收集依赖
|
||||
const nodeAddHandler = (nodes: MComponent[]) => {
|
||||
collectIdle(nodes, true).then((completed) => {
|
||||
if (completed) {
|
||||
updateStageNodes(nodes);
|
||||
}
|
||||
collectIdle(nodes, true).then(() => {
|
||||
updateStageNodes(nodes);
|
||||
});
|
||||
};
|
||||
|
||||
@ -551,8 +549,8 @@ export const initServiceEvents = (
|
||||
if (needRecollectNodes.length) {
|
||||
// 有数据源依赖,需要等依赖重新收集完才更新stage
|
||||
const handler = async () => {
|
||||
if (!(await collectIdle(needRecollectNodes, true, DepTargetType.DATA_SOURCE))) return;
|
||||
if (!(await collectIdle(needRecollectNodes, true, DepTargetType.DATA_SOURCE_COND))) return;
|
||||
await collectIdle(needRecollectNodes, true, DepTargetType.DATA_SOURCE);
|
||||
await collectIdle(needRecollectNodes, true, DepTargetType.DATA_SOURCE_COND);
|
||||
updateStageNodes(needRecollectNodes);
|
||||
};
|
||||
handler();
|
||||
@ -574,10 +572,8 @@ export const initServiceEvents = (
|
||||
|
||||
// 历史记录变化时,需要重新收集依赖
|
||||
const historyChangeHandler = (page: MPage | MPageFragment) => {
|
||||
collectIdle([page], true).then((completed) => {
|
||||
if (completed) {
|
||||
updateStageNode(page);
|
||||
}
|
||||
collectIdle([page], true).then(() => {
|
||||
updateStageNode(page);
|
||||
});
|
||||
};
|
||||
|
||||
@ -658,7 +654,7 @@ export const initServiceEvents = (
|
||||
if (Array.isArray(root?.items)) {
|
||||
depService.clearIdleTasks();
|
||||
|
||||
let collectIdlePromises: Promise<boolean>[] = [];
|
||||
let collectIdlePromises: Promise<void[]>[] = [];
|
||||
if (isModifyField) {
|
||||
depService.removeTarget(config.id, DepTargetType.DATA_SOURCE);
|
||||
depService.removeTarget(config.id, DepTargetType.DATA_SOURCE_COND);
|
||||
@ -683,15 +679,10 @@ export const initServiceEvents = (
|
||||
|
||||
collectIdlePromises = [collectIdle(root.items, true, DepTargetType.DATA_SOURCE_METHOD)];
|
||||
}
|
||||
const handler = async () => {
|
||||
const results = await Promise.all(collectIdlePromises);
|
||||
if (!results.every(Boolean)) return;
|
||||
|
||||
updateDataSourceSchema();
|
||||
await updateDsData();
|
||||
updateStageNodes(root.items);
|
||||
};
|
||||
handler();
|
||||
Promise.all(collectIdlePromises)
|
||||
.then(() => updateDataSourceSchema())
|
||||
.then(() => updateDsData())
|
||||
.then(() => updateStageNodes(root.items));
|
||||
}
|
||||
} else if (root?.dataSources) {
|
||||
updateDsData();
|
||||
@ -715,12 +706,11 @@ export const initServiceEvents = (
|
||||
const nodeIds = Object.keys(root.dataSourceDeps?.[id] || {});
|
||||
const nodes = getNodes(nodeIds, root.items);
|
||||
|
||||
const results = await Promise.all([
|
||||
await Promise.all([
|
||||
collectIdle(nodes, false, DepTargetType.DATA_SOURCE),
|
||||
collectIdle(nodes, false, DepTargetType.DATA_SOURCE_COND),
|
||||
collectIdle(nodes, false, DepTargetType.DATA_SOURCE_METHOD),
|
||||
]);
|
||||
if (!results.every(Boolean)) return;
|
||||
|
||||
updateDataSourceSchema();
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
:config="config"
|
||||
:type-match-valid="true"
|
||||
:extend-state="extendState"
|
||||
:validate-on-init="true"
|
||||
@change="submit"
|
||||
@error="errorHandler"
|
||||
></MForm>
|
||||
@ -50,13 +49,14 @@ import { Document as DocumentIcon } from '@element-plus/icons-vue';
|
||||
|
||||
import { TMagicButton, tMagicMessage, TMagicScrollbar } from '@tmagic/design';
|
||||
import type { ContainerChangeEventData, FormConfig, FormState, FormValue } from '@tmagic/form';
|
||||
import { MForm, validateForm } from '@tmagic/form';
|
||||
import { MForm } from '@tmagic/form';
|
||||
import { filterXSS } from '@tmagic/utils';
|
||||
|
||||
import MIcon from '@editor/components/Icon.vue';
|
||||
import { ENABLE_PROPS_FORM_VALIDATE } from '@editor/editorProps';
|
||||
import { useEditorContentHeight } from '@editor/hooks/use-editor-content-height';
|
||||
import { useServices } from '@editor/hooks/use-services';
|
||||
import { validatePropsForm } from '@editor/utils/props';
|
||||
|
||||
import CodeEditor from '../CodeEditor.vue';
|
||||
|
||||
@ -162,19 +162,14 @@ const saveCode = async (values: any) => {
|
||||
// 做一次静默校验(不复用、也不污染页面上正在展示的表单),并将校验结果(错误信息)随提交
|
||||
// 一并抛给上层记录,使源码保存的错误状态与表单编辑保持一致。
|
||||
try {
|
||||
const error = await validateForm({
|
||||
const error = await validatePropsForm({
|
||||
config: props.config,
|
||||
values: newValues,
|
||||
appContext: internalInstance?.appContext ?? null,
|
||||
services,
|
||||
stage: stage.value,
|
||||
typeMatchValid: true,
|
||||
initValues: newValues,
|
||||
// 将当前组件实例的 provides(含 Editor 顶层的 services / codeOptions 等组件级 provide)
|
||||
// 合入 appContext,使临时 MForm 中的编辑器字段组件(DataSourceInput 等)能正常 inject
|
||||
appContext: internalInstance?.appContext ? { ...internalInstance?.appContext, provides: { services } } : null,
|
||||
extendState: (state) => {
|
||||
if (configFormRef.value?.formState) {
|
||||
return { ...(configFormRef.value?.formState || {}) };
|
||||
}
|
||||
return props.extendState?.(state) || {};
|
||||
},
|
||||
extendState: props.extendState,
|
||||
});
|
||||
|
||||
if (error) {
|
||||
|
||||
@ -164,25 +164,17 @@ const submit = async (
|
||||
};
|
||||
|
||||
if (v.style) {
|
||||
// 空字符串样式值表示「清除该样式」,需保留才能在 doUpdate 的 mergeWith 中覆盖旧值。
|
||||
if (eventData) {
|
||||
// 表单编辑:先过滤掉空字符串(避免表单默认空值污染 DSL),
|
||||
// 再按 changeRecords 恢复被主动清空的字段。
|
||||
Object.entries(v.style).forEach(([key, value]) => {
|
||||
if (value !== '' && newValue.style) {
|
||||
newValue.style[key] = value;
|
||||
}
|
||||
});
|
||||
Object.entries(v.style).forEach(([key, value]) => {
|
||||
if (value !== '' && newValue.style) {
|
||||
newValue.style[key] = value;
|
||||
}
|
||||
});
|
||||
|
||||
eventData.changeRecords?.forEach((record) => {
|
||||
if (record.propPath?.startsWith('style') && record.value === '') {
|
||||
setValueByKeyPath(record.propPath, record.value, newValue);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// 源码编辑器保存(无 eventData):style 原样保留,其中的空字符串视为用户主动清除该样式。
|
||||
newValue.style = { ...v.style };
|
||||
}
|
||||
eventData?.changeRecords?.forEach((record) => {
|
||||
if (record.propPath?.startsWith('style') && record.value === '') {
|
||||
setValueByKeyPath(record.propPath, record.value, newValue);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// 区分操作途径:表单字段编辑(MForm @change)会带上 eventData(含 changeRecords);
|
||||
|
||||
@ -145,6 +145,6 @@ const dragHandler = (e: DragEvent) => {
|
||||
|
||||
if (timeout || !stage.value) return;
|
||||
|
||||
timeout = stage.value.delayedMarkContainer(e, [], true);
|
||||
timeout = stage.value.delayedMarkContainer(e);
|
||||
};
|
||||
</script>
|
||||
|
||||
@ -42,21 +42,6 @@ interface State {
|
||||
|
||||
type StateKey = keyof State;
|
||||
|
||||
/**
|
||||
* 一次 collectIdle 调用对应一个批次。批次自行统计入队/完成的任务数,在自身任务全部完成或被中断时
|
||||
* 结算对应的 Promise,避免多次快速触发时共用 idleTask 的 finish 事件造成的串扰、提前 resolve,
|
||||
* 以及 clearTasks 后 Promise 永不 resolve(collecting 卡死、监听器泄漏)。
|
||||
*/
|
||||
interface CollectBatch {
|
||||
nodes: MNode[];
|
||||
deep: boolean;
|
||||
pending: number;
|
||||
dsPending: number;
|
||||
collectedEmitted: boolean;
|
||||
dsSettled: boolean;
|
||||
resolve: (completed: boolean) => void;
|
||||
}
|
||||
|
||||
class Dep extends BaseService {
|
||||
private state = shallowReactive<State>({
|
||||
collecting: false,
|
||||
@ -69,12 +54,6 @@ class Dep extends BaseService {
|
||||
|
||||
private waitingWorker?: Promise<void>;
|
||||
|
||||
private resolveWaitingWorker?: () => void;
|
||||
|
||||
private workerGeneration = 0;
|
||||
|
||||
private activeBatches = new Set<CollectBatch>();
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
@ -158,44 +137,38 @@ class Dep extends BaseService {
|
||||
await this.waitingWorker;
|
||||
}
|
||||
|
||||
const batch: CollectBatch = {
|
||||
nodes,
|
||||
deep,
|
||||
pending: 0,
|
||||
dsPending: 0,
|
||||
collectedEmitted: false,
|
||||
dsSettled: false,
|
||||
resolve: () => {},
|
||||
};
|
||||
|
||||
this.set('collecting', true);
|
||||
let startTask = false;
|
||||
this.watcher.collectByCallback(nodes, type, ({ node, target }) => {
|
||||
this.enqueueTask(node, target, depExtendedData, deep, batch);
|
||||
startTask = true;
|
||||
|
||||
this.enqueueTask(node, target, depExtendedData, deep);
|
||||
});
|
||||
|
||||
// 没有命中任何 target,无需收集,直接完成
|
||||
if (batch.pending === 0) {
|
||||
this.emit('collected', nodes, deep);
|
||||
this.updateCollectingState();
|
||||
return true;
|
||||
}
|
||||
|
||||
this.activeBatches.add(batch);
|
||||
this.set('collecting', true);
|
||||
|
||||
return new Promise<boolean>((resolve) => {
|
||||
batch.resolve = resolve;
|
||||
return new Promise<void>((resolve) => {
|
||||
if (!startTask) {
|
||||
this.emit('collected', nodes, deep);
|
||||
this.set('collecting', false);
|
||||
resolve();
|
||||
return;
|
||||
}
|
||||
this.idleTask.once('finish', () => {
|
||||
this.emit('collected', nodes, deep);
|
||||
this.set('collecting', false);
|
||||
});
|
||||
this.idleTask.once('hight-level-finish', () => {
|
||||
this.emit('ds-collected', nodes, deep);
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public collectByWorker(dsl: MApp) {
|
||||
this.set('collecting', true);
|
||||
this.workerGeneration += 1;
|
||||
const generation = this.workerGeneration;
|
||||
|
||||
const { promise, resolve: waitingResolve } = Promise.withResolvers<void>();
|
||||
|
||||
this.waitingWorker = promise;
|
||||
this.resolveWaitingWorker = waitingResolve;
|
||||
|
||||
return new Promise<Record<string, Record<string, DepData>>>((resolve) => {
|
||||
const worker = new Work();
|
||||
@ -209,11 +182,6 @@ class Dep extends BaseService {
|
||||
resolve({});
|
||||
};
|
||||
}).then((depsData) => {
|
||||
if (generation !== this.workerGeneration) {
|
||||
waitingResolve();
|
||||
return depsData;
|
||||
}
|
||||
|
||||
traverseTarget(this.watcher.getTargetsList(), (target) => {
|
||||
if (depsData[target.type]?.[target.id]) {
|
||||
target.deps = reactive(depsData[target.type][target.id]);
|
||||
@ -232,10 +200,6 @@ class Dep extends BaseService {
|
||||
this.emit('collected', dsl.items, true);
|
||||
this.emit('ds-collected', dsl.items, true);
|
||||
waitingResolve();
|
||||
if (this.waitingWorker === promise) {
|
||||
this.waitingWorker = undefined;
|
||||
this.resolveWaitingWorker = undefined;
|
||||
}
|
||||
|
||||
return depsData;
|
||||
});
|
||||
@ -269,7 +233,6 @@ class Dep extends BaseService {
|
||||
}
|
||||
|
||||
public clearIdleTasks() {
|
||||
this.abortActiveBatches();
|
||||
this.idleTask.clearTasks();
|
||||
}
|
||||
|
||||
@ -288,11 +251,6 @@ class Dep extends BaseService {
|
||||
}
|
||||
|
||||
public reset() {
|
||||
this.abortActiveBatches();
|
||||
this.workerGeneration += 1;
|
||||
this.resolveWaitingWorker?.();
|
||||
this.resolveWaitingWorker = undefined;
|
||||
this.waitingWorker = undefined;
|
||||
this.idleTask.clearTasks();
|
||||
|
||||
for (const type of Object.keys(this.watcher.getTargetsList())) {
|
||||
@ -328,99 +286,25 @@ class Dep extends BaseService {
|
||||
}
|
||||
}
|
||||
|
||||
private enqueueTask(
|
||||
node: MNode,
|
||||
target: Target,
|
||||
depExtendedData: DepExtendedData,
|
||||
deep: boolean,
|
||||
batch: CollectBatch,
|
||||
) {
|
||||
const isDataSource = target.type === DepTargetType.DATA_SOURCE;
|
||||
|
||||
batch.pending += 1;
|
||||
if (isDataSource) {
|
||||
batch.dsPending += 1;
|
||||
}
|
||||
|
||||
private enqueueTask(node: MNode, target: Target, depExtendedData: DepExtendedData, deep: boolean) {
|
||||
this.idleTask.enqueueTask(
|
||||
({ node, deep, target }) => {
|
||||
try {
|
||||
this.collectNode(node, target, depExtendedData, deep);
|
||||
} finally {
|
||||
this.onBatchTaskDone(batch, isDataSource);
|
||||
}
|
||||
this.collectNode(node, target, depExtendedData, deep);
|
||||
},
|
||||
{
|
||||
node,
|
||||
deep: false,
|
||||
target,
|
||||
},
|
||||
isDataSource,
|
||||
target.type === DepTargetType.DATA_SOURCE,
|
||||
);
|
||||
|
||||
if (deep && Array.isArray(node.items) && node.items.length) {
|
||||
node.items.forEach((item) => {
|
||||
this.enqueueTask(item, target, depExtendedData, deep, batch);
|
||||
this.enqueueTask(item, target, depExtendedData, deep);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private onBatchTaskDone(batch: CollectBatch, isDataSource: boolean) {
|
||||
if (isDataSource) {
|
||||
batch.dsPending -= 1;
|
||||
// 数据源依赖收集完先 resolve,让 stage 尽快更新,其余依赖继续在后台收集
|
||||
if (batch.dsPending === 0) {
|
||||
this.settleBatchDs(batch);
|
||||
}
|
||||
}
|
||||
|
||||
batch.pending -= 1;
|
||||
if (batch.pending === 0) {
|
||||
this.finishBatch(batch);
|
||||
}
|
||||
}
|
||||
|
||||
private settleBatchDs(batch: CollectBatch) {
|
||||
if (batch.dsSettled) return;
|
||||
batch.dsSettled = true;
|
||||
this.emit('ds-collected', batch.nodes, batch.deep);
|
||||
batch.resolve(true);
|
||||
}
|
||||
|
||||
private finishBatch(batch: CollectBatch) {
|
||||
if (!batch.collectedEmitted) {
|
||||
batch.collectedEmitted = true;
|
||||
this.emit('collected', batch.nodes, batch.deep);
|
||||
}
|
||||
// 没有数据源任务的批次在此结算 Promise
|
||||
this.settleBatchDs(batch);
|
||||
this.activeBatches.delete(batch);
|
||||
this.updateCollectingState();
|
||||
}
|
||||
|
||||
/**
|
||||
* idleTask 被清空时,在途批次的任务不会再执行,必须主动结算,
|
||||
* 否则对应的 collectIdle Promise 永远不会 resolve(collecting 卡在 true、once 监听器泄漏)。
|
||||
* 收集被中断(通常紧跟一次全量重新收集),因此不再 emit collected/ds-collected,仅结算 Promise。
|
||||
*/
|
||||
private abortActiveBatches() {
|
||||
if (!this.activeBatches.size) {
|
||||
return;
|
||||
}
|
||||
|
||||
const batches = [...this.activeBatches];
|
||||
this.activeBatches.clear();
|
||||
|
||||
for (const batch of batches) {
|
||||
batch.resolve(false);
|
||||
}
|
||||
|
||||
this.updateCollectingState();
|
||||
}
|
||||
|
||||
private updateCollectingState() {
|
||||
this.set('collecting', this.activeBatches.size > 0);
|
||||
}
|
||||
}
|
||||
|
||||
export type DepService = Dep;
|
||||
|
||||
@ -554,12 +554,6 @@ class Editor extends BaseService {
|
||||
doNotPushHistory,
|
||||
});
|
||||
|
||||
// 页面 / 页面片新增不入历史栈(见上方 isPage / isPageFragment 分支),这里合并补发一次结构变更通知
|
||||
const addedPages = newNodes.filter((node) => isPage(node) || isPageFragment(node)) as (MPage | MPageFragment)[];
|
||||
if (addedPages.length) {
|
||||
historyService.notifyPageStructureChange({ add: addedPages, remove: [] });
|
||||
}
|
||||
|
||||
return Array.isArray(addNode) ? newNodes : newNodes[0];
|
||||
}
|
||||
|
||||
@ -701,12 +695,6 @@ class Editor extends BaseService {
|
||||
|
||||
this.emit('remove', nodes);
|
||||
this.emit('change', { type: 'remove', data: changeItems, historySource, doNotPushHistory });
|
||||
|
||||
// 页面 / 页面片删除不入历史栈(见上方 isPage / isPageFragment 分支),这里合并补发一次结构变更通知
|
||||
const removedPages = nodes.filter((node) => isPage(node) || isPageFragment(node)) as (MPage | MPageFragment)[];
|
||||
if (removedPages.length) {
|
||||
historyService.notifyPageStructureChange({ add: [], remove: removedPages });
|
||||
}
|
||||
}
|
||||
|
||||
public async doUpdate(
|
||||
@ -1788,10 +1776,6 @@ class Editor extends BaseService {
|
||||
const nextMap = new Map(nextPages.map((p) => [`${p.id}`, p]));
|
||||
const indexInItems = (root: MApp, id: Id) => (root.items ?? []).findIndex((item) => `${item.id}` === `${id}`);
|
||||
|
||||
// 收集本次整体替换中增删的页面,循环结束后合并为一次结构变更通知(避免逐页派发多个事件)
|
||||
const addedPages: (MPage | MPageFragment)[] = [];
|
||||
const removedPages: (MPage | MPageFragment)[] = [];
|
||||
|
||||
nextPages.forEach((nextPage) => {
|
||||
const prevPage = prevMap.get(`${nextPage.id}`);
|
||||
if (!prevPage) {
|
||||
@ -1801,7 +1785,6 @@ class Editor extends BaseService {
|
||||
{ newSchema: cloneDeep(toRaw(nextPage)), parentId: nextRoot.id, index: indexInItems(nextRoot, nextPage.id) },
|
||||
source,
|
||||
);
|
||||
addedPages.push(nextPage);
|
||||
} else if (!isEqual(toRaw(prevPage), toRaw(nextPage))) {
|
||||
this.pushPageDiffStep(
|
||||
'update',
|
||||
@ -1820,13 +1803,8 @@ class Editor extends BaseService {
|
||||
{ oldSchema: cloneDeep(toRaw(prevPage)), parentId: preRoot.id, index: indexInItems(preRoot, prevPage.id) },
|
||||
source,
|
||||
);
|
||||
removedPages.push(prevPage);
|
||||
}
|
||||
});
|
||||
|
||||
if (addedPages.length || removedPages.length) {
|
||||
historyService.notifyPageStructureChange({ add: addedPages, remove: removedPages });
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
import { reactive } from 'vue';
|
||||
import type { Writable } from 'type-fest';
|
||||
|
||||
import type { Id, MPage, MPageFragment } from '@tmagic/core';
|
||||
import type { Id } from '@tmagic/core';
|
||||
import { guid } from '@tmagic/utils';
|
||||
|
||||
import type {
|
||||
@ -353,27 +353,6 @@ class History extends BaseService {
|
||||
this.emit('mark-saved', { kind: stepType, id });
|
||||
}
|
||||
|
||||
/**
|
||||
* 派发「页面 / 页面片结构变更」事件(`page-structure-change`)。
|
||||
*
|
||||
* 常规 `editorService.add` / `remove` 页面节点不会写入 `page` 历史栈(见 editor.add / remove 中
|
||||
* 对 isPage / isPageFragment 的分支),因此不会产生任何 historyService 事件。该方法用于在这些
|
||||
* 场景(以及 setRoot 整体替换 DSL 增删页面)下,向外统一通知页面结构的增删变化,供业务方感知。
|
||||
*
|
||||
* 一次操作涉及多个页面时,调用方应把本次增删的页面**合并为一个 change 一次性传入**,
|
||||
* 使一次操作只派发一个事件;`add` / `remove` 分别为本次新增与删除的页面列表(其一可为空数组)。
|
||||
*
|
||||
* @param change 本次结构变更:{ add: 新增的页面列表, remove: 删除的页面列表 }
|
||||
*/
|
||||
public notifyPageStructureChange(change: {
|
||||
add: (MPage | MPageFragment)[];
|
||||
remove: (MPage | MPageFragment)[];
|
||||
}): void {
|
||||
// 增删均为空时不派发,避免无意义通知
|
||||
if (!change.add.length && !change.remove.length) return;
|
||||
this.emit('page-structure-change', change);
|
||||
}
|
||||
|
||||
/**
|
||||
* 把当前内存中的全部历史栈(页面 / 代码块 / 数据源 / 扩展类型)序列化后写入本地 IndexedDB。
|
||||
*
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
}
|
||||
.el-card__body {
|
||||
.tmagic-design-form-item {
|
||||
margin-bottom: 16px;
|
||||
margin-bottom: 18px;
|
||||
}
|
||||
}
|
||||
.code-select-content {
|
||||
|
||||
@ -3,12 +3,6 @@
|
||||
.fullWidth {
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
&.create-button {
|
||||
width: 100%;
|
||||
}
|
||||
&.m-container-ui-event {
|
||||
width: calc(100% - 32px);
|
||||
}
|
||||
}
|
||||
.event-select-container {
|
||||
padding: 0 16px;
|
||||
@ -82,18 +76,17 @@
|
||||
.event-item-header {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.event-item-title {
|
||||
color: #0f1113;
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
line-height: 24px;
|
||||
margin-bottom: 8px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.event-item-delete-button {
|
||||
color: #0f1113;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
|
||||
@ -178,11 +178,6 @@ export interface StageOptions {
|
||||
containerHighlightClassName?: string;
|
||||
containerHighlightDuration?: number;
|
||||
containerHighlightType?: ContainerHighlightType;
|
||||
/**
|
||||
* 是否仅在新增组件(从组件列表拖入新组件)时才启用识别容器,
|
||||
* 开启后在画布中拖动已有组件不会识别容器,默认 false
|
||||
*/
|
||||
containerHighlightAddOnly?: boolean;
|
||||
disabledDragStart?: boolean;
|
||||
render?: (stage: StageCore) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
|
||||
moveableOptions?: CustomizeMoveableOptions;
|
||||
@ -1390,12 +1385,6 @@ export interface HistoryEvents {
|
||||
'mark-saved': [{ kind: HistoryStepType; id?: Id }];
|
||||
clear: [{ id: Id; stepType: HistoryStepType }];
|
||||
'marker-change': [{ id: Id; marker: StepValue; stepType: HistoryStepType }];
|
||||
/**
|
||||
* 页面 / 页面片结构变更(新增 / 删除)时派发,见 {@link HistoryService.notifyPageStructureChange}。
|
||||
* 一次操作(add / remove / setRoot 整体替换)涉及多个页面时合并为**一个**事件;
|
||||
* `add` / `remove` 分别为本次新增与删除的页面列表(其一可为空数组)。
|
||||
*/
|
||||
'page-structure-change': [change: { add: (MPage | MPageFragment)[]; remove: (MPage | MPageFragment)[] }];
|
||||
}
|
||||
|
||||
export const canUsePluginMethods = {
|
||||
|
||||
@ -243,7 +243,7 @@ export const resolveFieldByPath = (
|
||||
fields: DataSchema[] | undefined,
|
||||
fieldNames: string[],
|
||||
options: { skipNumberIndices?: boolean } = {},
|
||||
): { ok: boolean; field?: DataSchema; fields: DataSchema[]; failedName?: string } => {
|
||||
): { ok: boolean; field?: DataSchema; fields: DataSchema[] } => {
|
||||
let currentFields = fields || [];
|
||||
let field: DataSchema | undefined;
|
||||
|
||||
@ -252,11 +252,11 @@ export const resolveFieldByPath = (
|
||||
continue;
|
||||
}
|
||||
if (!currentFields.length) {
|
||||
return { ok: false, fields: currentFields, failedName: name };
|
||||
return { ok: false, fields: currentFields };
|
||||
}
|
||||
field = currentFields.find((item) => item.name === name);
|
||||
if (!field) {
|
||||
return { ok: false, fields: currentFields, failedName: name };
|
||||
return { ok: false, fields: currentFields };
|
||||
}
|
||||
currentFields = field.fields || [];
|
||||
}
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
import { EventEmitter } from 'events';
|
||||
|
||||
import { error } from '../logger';
|
||||
|
||||
export interface IdleTaskEvents {
|
||||
finish: [];
|
||||
'hight-level-finish': [];
|
||||
@ -27,12 +25,6 @@ globalThis.requestIdleCallback =
|
||||
}, 1);
|
||||
};
|
||||
|
||||
globalThis.cancelIdleCallback =
|
||||
globalThis.cancelIdleCallback ||
|
||||
function (handle) {
|
||||
clearTimeout(handle as unknown as ReturnType<typeof setTimeout>);
|
||||
};
|
||||
|
||||
export class IdleTask<T = any> extends EventEmitter {
|
||||
private taskList: TaskList<T> = [];
|
||||
|
||||
@ -66,7 +58,7 @@ export class IdleTask<T = any> extends EventEmitter {
|
||||
this.taskHandle = null;
|
||||
|
||||
this.emit('update-task-length', {
|
||||
length: this.getTaskLength(),
|
||||
length: this.taskList.length + this.hightLevelTaskList.length,
|
||||
hightLevelLength: this.hightLevelTaskList.length,
|
||||
});
|
||||
}
|
||||
@ -90,80 +82,51 @@ export class IdleTask<T = any> extends EventEmitter {
|
||||
}
|
||||
|
||||
private runTaskQueue(deadline: IdleDeadline) {
|
||||
// 本次回调已触发,句柄随之失效;置空后 clearTasks / enqueueTask 才能正确判断是否需要重新调度
|
||||
this.taskHandle = null;
|
||||
const { hightLevelTaskList, taskList } = this;
|
||||
|
||||
try {
|
||||
// 动画会占用空闲时间,当任务一直无法执行时,看看是否有动画正在播放
|
||||
// 根据空闲时间的多少来决定执行的任务数,保证页面不卡死的情况下尽量多执行任务,不然当任务数巨大时,执行时间会很久
|
||||
// 执行不完不会影响配置,但是会影响画布渲染
|
||||
while (deadline.timeRemaining() > 0 && this.getTaskLength()) {
|
||||
const timeRemaining = deadline.timeRemaining();
|
||||
let times = 0;
|
||||
if (timeRemaining <= 5) {
|
||||
times = 10;
|
||||
} else if (timeRemaining <= 10) {
|
||||
times = 100;
|
||||
} else if (timeRemaining <= 15) {
|
||||
times = 300;
|
||||
} else {
|
||||
times = 600;
|
||||
}
|
||||
|
||||
for (let i = 0; i < times; i++) {
|
||||
// 每次都从实例上取队列,任务执行过程中调用 clearTasks 能立即生效,不会继续消费已被清空的旧队列
|
||||
const task = this.hightLevelTaskList.length > 0 ? this.hightLevelTaskList.shift() : this.taskList.shift();
|
||||
if (task) {
|
||||
this.runTask(task);
|
||||
}
|
||||
|
||||
if (!this.getTaskLength()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
// 必须放在 finally 中:一旦这里被跳过,taskHandle 会一直是真值,
|
||||
// enqueueTask 也就不会再重新调度,剩余任务与任务数将永久停在当前状态
|
||||
this.finishRun();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 单个任务失败不能中断整个队列,否则后续任务永远不会被执行,
|
||||
* 依赖收集会停在半路(收集中状态与剩余任务数都不再变化)
|
||||
*/
|
||||
private runTask(task: TaskList<T>[number]) {
|
||||
try {
|
||||
task.handler(task.data);
|
||||
} catch (e) {
|
||||
error('magic editor: 空闲任务执行失败', e);
|
||||
}
|
||||
}
|
||||
|
||||
private finishRun() {
|
||||
try {
|
||||
if (!this.hightLevelTaskList.length) {
|
||||
this.emit('hight-level-finish');
|
||||
}
|
||||
} finally {
|
||||
if (this.getTaskLength()) {
|
||||
// 任务执行或事件监听中可能已经重新调度过
|
||||
if (!this.taskHandle) {
|
||||
this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 300 });
|
||||
}
|
||||
// 动画会占用空闲时间,当任务一直无法执行时,看看是否有动画正在播放
|
||||
// 根据空闲时间的多少来决定执行的任务数,保证页面不卡死的情况下尽量多执行任务,不然当任务数巨大时,执行时间会很久
|
||||
// 执行不完不会影响配置,但是会影响画布渲染
|
||||
while (deadline.timeRemaining() > 0 && (taskList.length || hightLevelTaskList.length)) {
|
||||
const timeRemaining = deadline.timeRemaining();
|
||||
let times = 0;
|
||||
if (timeRemaining <= 5) {
|
||||
times = 10;
|
||||
} else if (timeRemaining <= 10) {
|
||||
times = 100;
|
||||
} else if (timeRemaining <= 15) {
|
||||
times = 300;
|
||||
} else {
|
||||
this.emit('finish');
|
||||
times = 600;
|
||||
}
|
||||
|
||||
this.emit('update-task-length', {
|
||||
length: this.getTaskLength(),
|
||||
hightLevelLength: this.hightLevelTaskList.length,
|
||||
});
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < times; i++) {
|
||||
const task = hightLevelTaskList.length > 0 ? hightLevelTaskList.shift() : taskList.shift();
|
||||
if (task) {
|
||||
task.handler(task.data);
|
||||
}
|
||||
|
||||
private getTaskLength() {
|
||||
return this.taskList.length + this.hightLevelTaskList.length;
|
||||
if (hightLevelTaskList.length === 0 && taskList.length === 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!hightLevelTaskList.length) {
|
||||
this.emit('hight-level-finish');
|
||||
}
|
||||
|
||||
if (hightLevelTaskList.length || taskList.length) {
|
||||
this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 300 });
|
||||
} else {
|
||||
this.taskHandle = 0;
|
||||
|
||||
this.emit('finish');
|
||||
}
|
||||
|
||||
this.emit('update-task-length', {
|
||||
length: taskList.length + hightLevelTaskList.length,
|
||||
hightLevelLength: hightLevelTaskList.length,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,9 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import type { AppContext } from 'vue';
|
||||
|
||||
import {
|
||||
HookType,
|
||||
NODE_CONDS_KEY,
|
||||
@ -24,7 +27,18 @@ import {
|
||||
NODE_DISABLE_DATA_SOURCE_KEY,
|
||||
} from '@tmagic/core';
|
||||
import { tMagicMessage } from '@tmagic/design';
|
||||
import type { ChildConfig, DisplayCondsConfig, FormConfig, TabConfig, TabPaneConfig } from '@tmagic/form';
|
||||
import type {
|
||||
ChildConfig,
|
||||
DisplayCondsConfig,
|
||||
FormConfig,
|
||||
FormState,
|
||||
FormValue,
|
||||
TabConfig,
|
||||
TabPaneConfig,
|
||||
} from '@tmagic/form';
|
||||
import { validateForm } from '@tmagic/form';
|
||||
|
||||
import type { Services } from '@editor/type';
|
||||
|
||||
export const arrayOptions = [
|
||||
{ text: '包含', value: 'include' },
|
||||
@ -389,3 +403,86 @@ export const removeStyleDisplayConfig = (formConfig: FormConfig): FormConfig =>
|
||||
}),
|
||||
};
|
||||
});
|
||||
|
||||
// #region ValidatePropsFormOptions
|
||||
/**
|
||||
* validatePropsForm 参数
|
||||
*/
|
||||
export interface ValidatePropsFormOptions {
|
||||
/** 组件属性表单配置 */
|
||||
config: FormConfig;
|
||||
/** 待校验的表单值 */
|
||||
values: FormValue;
|
||||
/**
|
||||
* 当前组件实例的 appContext(通常为 `getCurrentInstance()?.appContext`)。
|
||||
* 会与 services 一并合入临时 MForm 的 appContext,使编辑器字段组件(DataSourceInput 等)能正常 inject。
|
||||
*/
|
||||
appContext?: AppContext | null;
|
||||
/** 编辑器服务集合,注入到临时表单的 formState */
|
||||
services?: Services;
|
||||
/** stage 实例,注入到临时表单的 formState */
|
||||
stage?: any;
|
||||
/** 外部扩展的 formState */
|
||||
extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
|
||||
/**
|
||||
* 调试模式,默认 `true`:以弹层形式可见地渲染表单,点击「确定」才触发校验。
|
||||
* 置为 `false` 时静默挂载后自动校验。
|
||||
*/
|
||||
debug?: boolean;
|
||||
typeMatchValid?: boolean;
|
||||
}
|
||||
// #endregion ValidatePropsFormOptions
|
||||
|
||||
/**
|
||||
* 对一份「组件属性表单配置 + 值」做一次独立的校验,**不复用也不污染页面上正在展示的表单**。
|
||||
*
|
||||
* 内部基于 `@tmagic/form` 的 `validateForm` 另建一个独立的 MForm 实例完成校验,并统一处理
|
||||
* 编辑器场景所需的上下文注入:将当前组件实例的 provides 合入 appContext,并向 formState 注入
|
||||
* stage / services 及外部扩展状态,保证校验规则依赖的上下文可用。
|
||||
*
|
||||
* 常用于源码编辑器保存后,对最新配置做一次校验,并将校验结果(错误信息)随提交一并抛给上层记录,
|
||||
* 使源码保存的错误状态与表单编辑保持一致。
|
||||
*
|
||||
* @returns 校验通过返回空字符串 `''`,否则返回以 `<br>` 拼接的错误文案。
|
||||
* 仅在初始化超时或挂载失败等异常情况下才会 reject。
|
||||
*
|
||||
* @example
|
||||
* ```ts
|
||||
* const error = await validatePropsForm({
|
||||
* config,
|
||||
* values,
|
||||
* appContext: getCurrentInstance()?.appContext,
|
||||
* services,
|
||||
* stage: editorService.get('stage'),
|
||||
* extendState,
|
||||
* });
|
||||
* if (error) {
|
||||
* // 配置不合法,error 为错误文案
|
||||
* }
|
||||
* ```
|
||||
*/
|
||||
export const validatePropsForm = ({
|
||||
config,
|
||||
values,
|
||||
appContext = null,
|
||||
services,
|
||||
stage,
|
||||
extendState,
|
||||
debug,
|
||||
typeMatchValid,
|
||||
}: ValidatePropsFormOptions): Promise<string> =>
|
||||
validateForm({
|
||||
config,
|
||||
debug,
|
||||
typeMatchValid,
|
||||
initValues: values,
|
||||
// 将当前组件实例的 provides(含 Editor 顶层的 services / codeOptions 等组件级 provide)
|
||||
// 合入 appContext,使临时 MForm 中的编辑器字段组件(DataSourceInput 等)能正常 inject
|
||||
appContext: appContext ? { ...appContext, provides: { services } } : null,
|
||||
// 与页面表单保持一致:注入 stage/services 及外部扩展状态,保证校验规则依赖的上下文可用
|
||||
extendState: async (state) => ({
|
||||
...((await extendState?.(state)) || {}),
|
||||
stage,
|
||||
services,
|
||||
}),
|
||||
});
|
||||
|
||||
@ -20,7 +20,6 @@ import type { DataSourceFieldType, DataSourceSchema, Id } from '@tmagic/core';
|
||||
import { NodeType } from '@tmagic/core';
|
||||
import { appendValidateSuggestion } from '@tmagic/design';
|
||||
import type { TypeMatchValidateContext, TypeMatchValidator } from '@tmagic/form';
|
||||
import { validateTypeMatch } from '@tmagic/form';
|
||||
import {
|
||||
DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX,
|
||||
DATA_SOURCE_SET_DATA_METHOD_NAME,
|
||||
@ -58,7 +57,7 @@ const stringifyExampleValue = (value: any): string => {
|
||||
};
|
||||
|
||||
// 参考建议中最多展示的可选值个数,超出以「等」省略。
|
||||
const MAX_SUGGESTION_OPTIONS = 20;
|
||||
const MAX_SUGGESTION_OPTIONS = 5;
|
||||
|
||||
/**
|
||||
* 生成「请使用以下某一个值:xxx;xxx」形式的参考建议;无可选值时返回空字符串(不追加建议)。
|
||||
@ -262,20 +261,16 @@ const validateDataSourceFieldPath = (
|
||||
|
||||
const ds = findDataSource(`${dsId}`);
|
||||
if (!ds) {
|
||||
return defaultMessage(options.message, `数据源(${dsId})不存在`, dataSourceIdSuggestion());
|
||||
return defaultMessage(options.message, '值不在可选项中', dataSourceIdSuggestion());
|
||||
}
|
||||
|
||||
if (!fieldNames.length) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const { field, ok, fields, failedName } = resolveFieldByPath(ds.fields, fieldNames);
|
||||
const { field, ok } = resolveFieldByPath(ds.fields, fieldNames);
|
||||
if (!ok) {
|
||||
return defaultMessage(
|
||||
options.message,
|
||||
`数据源字段(${failedName})不存在`,
|
||||
listSuggestion(fields.map((item) => item.name)),
|
||||
);
|
||||
return defaultMessage(options.message, '值不在可选项中', dataSourceIdSuggestion());
|
||||
}
|
||||
|
||||
const allowedTypes = options.dataSourceFieldType || ['any'];
|
||||
@ -476,12 +471,11 @@ const isDataSourceFieldPathValue = (value: any, config: any): value is string[]
|
||||
return `${value[0]}`.startsWith(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
|
||||
};
|
||||
|
||||
const validateDataSourceFieldSelect: TypeMatchValidator = (value, { mForm, message, props }) => {
|
||||
const validateDataSourceFieldSelect: TypeMatchValidator = (value, { message, props }) => {
|
||||
const config = props.config || {};
|
||||
|
||||
if (config.fieldConfig && !isDataSourceFieldPathValue(value, config)) {
|
||||
// 值不是数据源字段路径时,按 fieldConfig 的类型校验(与表单项自身 typeMatch 行为一致)
|
||||
return validateTypeMatch(value, mForm, { ...props, config: { name: config.name, ...config.fieldConfig } }, message);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!Array.isArray(value) || value.some((item) => typeof item !== 'string')) {
|
||||
|
||||
@ -4,27 +4,10 @@
|
||||
* Copyright (C) 2025 Tencent.
|
||||
*/
|
||||
import { afterEach, describe, expect, test, vi } from 'vitest';
|
||||
import { nextTick } from 'vue';
|
||||
import { mount } from '@vue/test-utils';
|
||||
|
||||
import ContentMenu from '@editor/components/ContentMenu.vue';
|
||||
|
||||
const roCallbacks: Array<() => void> = [];
|
||||
class FakeResizeObserver {
|
||||
public static disconnectSpy = vi.fn();
|
||||
public cb: () => void;
|
||||
constructor(cb: () => void) {
|
||||
this.cb = cb;
|
||||
roCallbacks.push(cb);
|
||||
}
|
||||
public observe() {}
|
||||
public unobserve() {}
|
||||
public disconnect() {
|
||||
FakeResizeObserver.disconnectSpy();
|
||||
}
|
||||
}
|
||||
(globalThis as any).ResizeObserver = FakeResizeObserver;
|
||||
|
||||
const provideServices = () => ({
|
||||
global: {
|
||||
provide: {
|
||||
@ -39,8 +22,6 @@ const provideServices = () => ({
|
||||
describe('ContentMenu.vue', () => {
|
||||
afterEach(() => {
|
||||
vi.useRealTimers();
|
||||
roCallbacks.length = 0;
|
||||
FakeResizeObserver.disconnectSpy.mockClear();
|
||||
});
|
||||
|
||||
test('show 后触发 show 事件', async () => {
|
||||
@ -86,62 +67,6 @@ describe('ContentMenu.vue', () => {
|
||||
expect((wrapper.vm as any).menuPosition.top).toBeLessThanOrEqual(100);
|
||||
});
|
||||
|
||||
test('菜单大小动态变化后修正位置避免超出可视范围', async () => {
|
||||
// jsdom 中 clientWidth/clientHeight 默认为 0,先 mock 一个足够大的视口,避免 show 时位置被修正
|
||||
Object.defineProperty(document.body, 'clientHeight', { value: 1000, configurable: true });
|
||||
Object.defineProperty(document.body, 'clientWidth', { value: 1000, configurable: true });
|
||||
|
||||
const wrapper = mount(ContentMenu as any, {
|
||||
...provideServices(),
|
||||
props: { menuData: [{ id: '1', type: 'button', text: 'a' }] as any },
|
||||
attachTo: document.body,
|
||||
});
|
||||
(wrapper.vm as any).show({ clientX: 90, clientY: 90 });
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
expect((wrapper.vm as any).menuPosition.top).toBe(90);
|
||||
expect((wrapper.vm as any).menuPosition.left).toBe(90);
|
||||
|
||||
// 视口缩小为 100x100
|
||||
Object.defineProperty(document.body, 'clientHeight', { value: 100, configurable: true });
|
||||
Object.defineProperty(document.body, 'clientWidth', { value: 100, configurable: true });
|
||||
|
||||
const menuEl = wrapper.find('.magic-editor-content-menu').element as HTMLElement;
|
||||
// 模拟菜单内容增多后尺寸变为 50x50
|
||||
Object.defineProperty(menuEl, 'clientHeight', { value: 50, configurable: true });
|
||||
Object.defineProperty(menuEl, 'clientWidth', { value: 50, configurable: true });
|
||||
|
||||
roCallbacks.forEach((cb) => cb());
|
||||
await nextTick();
|
||||
|
||||
expect((wrapper.vm as any).menuPosition.top).toBe(50);
|
||||
expect((wrapper.vm as any).menuPosition.left).toBe(50);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('菜单未显示时尺寸变化不修正位置', async () => {
|
||||
const wrapper = mount(ContentMenu as any, {
|
||||
...provideServices(),
|
||||
props: { menuData: [{ id: '1', type: 'button', text: 'a' }] as any },
|
||||
});
|
||||
Object.defineProperty(document.body, 'clientHeight', { value: 100, configurable: true });
|
||||
|
||||
roCallbacks.forEach((cb) => cb());
|
||||
await nextTick();
|
||||
|
||||
expect((wrapper.vm as any).menuPosition.top).toBe(0);
|
||||
expect((wrapper.vm as any).menuPosition.left).toBe(0);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('卸载时断开 ResizeObserver', () => {
|
||||
const wrapper = mount(ContentMenu as any, {
|
||||
...provideServices(),
|
||||
props: { menuData: [] as any },
|
||||
});
|
||||
wrapper.unmount();
|
||||
expect(FakeResizeObserver.disconnectSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('contains 判断 DOM 是否在菜单内部', async () => {
|
||||
const wrapper = mount(ContentMenu as any, {
|
||||
...provideServices(),
|
||||
|
||||
@ -21,7 +21,6 @@ describe('defaultEditorProps', () => {
|
||||
test('containerHighlight 默认值', () => {
|
||||
expect(defaultEditorProps.containerHighlightDuration).toBe(800);
|
||||
expect(typeof defaultEditorProps.containerHighlightClassName).toBe('string');
|
||||
expect(defaultEditorProps.containerHighlightAddOnly).toBe(false);
|
||||
});
|
||||
|
||||
test('数组/对象工厂函数返回空值', () => {
|
||||
|
||||
@ -7,8 +7,6 @@ import { beforeEach, describe, expect, test, vi } from 'vitest';
|
||||
import { defineComponent, h } from 'vue';
|
||||
import { mount } from '@vue/test-utils';
|
||||
|
||||
import { FORM_SILENT_MODE_KEY } from '@tmagic/form';
|
||||
|
||||
import Code from '@editor/fields/Code.vue';
|
||||
|
||||
// 用一个简单的桩组件代替 MagicCodeEditor,把所有 props 原样渲染到 data-* 属性上,
|
||||
@ -47,7 +45,7 @@ vi.mock('@editor/layouts/CodeEditor.vue', () => ({
|
||||
}),
|
||||
}));
|
||||
|
||||
const mountCode = (props: Record<string, any>, global?: Record<string, any>) =>
|
||||
const mountCode = (props: Record<string, any>) =>
|
||||
mount(Code, {
|
||||
props: {
|
||||
// FieldProps 必填字段,用 as any 绕过测试中类型严格匹配
|
||||
@ -57,7 +55,6 @@ const mountCode = (props: Record<string, any>, global?: Record<string, any>) =>
|
||||
prop: 'codeField',
|
||||
...props,
|
||||
} as any,
|
||||
global,
|
||||
});
|
||||
|
||||
const getEl = (wrapper: ReturnType<typeof mountCode>) => wrapper.find('.fake-code-editor').element as HTMLElement;
|
||||
@ -171,28 +168,6 @@ describe('Code', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('静默模式', () => {
|
||||
test('注入 FORM_SILENT_MODE_KEY=true 时不渲染 CodeEditor', () => {
|
||||
const wrapper = mountCode(
|
||||
{},
|
||||
{
|
||||
provide: { [FORM_SILENT_MODE_KEY as symbol]: true },
|
||||
},
|
||||
);
|
||||
expect(wrapper.find('.fake-code-editor').exists()).toBe(false);
|
||||
});
|
||||
|
||||
test('注入 FORM_SILENT_MODE_KEY=false 时正常渲染 CodeEditor', () => {
|
||||
const wrapper = mountCode(
|
||||
{},
|
||||
{
|
||||
provide: { [FORM_SILENT_MODE_KEY as symbol]: false },
|
||||
},
|
||||
);
|
||||
expect(wrapper.find('.fake-code-editor').exists()).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('diff 模式 (对比)', () => {
|
||||
test('isCompare=true 且有 lastValues 时切换为 diff 模式', () => {
|
||||
const wrapper = mountCode({
|
||||
|
||||
@ -91,7 +91,7 @@ const mkServices = () => {
|
||||
clear: vi.fn(),
|
||||
clearTargets: vi.fn(),
|
||||
clearIdleTasks: vi.fn(),
|
||||
collectIdle: vi.fn(async () => true),
|
||||
collectIdle: vi.fn(async () => undefined),
|
||||
collectByWorker: vi.fn(async () => undefined),
|
||||
reset: vi.fn(),
|
||||
};
|
||||
|
||||
@ -95,7 +95,7 @@ vi.mock('@editor/layouts/props-panel/FormPanel.vue', () => ({
|
||||
// 模拟 CodeEditor 源码保存:仅传 values,无 eventData、无 error(对应 saveCode 路径)
|
||||
h('button', {
|
||||
class: 'code-save-btn',
|
||||
onClick: () => emit('submit', { id: 'n1', style: { color: 'red', width: '' } }),
|
||||
onClick: () => emit('submit', { id: 'n1', style: { color: 'red' } }),
|
||||
}),
|
||||
h('button', { class: 'submit-err-btn', onClick: () => emit('submit-error', new Error('e')) }),
|
||||
h('button', { class: 'form-err-btn', onClick: () => emit('form-error', new Error('e')) }),
|
||||
@ -239,16 +239,6 @@ describe('PropsPanel', () => {
|
||||
expect(options.historySource).toBe('code');
|
||||
});
|
||||
|
||||
test('CodeEditor 源码保存时 style 中的空字符串值被保留(表示清除该样式)', async () => {
|
||||
const wrapper = mount(PropsPanel, { props: {} as any });
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
await wrapper.find('.code-save-btn').trigger('click');
|
||||
|
||||
const calledNode = (editorService.update.mock.calls[0] as any)[0];
|
||||
expect(calledNode.style.color).toBe('red');
|
||||
expect(calledNode.style.width).toBe('');
|
||||
});
|
||||
|
||||
test('mounted 事件 emit', async () => {
|
||||
const wrapper = mount(PropsPanel, { props: {} as any });
|
||||
await wrapper.find('.mounted-btn').trigger('click');
|
||||
|
||||
@ -135,6 +135,6 @@ describe('ComponentListPanel', () => {
|
||||
const item = wrapper.find('.component-item');
|
||||
await item.trigger('drag', { clientX: 0, clientY: 0 });
|
||||
await item.trigger('drag', { clientX: 0, clientY: 0 });
|
||||
expect(stage.delayedMarkContainer).toHaveBeenCalledWith(expect.anything(), [], true);
|
||||
expect(stage.delayedMarkContainer).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@ -13,17 +13,16 @@ vi.mock('@editor/utils/dep/worker.ts?worker&inline', () => ({
|
||||
default: class FakeWorker {
|
||||
public static nextData: Record<string, any> = {};
|
||||
public static nextError = false;
|
||||
public static nextDelay = 0;
|
||||
public onmessage: ((e: any) => void) | null = null;
|
||||
public onerror: (() => void) | null = null;
|
||||
public postMessage() {
|
||||
setTimeout(() => {
|
||||
if (FakeWorker.nextError) {
|
||||
this.onerror?.();
|
||||
this.onerror?.(new Event('error'));
|
||||
return;
|
||||
}
|
||||
this.onmessage?.({ data: FakeWorker.nextData });
|
||||
}, FakeWorker.nextDelay);
|
||||
}, 0);
|
||||
}
|
||||
},
|
||||
}));
|
||||
@ -122,7 +121,7 @@ describe('Dep service', () => {
|
||||
test('collectIdle - 没有命中时立即 resolve 并 emit collected', async () => {
|
||||
const fn = vi.fn();
|
||||
depService.on('collected', fn);
|
||||
await expect(depService.collectIdle([{ id: 'n1', type: 'text' }] as any)).resolves.toBe(true);
|
||||
await depService.collectIdle([{ id: 'n1', type: 'text' }] as any);
|
||||
expect(fn).toHaveBeenCalled();
|
||||
depService.off('collected', fn);
|
||||
});
|
||||
@ -220,106 +219,6 @@ describe('Dep service', () => {
|
||||
fakeWorker.nextData = {};
|
||||
});
|
||||
|
||||
test('collectIdle 命中 target 时最终 resolve 并按批次 emit collected/ds-collected', async () => {
|
||||
depService.addTarget(makeTarget('ds1', DepTargetType.DATA_SOURCE));
|
||||
const collected = vi.fn();
|
||||
const dsCollected = vi.fn();
|
||||
depService.on('collected', collected);
|
||||
depService.on('ds-collected', dsCollected);
|
||||
|
||||
const nodes = [{ id: 'n1', type: 'text' }] as any;
|
||||
await expect(depService.collectIdle(nodes, {}, false, DepTargetType.DATA_SOURCE)).resolves.toBe(true);
|
||||
|
||||
expect(dsCollected).toHaveBeenCalledWith(nodes, false);
|
||||
expect(collected).toHaveBeenCalledWith(nodes, false);
|
||||
expect(depService.get('collecting')).toBe(false);
|
||||
|
||||
depService.off('collected', collected);
|
||||
depService.off('ds-collected', dsCollected);
|
||||
});
|
||||
|
||||
test('clearIdleTasks 会结算在途 collectIdle,避免 Promise 永久挂起且 collecting 复位', async () => {
|
||||
depService.addTarget(makeTarget('ds1', DepTargetType.DATA_SOURCE));
|
||||
|
||||
const promise = depService.collectIdle([{ id: 'n1', type: 'text' }] as any, {}, false, DepTargetType.DATA_SOURCE);
|
||||
expect(depService.get('collecting')).toBe(true);
|
||||
|
||||
// 快速触发:任务尚未执行就清空队列,批次应被主动结算而不是永久挂起
|
||||
depService.clearIdleTasks();
|
||||
|
||||
await expect(promise).resolves.toBe(false);
|
||||
expect(depService.get('collecting')).toBe(false);
|
||||
});
|
||||
|
||||
test('reset 会结算在途 collectIdle', async () => {
|
||||
depService.addTarget(makeTarget('ds1', DepTargetType.DATA_SOURCE));
|
||||
|
||||
const promise = depService.collectIdle([{ id: 'n1', type: 'text' }] as any, {}, false, DepTargetType.DATA_SOURCE);
|
||||
depService.reset();
|
||||
|
||||
await expect(promise).resolves.toBe(false);
|
||||
expect(depService.get('collecting')).toBe(false);
|
||||
});
|
||||
|
||||
test('reset 会忽略在途 worker 的过期结果,避免覆盖新依赖', async () => {
|
||||
const fakeWorker = (await import('@editor/utils/dep/worker.ts?worker&inline')).default as any;
|
||||
fakeWorker.nextDelay = 20;
|
||||
fakeWorker.nextData = {
|
||||
[DepTargetType.DATA_SOURCE]: { ds1: { n1: { data: {} } } },
|
||||
};
|
||||
|
||||
const workerPromise = depService.collectByWorker({ items: [], id: 'app', type: 'app' } as any);
|
||||
depService.reset();
|
||||
|
||||
const target = makeTarget('ds1', DepTargetType.DATA_SOURCE);
|
||||
depService.addTarget(target);
|
||||
const idlePromise = depService.collectIdle(
|
||||
[{ id: 'n1', type: 'text' }] as any,
|
||||
{},
|
||||
false,
|
||||
DepTargetType.DATA_SOURCE,
|
||||
);
|
||||
|
||||
await Promise.all([workerPromise, idlePromise]);
|
||||
expect(target.deps.n1).toBeUndefined();
|
||||
|
||||
fakeWorker.nextDelay = 0;
|
||||
fakeWorker.nextData = {};
|
||||
});
|
||||
|
||||
test('多个批次并发时各自独立 resolve,全部完成后 collecting 复位', async () => {
|
||||
depService.addTarget(makeTarget('ds1', DepTargetType.DATA_SOURCE));
|
||||
|
||||
const p1 = depService.collectIdle([{ id: 'n1', type: 'text' }] as any, {}, false, DepTargetType.DATA_SOURCE);
|
||||
const p2 = depService.collectIdle([{ id: 'n2', type: 'text' }] as any, {}, false, DepTargetType.DATA_SOURCE);
|
||||
|
||||
await Promise.all([p1, p2]);
|
||||
expect(depService.get('collecting')).toBe(false);
|
||||
});
|
||||
|
||||
test('target 收集抛错时批次仍会结算,collecting 与 taskLength 复位', async () => {
|
||||
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
|
||||
depService.addTarget(
|
||||
new Target({
|
||||
id: 'throw-target',
|
||||
type: DepTargetType.DATA_SOURCE,
|
||||
isTarget: () => {
|
||||
throw new Error('boom');
|
||||
},
|
||||
}),
|
||||
);
|
||||
|
||||
const nodes = Array.from({ length: 50 }, (_, i) => ({ id: `n${i}`, type: 'text', text: 'x' })) as any;
|
||||
await expect(depService.collectIdle(nodes, {}, false, DepTargetType.DATA_SOURCE)).resolves.toBe(true);
|
||||
|
||||
expect(depService.get('collecting')).toBe(false);
|
||||
// taskLength 的更新做了 1s 节流,等节流窗口结束后才会同步到 0
|
||||
await new Promise((resolve) => setTimeout(resolve, 1100));
|
||||
expect(depService.get('taskLength')).toBe(0);
|
||||
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('destroy 会 reset 并移除监听', () => {
|
||||
depService.addTarget(makeTarget('destroy-me'));
|
||||
expect(() => depService.destroy()).not.toThrow();
|
||||
|
||||
@ -105,8 +105,8 @@ describe('data-source utils', () => {
|
||||
fields: [],
|
||||
});
|
||||
expect(resolveFieldByPath(fields, ['obj']).field?.name).toBe('obj');
|
||||
expect(resolveFieldByPath(fields, ['unknown'])).toEqual({ ok: false, fields, failedName: 'unknown' });
|
||||
expect(resolveFieldByPath(undefined, ['x'])).toEqual({ ok: false, fields: [], failedName: 'x' });
|
||||
expect(resolveFieldByPath(fields, ['unknown'])).toEqual({ ok: false, fields });
|
||||
expect(resolveFieldByPath(undefined, ['x'])).toEqual({ ok: false, fields: [] });
|
||||
expect(resolveFieldByPath(fields, []).ok).toBe(true);
|
||||
});
|
||||
|
||||
@ -124,9 +124,7 @@ describe('data-source utils', () => {
|
||||
expect(result.field?.name).toBe('item');
|
||||
expect(result.fields).toEqual([{ name: 'n', type: 'string' }]);
|
||||
|
||||
const failed = resolveFieldByPath(fields, ['arr', '0', 'missing'], { skipNumberIndices: true });
|
||||
expect(failed.ok).toBe(false);
|
||||
expect(failed.failedName).toBe('missing');
|
||||
expect(resolveFieldByPath(fields, ['arr', '0', 'missing'], { skipNumberIndices: true }).ok).toBe(false);
|
||||
});
|
||||
|
||||
test('getFieldType 沿 path 取最终类型', () => {
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
|
||||
|
||||
import { IdleTask } from '@editor/utils/dep/idle-task';
|
||||
import * as logger from '@editor/utils/logger';
|
||||
|
||||
const fakeIdleDeadline = (timeRemaining: number, callsBeforeZero = 1): IdleDeadline => {
|
||||
let remainingCalls = callsBeforeZero;
|
||||
@ -128,77 +127,6 @@ describe('IdleTask', () => {
|
||||
expect(scheduled.length).toBeGreaterThan(1);
|
||||
});
|
||||
|
||||
test('单个任务抛错不会中断整个队列', () => {
|
||||
const errorSpy = vi.spyOn(logger, 'error').mockImplementation(() => undefined);
|
||||
const task = new IdleTask<number>();
|
||||
const done: number[] = [];
|
||||
const finishHandler = vi.fn();
|
||||
task.on('finish', finishHandler);
|
||||
|
||||
for (let i = 0; i < 10; i++) {
|
||||
task.enqueueTask((n) => {
|
||||
if (n === 3) throw new Error('boom');
|
||||
done.push(n);
|
||||
}, i);
|
||||
}
|
||||
|
||||
expect(() => scheduled[0].cb(fakeIdleDeadline(50))).not.toThrow();
|
||||
expect(done).toEqual([0, 1, 2, 4, 5, 6, 7, 8, 9]);
|
||||
expect(finishHandler).toHaveBeenCalled();
|
||||
expect(errorSpy).toHaveBeenCalled();
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('任务抛错且仍有剩余任务时继续调度下一轮并同步任务数', () => {
|
||||
const errorSpy = vi.spyOn(logger, 'error').mockImplementation(() => undefined);
|
||||
const task = new IdleTask<number>();
|
||||
const updateHandler = vi.fn();
|
||||
task.on('update-task-length', updateHandler);
|
||||
|
||||
for (let i = 0; i < 200; i++) {
|
||||
task.enqueueTask((n) => {
|
||||
if (n === 0) throw new Error('boom');
|
||||
}, i);
|
||||
}
|
||||
|
||||
// 单批最多执行 10 个,执行完仍有剩余任务
|
||||
scheduled[0].cb(fakeIdleDeadline(3, 1));
|
||||
|
||||
expect(scheduled.length).toBeGreaterThan(1);
|
||||
expect(updateHandler).toHaveBeenCalledWith({ length: 190, hightLevelLength: 0 });
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('任务执行过程中 clearTasks 会立即停止消费已清空的队列', () => {
|
||||
const task = new IdleTask<number>();
|
||||
const handler = vi.fn((n: number) => {
|
||||
if (n === 0) {
|
||||
task.clearTasks();
|
||||
}
|
||||
});
|
||||
for (let i = 0; i < 200; i++) task.enqueueTask(handler, i);
|
||||
|
||||
scheduled[0].cb(fakeIdleDeadline(50));
|
||||
|
||||
expect(handler).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test('任务执行过程中清空并重新入队,新任务仍会被执行', () => {
|
||||
const task = new IdleTask<number>();
|
||||
const afterHandler = vi.fn();
|
||||
task.enqueueTask((n) => {
|
||||
if (n === 0) {
|
||||
task.clearTasks();
|
||||
task.enqueueTask(afterHandler, 999);
|
||||
}
|
||||
}, 0);
|
||||
for (let i = 1; i < 200; i++) task.enqueueTask(() => undefined, i);
|
||||
|
||||
scheduled[0].cb(fakeIdleDeadline(50));
|
||||
|
||||
expect(afterHandler).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('clearTasks - 取消挂起任务并重置队列', () => {
|
||||
const task = new IdleTask<number>();
|
||||
task.enqueueTask(() => undefined, 1);
|
||||
|
||||
@ -3,9 +3,10 @@
|
||||
*
|
||||
* Copyright (C) 2025 Tencent.
|
||||
*/
|
||||
import { describe, expect, test, vi } from 'vitest';
|
||||
import { beforeEach, describe, expect, test, vi } from 'vitest';
|
||||
|
||||
import { NODE_CONDS_RESULT_KEY } from '@tmagic/core';
|
||||
import { validateForm } from '@tmagic/form';
|
||||
|
||||
import {
|
||||
advancedTabConfig,
|
||||
@ -19,6 +20,7 @@ import {
|
||||
numberOptions,
|
||||
removeStyleDisplayConfig,
|
||||
styleTabConfig,
|
||||
validatePropsForm,
|
||||
} from '@editor/utils/props';
|
||||
|
||||
vi.mock('@tmagic/design', () => ({
|
||||
@ -170,6 +172,59 @@ describe('fillConfig', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('validatePropsForm', () => {
|
||||
beforeEach(() => {
|
||||
vi.mocked(validateForm).mockReset();
|
||||
});
|
||||
|
||||
test('合入 appContext.provides、注入 stage/services 并合并外部 extendState,debug 默认 undefined', async () => {
|
||||
vi.mocked(validateForm).mockResolvedValue('err-text');
|
||||
|
||||
const services = { uiService: {} } as any;
|
||||
const stage = { id: 'stage' };
|
||||
const appContext = { app: {}, provides: { foo: 1 } } as any;
|
||||
|
||||
const result = await validatePropsForm({
|
||||
config: [],
|
||||
values: { a: 1 },
|
||||
appContext,
|
||||
services,
|
||||
stage,
|
||||
extendState: async () => ({ extra: true }),
|
||||
});
|
||||
|
||||
// 直接返回 validateForm 的结果
|
||||
expect(result).toBe('err-text');
|
||||
|
||||
const arg = vi.mocked(validateForm).mock.calls[0][0];
|
||||
expect(arg.config).toEqual([]);
|
||||
expect(arg.debug).toBeUndefined();
|
||||
expect(arg.initValues).toEqual({ a: 1 });
|
||||
// appContext 保留原字段,但 provides 被替换为 { services }
|
||||
expect(arg.appContext).toEqual({ app: {}, provides: { services } });
|
||||
|
||||
// extendState 合并外部返回并注入 stage/services
|
||||
const state = await arg.extendState!({} as any);
|
||||
expect(state).toEqual({ extra: true, stage, services });
|
||||
});
|
||||
|
||||
test('appContext 缺省为 null,extendState 缺省时仍注入 stage/services,可覆盖 debug', async () => {
|
||||
vi.mocked(validateForm).mockResolvedValue('');
|
||||
|
||||
const services = {} as any;
|
||||
const stage = {};
|
||||
|
||||
await validatePropsForm({ config: [], values: {}, services, stage, debug: false });
|
||||
|
||||
const arg = vi.mocked(validateForm).mock.calls[0][0];
|
||||
expect(arg.appContext).toBeNull();
|
||||
expect(arg.debug).toBe(false);
|
||||
|
||||
const state = await arg.extendState!({} as any);
|
||||
expect(state).toEqual({ stage, services });
|
||||
});
|
||||
});
|
||||
|
||||
describe('removeStyleDisplayConfig', () => {
|
||||
test('将 tab 内「样式」pane 的 display 置为 true', () => {
|
||||
const config = [
|
||||
|
||||
@ -207,18 +207,9 @@ describe('editorTypeMatchRules', () => {
|
||||
expect(firstLine(run('data-source-method-select', ['missing', 'custom']))).toBe('数据源(missing)不存在');
|
||||
});
|
||||
|
||||
test('data-source-field-select 校验路径与 fieldConfig 类型校验', () => {
|
||||
test('data-source-field-select 校验路径与 fieldConfig 跳过', () => {
|
||||
expect(firstLine(run('data-source-field-select', 'x'))).toBe('x类型应为字符串数组');
|
||||
|
||||
// 有 fieldConfig 且值不是数据源字段路径时,按 fieldConfig 的类型校验(text 允许数字)
|
||||
expect(run('data-source-field-select', 'text-value', { name: 'f', fieldConfig: { type: 'text' } })).toBeUndefined();
|
||||
expect(run('data-source-field-select', 123, { name: 'f', fieldConfig: { type: 'text' } })).toBeUndefined();
|
||||
expect(firstLine(run('data-source-field-select', { a: 1 }, { name: 'f', fieldConfig: { type: 'text' } }))).toBe(
|
||||
'[object Object] 类型应为字符串',
|
||||
);
|
||||
expect(run('data-source-field-select', 123, { name: 'f', fieldConfig: { type: 'number' } })).toBeUndefined();
|
||||
// fieldConfig 未声明 type 时不做类型校验
|
||||
expect(run('data-source-field-select', 123, { name: 'f', fieldConfig: {} })).toBeUndefined();
|
||||
expect(run('data-source-field-select', 'text-value', { fieldConfig: { type: 'text' } })).toBeUndefined();
|
||||
|
||||
dataSourcesState.value = [
|
||||
{
|
||||
@ -234,26 +225,7 @@ describe('editorTypeMatchRules', () => {
|
||||
|
||||
expect(run('data-source-field-select', ['ds1', 'title'], { value: 'key' })).toBeUndefined();
|
||||
expect(run('data-source-field-select', [`${DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX}ds1`, 'title'])).toBeUndefined();
|
||||
// 数据源不存在时直出具体的数据源 id
|
||||
expect(firstLine(run('data-source-field-select', ['missing', 'title'], { value: 'key' }))).toBe(
|
||||
'数据源(missing)不存在',
|
||||
);
|
||||
expect(firstLine(run('data-source-field-select', ['title'], { dataSourceId: 'missing' }))).toBe(
|
||||
'数据源(missing)不存在',
|
||||
);
|
||||
// 字段路径解析失败时直出具体失败的字段名
|
||||
expect(firstLine(run('data-source-field-select', ['ds1', 'missing'], { value: 'key' }))).toBe(
|
||||
'数据源字段(missing)不存在',
|
||||
);
|
||||
// 字段路径解析失败时,建议列出失败层级的可用字段名而非数据源 id
|
||||
expect(run('data-source-field-select', ['ds1', 'missing'], { value: 'key' })).toBe(
|
||||
'数据源字段(missing)不存在\n\n请使用以下某一个值:"title";"obj"',
|
||||
);
|
||||
expect(run('data-source-field-select', ['ds1', 'obj', 'missing'], { value: 'key' })).toBe(
|
||||
'数据源字段(missing)不存在\n\n请使用以下某一个值:"a"',
|
||||
);
|
||||
// 父字段无子字段时无建议
|
||||
expect(run('data-source-field-select', ['ds1', 'title', 'x'], { value: 'key' })).toBe('数据源字段(x)不存在');
|
||||
expect(firstLine(run('data-source-field-select', ['ds1', 'missing'], { value: 'key' }))).toBe('值不在可选项中');
|
||||
expect(
|
||||
firstLine(
|
||||
run('data-source-field-select', ['title'], {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/element-plus-adapter",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/form-schema",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/form",
|
||||
"type": "module",
|
||||
"sideEffects": [
|
||||
|
||||
@ -88,13 +88,6 @@ const props = withDefaults(
|
||||
labelWidth?: string;
|
||||
/** 是否开启类型匹配校验 */
|
||||
typeMatchValid?: boolean;
|
||||
/**
|
||||
* 初始化(`config` / `initValues` 就绪)后是否立即执行一次表单校验。
|
||||
*
|
||||
* - `false`(默认):不自动校验,避免打开表单时就展示错误态;
|
||||
* - `true`:初始化完成后在 `nextTick` 中调用 `validate()`。
|
||||
*/
|
||||
validateOnInit?: boolean;
|
||||
disabled?: boolean;
|
||||
height?: string;
|
||||
stepActive?: string | number;
|
||||
@ -163,7 +156,6 @@ const props = withDefaults(
|
||||
labelPosition: 'right',
|
||||
keyProp: '__key',
|
||||
useFieldTextInError: true,
|
||||
validateOnInit: false,
|
||||
},
|
||||
);
|
||||
|
||||
@ -269,18 +261,6 @@ const formState: FormState = reactive<FormState>({
|
||||
},
|
||||
});
|
||||
|
||||
/**
|
||||
* formState 的内置 key 快照(keyProp / values / $emit / fields / post 等)。
|
||||
*
|
||||
* 在 `extendState` 首次合并前捕获,`applyExtendState` 会据此禁止 `extendState`
|
||||
* 覆盖这些已有字段(只能新增字段),避免表单核心状态被外部意外改写。
|
||||
*
|
||||
* 之所以在此处(effect 之外)捕获而不是在 `applyExtendState` 内动态取:
|
||||
* `watchEffect` 会在依赖变化时重跑,若动态取,`extendState` 自己新增的字段在第二次
|
||||
* 合并时也会被当成「已有 key」而拒绝刷新;这里只锁定内置字段即可规避该问题。
|
||||
*/
|
||||
const reservedStateKeys = new Set<string | symbol>(Reflect.ownKeys(formState));
|
||||
|
||||
/**
|
||||
* `extendState` 的同步段(直到第一个 `await` 之前)所访问的任何响应式数据,
|
||||
* 都会被 `watchEffect` 自动跟踪。这样可以兼容历史用法 ——
|
||||
@ -319,7 +299,7 @@ watchEffect(async (onCleanup) => {
|
||||
}
|
||||
if (stale) return;
|
||||
|
||||
applyExtendState(formState, state, reservedStateKeys);
|
||||
applyExtendState(formState, state);
|
||||
});
|
||||
|
||||
provide('mForm', formState);
|
||||
@ -361,11 +341,9 @@ watch(
|
||||
// 非对比模式,初始化完成
|
||||
initialized.value = !props.isCompare;
|
||||
|
||||
if (props.validateOnInit) {
|
||||
nextTick(() => {
|
||||
tMagicFormRef.value?.validate();
|
||||
});
|
||||
}
|
||||
nextTick(() => {
|
||||
tMagicFormRef.value?.validate();
|
||||
});
|
||||
});
|
||||
|
||||
if (props.isCompare) {
|
||||
|
||||
@ -16,7 +16,6 @@
|
||||
:use-field-text-in-error="useFieldTextInError"
|
||||
:extend-state="extendState"
|
||||
:type-match-valid="typeMatchValid"
|
||||
:validate-on-init="validateOnInit"
|
||||
@change="changeHandler"
|
||||
></Form>
|
||||
<slot></slot>
|
||||
@ -60,8 +59,6 @@ const props = withDefaults(
|
||||
labelWidth?: string;
|
||||
/** 是否开启类型匹配校验 */
|
||||
typeMatchValid?: boolean;
|
||||
/** 透传给内部 `MForm`,初始化完成后是否立即校验(默认 `false`) */
|
||||
validateOnInit?: boolean;
|
||||
disabled?: boolean;
|
||||
size?: 'small' | 'default' | 'large';
|
||||
confirmText?: string;
|
||||
@ -77,7 +74,6 @@ const props = withDefaults(
|
||||
values: () => ({}),
|
||||
confirmText: '确定',
|
||||
useFieldTextInError: true,
|
||||
validateOnInit: false,
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@ -33,7 +33,6 @@
|
||||
:prevent-submit-default="preventSubmitDefault"
|
||||
:use-field-text-in-error="useFieldTextInError"
|
||||
:type-match-valid="typeMatchValid"
|
||||
:validate-on-init="validateOnInit"
|
||||
:extend-state="extendState"
|
||||
:theme="effectiveTheme"
|
||||
@change="changeHandler"
|
||||
@ -88,8 +87,6 @@ const props = withDefaults(
|
||||
labelWidth?: string;
|
||||
/** 是否开启类型匹配校验 */
|
||||
typeMatchValid?: boolean;
|
||||
/** 透传给内部 `MForm`,初始化完成后是否立即校验(默认 `false`) */
|
||||
validateOnInit?: boolean;
|
||||
fullscreen?: boolean;
|
||||
disabled?: boolean;
|
||||
title?: string;
|
||||
@ -125,7 +122,6 @@ const props = withDefaults(
|
||||
showClose: true,
|
||||
showCancel: true,
|
||||
useFieldTextInError: true,
|
||||
validateOnInit: false,
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
:prevent-submit-default="preventSubmitDefault"
|
||||
:use-field-text-in-error="useFieldTextInError"
|
||||
:type-match-valid="typeMatchValid"
|
||||
:validate-on-init="validateOnInit"
|
||||
:extend-state="extendState"
|
||||
:theme="effectiveTheme"
|
||||
@change="changeHandler"
|
||||
@ -79,8 +78,6 @@ const props = withDefaults(
|
||||
labelWidth?: string;
|
||||
/** 是否开启类型匹配校验 */
|
||||
typeMatchValid?: boolean;
|
||||
/** 透传给内部 `MForm`,初始化完成后是否立即校验(默认 `false`) */
|
||||
validateOnInit?: boolean;
|
||||
disabled?: boolean;
|
||||
closeOnPressEscape?: boolean;
|
||||
title?: string;
|
||||
@ -109,7 +106,6 @@ const props = withDefaults(
|
||||
values: () => ({}),
|
||||
confirmText: '确定',
|
||||
useFieldTextInError: true,
|
||||
validateOnInit: false,
|
||||
},
|
||||
);
|
||||
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
:disabled="disabled"
|
||||
@change="changeHandler"
|
||||
@add-diff-count="onAddDiffCount"
|
||||
:is-in-row="true"
|
||||
></Container>
|
||||
</TMagicCol>
|
||||
</template>
|
||||
|
||||
@ -240,7 +240,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, inject, provide, readonly, ref, toRaw, watch, watchEffect } from 'vue';
|
||||
import { computed, inject, readonly, ref, toRaw, watch, watchEffect } from 'vue';
|
||||
import { ArrowDown, ArrowUp, WarningFilled } from '@element-plus/icons-vue';
|
||||
import { isEqual } from 'lodash-es';
|
||||
|
||||
@ -287,8 +287,6 @@ const props = withDefaults(
|
||||
size?: string;
|
||||
/** 是否开启对比模式 */
|
||||
isCompare?: boolean;
|
||||
/** 是否在行容器中 */
|
||||
isInRow?: boolean;
|
||||
}>(),
|
||||
{
|
||||
prop: '',
|
||||
@ -478,8 +476,6 @@ watch(
|
||||
},
|
||||
);
|
||||
|
||||
provide('isInRow', props.isInRow ?? false);
|
||||
|
||||
const expandHandler = () => (expand.value = !expand.value);
|
||||
|
||||
const key = (config: any) => config[mForm?.keyProps];
|
||||
|
||||
@ -29,17 +29,6 @@ export interface FormDiffConfig {
|
||||
export const FORM_DIFF_CONFIG_KEY: InjectionKey<FormDiffConfig> = Symbol('mFormDiffConfig');
|
||||
export const FORM_TYPE_MATCH_VALID_KEY: InjectionKey<ComputedRef<boolean>> = Symbol('mFormTypeMatchValid');
|
||||
|
||||
/**
|
||||
* 静默模式标记,由 `submitForm` / `validateForm` 以隐藏方式挂载临时表单时 provide(debug 弹层模式不提供)。
|
||||
*
|
||||
* 重型字段组件(如 vs-code)可 inject 该标记并跳过自身渲染:字段校验由 FormItem 基于 model 值完成,
|
||||
* 与叶子 UI 组件实例无关,跳过可省去无谓的实例化开销(如 monaco worker / model 的创建)。
|
||||
*
|
||||
* 注意:仅「挂载无值副作用」(不在 onMounted/watch immediate 中 emit change、不依赖 DOM 计算值)的
|
||||
* 字段组件可以安全跳过,接入前需逐一审计。
|
||||
*/
|
||||
export const FORM_SILENT_MODE_KEY: InjectionKey<boolean> = Symbol('mFormSilentMode');
|
||||
|
||||
export interface ValidateError {
|
||||
message: string;
|
||||
field: string;
|
||||
|
||||
@ -16,22 +16,11 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import {
|
||||
type AppContext,
|
||||
type Component,
|
||||
createApp,
|
||||
defineComponent,
|
||||
h,
|
||||
nextTick,
|
||||
provide,
|
||||
type Ref,
|
||||
ref,
|
||||
watch,
|
||||
} from 'vue';
|
||||
import { type AppContext, type Component, createApp, defineComponent, h, nextTick, type Ref, ref, watch } from 'vue';
|
||||
|
||||
import { applyExtendState } from './utils/form';
|
||||
import Form from './Form.vue';
|
||||
import { type ChangeRecord, FORM_SILENT_MODE_KEY, type FormConfig, type FormState } from './schema';
|
||||
import type { ChangeRecord, FormConfig, FormState } from './schema';
|
||||
|
||||
// #region SubmitFormOptions
|
||||
/**
|
||||
@ -87,11 +76,6 @@ export interface SubmitFormOptions {
|
||||
*/
|
||||
debug?: boolean;
|
||||
typeMatchValid?: boolean;
|
||||
/**
|
||||
* 外部中断信号。abort 时会立即以 `signal.reason` reject 并卸载临时表单实例、移除容器。
|
||||
* 主要用于 `debug` 模式(无超时兜底)下取消一个被放弃的表单弹层,避免其无限驻留在页面上。
|
||||
*/
|
||||
signal?: AbortSignal;
|
||||
}
|
||||
// #endregion SubmitFormOptions
|
||||
|
||||
@ -132,7 +116,7 @@ interface MountFormInstanceOptions<T> {
|
||||
formProps: Record<string, any>;
|
||||
/** 父级应用上下文,用于继承全局组件、指令、provide 等 */
|
||||
appContext?: AppContext | null;
|
||||
/** 等待表单初始化的最长时间(毫秒),<=0 时回退到默认超时以保证兜底清理生效 */
|
||||
/** 等待表单初始化的最长时间(毫秒),<=0 表示不注册超时 */
|
||||
timeout: number;
|
||||
/** 超时 reject 的错误文案 */
|
||||
timeoutMessage: string;
|
||||
@ -140,15 +124,10 @@ interface MountFormInstanceOptions<T> {
|
||||
hidden?: boolean;
|
||||
/** 是否跳过超时注册。调试模式等待人工操作,应传 `true` */
|
||||
skipTimeout?: boolean;
|
||||
/** 外部中断信号:abort 时会 reject 并卸载实例、移除容器,用于取消无超时(如 debug)的挂载 */
|
||||
signal?: AbortSignal;
|
||||
/** 构造 wrapper 组件 */
|
||||
createWrapper: FormWrapperFactory<T>;
|
||||
}
|
||||
|
||||
/** 未指定或传入非正数 timeout 时的兜底超时(毫秒),保证非 debug 挂载始终能被清理 */
|
||||
const DEFAULT_MOUNT_TIMEOUT = 10000;
|
||||
|
||||
/**
|
||||
* submitForm / validateForm 的公共脚手架:
|
||||
*
|
||||
@ -159,36 +138,20 @@ const DEFAULT_MOUNT_TIMEOUT = 10000;
|
||||
* 容器创建、卸载、超时、上下文注入等模板代码在此统一收口。
|
||||
*/
|
||||
const mountFormInstance = <T>(options: MountFormInstanceOptions<T>): Promise<T> => {
|
||||
const {
|
||||
formProps,
|
||||
appContext,
|
||||
timeout,
|
||||
timeoutMessage,
|
||||
hidden = true,
|
||||
skipTimeout = false,
|
||||
signal,
|
||||
createWrapper,
|
||||
} = options;
|
||||
const { formProps, appContext, timeout, timeoutMessage, hidden = true, skipTimeout = false, createWrapper } = options;
|
||||
|
||||
return new Promise<T>((resolve, reject) => {
|
||||
// 已中断则直接 reject,不创建任何容器/实例
|
||||
if (signal?.aborted) {
|
||||
reject(signal.reason ?? new Error('mountFormInstance aborted'));
|
||||
return;
|
||||
}
|
||||
|
||||
let cleaned = false;
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
let onAbort: (() => void) | null = null;
|
||||
// 用 holder 持有 app,使 cleanup 可在 app 创建之前定义(const app + 无 TDZ / 无 use-before-define)
|
||||
const instance: { app: ReturnType<typeof createApp> | null } = { app: null };
|
||||
|
||||
const container = document.createElement('div');
|
||||
if (hidden) {
|
||||
container.style.display = 'none';
|
||||
}
|
||||
document.body.appendChild(container);
|
||||
|
||||
let cleaned = false;
|
||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||
// 用 holder 持有 app,使 cleanup 可在 app 创建之前定义(const app + 无 TDZ / 无 use-before-define)
|
||||
const instance: { app: ReturnType<typeof createApp> | null } = { app: null };
|
||||
|
||||
const cleanup = () => {
|
||||
if (cleaned) return;
|
||||
cleaned = true;
|
||||
@ -196,10 +159,6 @@ const mountFormInstance = <T>(options: MountFormInstanceOptions<T>): Promise<T>
|
||||
clearTimeout(timer);
|
||||
timer = null;
|
||||
}
|
||||
if (signal && onAbort) {
|
||||
signal.removeEventListener('abort', onAbort);
|
||||
onAbort = null;
|
||||
}
|
||||
try {
|
||||
instance.app?.unmount();
|
||||
} catch {
|
||||
@ -208,101 +167,67 @@ const mountFormInstance = <T>(options: MountFormInstanceOptions<T>): Promise<T>
|
||||
container.parentNode?.removeChild(container);
|
||||
};
|
||||
|
||||
// 支持外部通过 AbortSignal 主动中断:debug 模式无超时兜底,若调用方放弃了该 Promise,
|
||||
// 可通过 abort 卸载实例、移除遮罩/容器,避免无限驻留在 DOM 中。
|
||||
if (signal) {
|
||||
onAbort = () => {
|
||||
if (cleaned) return;
|
||||
reject(signal.reason ?? new Error('mountFormInstance aborted'));
|
||||
cleanup();
|
||||
};
|
||||
signal.addEventListener('abort', onAbort);
|
||||
}
|
||||
const formRef = ref<any>(null);
|
||||
|
||||
// 从容器创建到 mount 的全流程统一 try/catch:任一步骤(createWrapper/createApp/上下文合并/mount)
|
||||
// 抛错都会走到 cleanup,避免已插入 body 的 container 及未挂载的 app 残留导致泄漏。
|
||||
try {
|
||||
const formRef = ref<any>(null);
|
||||
// 将 extendState 从 formProps 中剥离:不由 Form.vue 的 async watchEffect 异步应用,
|
||||
// 而是在 wrapper 中通过 sync watch 在 formRef 就绪后直接写入 formState,
|
||||
// 避免 display 等 filterFunction 在首次渲染时读到 undefined。
|
||||
// 与 CompareForm / FormPanel 中「formRef.value.formState.services = ...」的做法一致。
|
||||
const { extendState, ...restFormProps } = formProps;
|
||||
|
||||
// 将 extendState 从 formProps 中剥离:不由 Form.vue 的 async watchEffect 异步应用,
|
||||
// 而是在 wrapper 中通过 sync watch 在 formRef 就绪后直接写入 formState,
|
||||
// 避免 display 等 filterFunction 在首次渲染时读到 undefined。
|
||||
// 与 CompareForm / FormPanel 中「formRef.value.formState.services = ...」的做法一致。
|
||||
const { extendState, ...restFormProps } = formProps;
|
||||
const userWrapper = createWrapper({ formRef, formProps: restFormProps, cleanup, resolve, reject });
|
||||
|
||||
const userWrapper = createWrapper({ formRef, formProps: restFormProps, cleanup, resolve, reject });
|
||||
|
||||
const wrapperComponent =
|
||||
typeof extendState === 'function'
|
||||
? defineComponent({
|
||||
name: 'MFormExtendStateInjector',
|
||||
setup() {
|
||||
watch(
|
||||
() => formRef.value,
|
||||
(form) => {
|
||||
if (!form) return;
|
||||
let result: any;
|
||||
try {
|
||||
result = extendState(form.formState);
|
||||
} catch (e) {
|
||||
console.error('[MForm] extendState failed:', e);
|
||||
return;
|
||||
}
|
||||
// formState 的内置 key 快照:在 extendState 合并前捕获,
|
||||
// 供 applyExtendState 禁止 extendState 覆盖这些已有字段(只能新增),
|
||||
// 与 Form.vue 中 reservedStateKeys 的语义保持一致。
|
||||
const reservedStateKeys = new Set<string | symbol>(Reflect.ownKeys(form.formState));
|
||||
// 合并逻辑收口在 applyExtendState:props 派生的只读 getter 字段
|
||||
// (keyProp 等)以普通字段形式返回时会被跳过并告警,避免 proxy set 抛错
|
||||
const apply = (state: Record<string, any> | null | undefined) =>
|
||||
applyExtendState(form.formState, state, reservedStateKeys);
|
||||
if (result && typeof result.then === 'function') {
|
||||
result.then(apply, (e: any) => console.error('[MForm] extendState failed:', e));
|
||||
} else {
|
||||
apply(result);
|
||||
}
|
||||
},
|
||||
{ flush: 'sync', immediate: true },
|
||||
);
|
||||
return () => h(userWrapper);
|
||||
},
|
||||
})
|
||||
: userWrapper;
|
||||
|
||||
// 静默(隐藏挂载)模式下注入静默标记:vs-code 等重型字段组件可据此跳过自身渲染,
|
||||
// 校验/取值依赖 FormItem 与 model 值,与叶子 UI 组件无关(见 FORM_SILENT_MODE_KEY 注释)。
|
||||
// 用组件级 provide 而非 app.provide:appContext 合并后 app._context.provides 与父级应用
|
||||
// 共享引用,app.provide 会把标记泄漏到父级应用。
|
||||
const rootComponent = hidden
|
||||
const wrapperComponent =
|
||||
typeof extendState === 'function'
|
||||
? defineComponent({
|
||||
name: 'MFormSilentProvider',
|
||||
name: 'MFormExtendStateInjector',
|
||||
setup() {
|
||||
provide(FORM_SILENT_MODE_KEY, true);
|
||||
return () => h(wrapperComponent);
|
||||
watch(
|
||||
() => formRef.value,
|
||||
(form) => {
|
||||
if (!form) return;
|
||||
let result: any;
|
||||
try {
|
||||
result = extendState(form.formState);
|
||||
} catch (e) {
|
||||
console.error('[MForm] extendState failed:', e);
|
||||
return;
|
||||
}
|
||||
// 合并逻辑收口在 applyExtendState:props 派生的只读 getter 字段
|
||||
// (keyProp 等)以普通字段形式返回时会被跳过并告警,避免 proxy set 抛错
|
||||
const apply = (state: Record<string, any> | null | undefined) =>
|
||||
applyExtendState(form.formState, state);
|
||||
if (result && typeof result.then === 'function') {
|
||||
result.then(apply, (e: any) => console.error('[MForm] extendState failed:', e));
|
||||
} else {
|
||||
apply(result);
|
||||
}
|
||||
},
|
||||
{ flush: 'sync', immediate: true },
|
||||
);
|
||||
return () => h(userWrapper);
|
||||
},
|
||||
})
|
||||
: wrapperComponent;
|
||||
: userWrapper;
|
||||
|
||||
const app = createApp(rootComponent);
|
||||
instance.app = app;
|
||||
const app = createApp(wrapperComponent);
|
||||
instance.app = app;
|
||||
|
||||
// 继承父级应用上下文(components / directives / provides / config 等)
|
||||
if (appContext) {
|
||||
Object.assign(app._context, appContext);
|
||||
}
|
||||
// 继承父级应用上下文(components / directives / provides / config 等)
|
||||
if (appContext) {
|
||||
Object.assign(app._context, appContext);
|
||||
}
|
||||
|
||||
// 非 debug(未跳过超时)场景始终注册超时兜底:timeout 为非正数时回退到默认值,
|
||||
// 避免表单永不初始化时实例/容器/watcher 无限驻留而泄漏。
|
||||
if (!skipTimeout) {
|
||||
const effectiveTimeout = timeout > 0 ? timeout : DEFAULT_MOUNT_TIMEOUT;
|
||||
timer = setTimeout(() => {
|
||||
if (!cleaned) {
|
||||
reject(new Error(timeoutMessage));
|
||||
cleanup();
|
||||
}
|
||||
}, effectiveTimeout);
|
||||
}
|
||||
if (timeout > 0 && !skipTimeout) {
|
||||
timer = setTimeout(() => {
|
||||
if (!cleaned) {
|
||||
reject(new Error(timeoutMessage));
|
||||
cleanup();
|
||||
}
|
||||
}, timeout);
|
||||
}
|
||||
|
||||
try {
|
||||
app.mount(container);
|
||||
} catch (err) {
|
||||
reject(err);
|
||||
@ -500,13 +425,12 @@ const createDebugWrapper = (options: DebugWrapperOptions): Component => {
|
||||
* ```
|
||||
*/
|
||||
export const submitForm = (options: SubmitFormOptions): Promise<any> => {
|
||||
const { native, appContext, timeout = 10000, returnChangeRecords, debug = false, signal, ...formProps } = options;
|
||||
const { native, appContext, timeout = 10000, returnChangeRecords, debug = false, ...formProps } = options;
|
||||
|
||||
return mountFormInstance<any>({
|
||||
formProps,
|
||||
appContext,
|
||||
timeout,
|
||||
signal,
|
||||
// 调试模式需把表单展示出来;普通模式隐藏挂载
|
||||
hidden: !debug,
|
||||
// 调试模式等待人工操作,不应用超时
|
||||
@ -610,11 +534,6 @@ export interface ValidateFormOptions {
|
||||
*/
|
||||
debug?: boolean;
|
||||
typeMatchValid?: boolean;
|
||||
/**
|
||||
* 外部中断信号。abort 时会立即以 `signal.reason` reject 并卸载临时表单实例、移除容器。
|
||||
* 主要用于 `debug` 模式(无超时兜底)下取消一个被放弃的表单弹层,避免其无限驻留在页面上。
|
||||
*/
|
||||
signal?: AbortSignal;
|
||||
}
|
||||
// #endregion ValidateFormOptions
|
||||
|
||||
@ -710,7 +629,7 @@ export const stripTabItemsLazy = (config: FormConfig): FormConfig => {
|
||||
* ```
|
||||
*/
|
||||
export const validateForm = (options: ValidateFormOptions): Promise<string> => {
|
||||
const { appContext, timeout = 10000, debug = false, config, signal, ...rest } = options;
|
||||
const { appContext, timeout = 10000, debug = false, config, ...rest } = options;
|
||||
|
||||
// 去掉 tab 容器各标签页的 lazy,确保懒加载标签页内的字段也参与校验
|
||||
const formProps = { ...rest, config: stripTabItemsLazy(config) };
|
||||
@ -719,7 +638,6 @@ export const validateForm = (options: ValidateFormOptions): Promise<string> => {
|
||||
formProps,
|
||||
appContext,
|
||||
timeout,
|
||||
signal,
|
||||
// 调试模式需把表单展示出来;普通模式隐藏挂载
|
||||
hidden: !debug,
|
||||
// 调试模式等待人工操作,不应用超时
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
.m-fields-group-list-item.tmagic-design-card--flat:last-child {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.el-button--text {
|
||||
padding: 0;
|
||||
margin-bottom: 7px;
|
||||
@ -31,19 +32,9 @@
|
||||
}
|
||||
|
||||
.m-fields-group-list-footer {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
/** 最外层的groupList需要每个item需要增加空白区域界限时,增加outer-gorup_list可以实现 */
|
||||
.m-container-group-list {
|
||||
&.outer-gorup_list {
|
||||
> .m-fields-group-list {
|
||||
> .m-fields-group-list-item {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -92,15 +92,4 @@
|
||||
text-align: left;
|
||||
}
|
||||
}
|
||||
|
||||
.m-fields-group-list {
|
||||
.el-table__empty-block {
|
||||
.el-table__empty-text {
|
||||
width: 100%;
|
||||
background-color: rgba(0, 0, 0, 0.03);
|
||||
margin-top: 8px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -60,15 +60,13 @@ export const adaptFormValidator = (validator: AsyncValidatorFn): AsyncValidatorF
|
||||
const value = arg1;
|
||||
return new Promise((resolve) => {
|
||||
let settled = false;
|
||||
const callback = (error?: Error | string | (Error | string)[]) => {
|
||||
const callback = (error?: Error | string) => {
|
||||
if (settled) return;
|
||||
settled = true;
|
||||
// async-validator 约定 callback 也可接收错误数组,TDesign 只能展示一条,取首条
|
||||
const first = Array.isArray(error) ? error[0] : error;
|
||||
if (first) {
|
||||
if (error) {
|
||||
resolve({
|
||||
result: false,
|
||||
message: typeof first === 'string' ? first : first.message,
|
||||
message: typeof error === 'string' ? error : error.message,
|
||||
});
|
||||
} else {
|
||||
resolve(true);
|
||||
@ -76,9 +74,8 @@ export const adaptFormValidator = (validator: AsyncValidatorFn): AsyncValidatorF
|
||||
};
|
||||
|
||||
try {
|
||||
// 异步 validator 会先返回 undefined,稍后再调 callback,这里不能当成 thenable 取值
|
||||
const result = validator(undefined, value, callback);
|
||||
if (result && typeof (result as PromiseLike<unknown>).then === 'function') {
|
||||
if (result !== null && typeof (result as PromiseLike<unknown>).then === 'function') {
|
||||
Promise.resolve(result).then(
|
||||
() => {
|
||||
if (!settled) callback();
|
||||
@ -452,27 +449,16 @@ export const sortChange = (data: any[], { prop, order }: SortProp) => {
|
||||
* - accessor 描述符(`{ get stage() { return ... } }`)按原样 defineProperty,调用方
|
||||
* 可控制读时求值;强制 `configurable: true` 以便下一次合并可再 define。
|
||||
*
|
||||
* 注意:extendState 只能向 formState「新增」字段,不允许覆盖其已有 key。
|
||||
* 调用方可通过 `reservedKeys` 传入合并前已存在的内置 key 快照(keyProp / popperClass /
|
||||
* config / initValues / isCompare / lastValues / parentValues / values / $emit / fields /
|
||||
* post 等),命中这些 key 时统一跳过并告警。
|
||||
*
|
||||
* 兜底:未传 `reservedKeys` 时,仍会拦截 props 派生的只读 getter 字段(无 setter),
|
||||
* 否则以普通字段形式赋值会让 proxy 的 set trap 抛出
|
||||
* `TypeError: 'set' on proxy: trap returned falsish`。
|
||||
* 注意:formState 上由 props 派生的字段(keyProp / popperClass / config / initValues /
|
||||
* isCompare / lastValues / parentValues)是只读 getter(无 setter),extendState 若以
|
||||
* 普通字段形式返回同名 key,直接赋值会让 proxy 的 set trap 失败并抛出
|
||||
* `TypeError: 'set' on proxy: trap returned falsish`,这里统一跳过并告警;
|
||||
* 如确需覆盖,可在 extendState 中以 get 访问器形式返回。
|
||||
*/
|
||||
export const applyExtendState = (
|
||||
formState: FormState,
|
||||
state: Record<string, any> | null | undefined,
|
||||
reservedKeys?: Set<string | symbol>,
|
||||
): void => {
|
||||
export const applyExtendState = (formState: FormState, state: Record<string, any> | null | undefined): void => {
|
||||
if (!state) return;
|
||||
|
||||
for (const [key, descriptor] of Object.entries(Object.getOwnPropertyDescriptors(state))) {
|
||||
if (reservedKeys?.has(key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!('value' in descriptor)) {
|
||||
descriptor.configurable = true;
|
||||
Object.defineProperty(formState, key, descriptor);
|
||||
|
||||
@ -38,15 +38,8 @@ export interface TypeMatchValidateContext {
|
||||
// #endregion TypeMatchValidateContext
|
||||
|
||||
// #region TypeMatchValidator
|
||||
/**
|
||||
* 自定义 type 校验器:返回错误文案;通过则返回 undefined。
|
||||
*
|
||||
* 支持返回 Promise,用于需要异步确认取值是否合法的场景(如请求接口校验 id 是否存在)。
|
||||
*/
|
||||
export type TypeMatchValidator = (
|
||||
value: any,
|
||||
context: TypeMatchValidateContext,
|
||||
) => string | undefined | Promise<string | undefined>;
|
||||
/** 自定义 type 校验器:返回错误文案;通过则返回 undefined */
|
||||
export type TypeMatchValidator = (value: any, context: TypeMatchValidateContext) => string | undefined;
|
||||
// #endregion TypeMatchValidator
|
||||
|
||||
const typeMatchRuleRegistry = new Map<string, TypeMatchValidator>();
|
||||
@ -149,7 +142,7 @@ const stringifyExampleValue = (value: any): string => {
|
||||
};
|
||||
|
||||
// 参考建议中最多展示的可选值个数,超出以「等」省略。
|
||||
const MAX_SUGGESTION_OPTIONS = 20;
|
||||
const MAX_SUGGESTION_OPTIONS = 5;
|
||||
|
||||
/**
|
||||
* 生成「请使用以下某一个值:xxx;xxx」形式的参考建议;无可选值时返回空字符串(不追加建议)。
|
||||
@ -565,11 +558,6 @@ const validateBuiltinTypeMatch = (
|
||||
return undefined;
|
||||
}
|
||||
|
||||
// text 常与数字(如 id、数量)绑定,值允许为数字;错误建议仍按字符串给出
|
||||
if (fieldType === 'text' && isNumberValue(value)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (typeof value !== 'string') {
|
||||
return defaultMessage(
|
||||
message,
|
||||
@ -699,28 +687,19 @@ const validateBuiltinTypeMatch = (
|
||||
return undefined;
|
||||
};
|
||||
|
||||
/**
|
||||
* 校验取值与字段 type 是否匹配;通过返回 undefined,否则返回错误文案。
|
||||
*
|
||||
* 命中的自定义规则是异步校验器时返回 Promise,内置规则始终同步返回。
|
||||
*/
|
||||
export const validateTypeMatch = (
|
||||
value: any,
|
||||
mForm: FormState | undefined,
|
||||
props: any,
|
||||
message?: string,
|
||||
): string | undefined | Promise<string | undefined> => {
|
||||
): string | undefined => {
|
||||
if (isEmptyValue(value) || isEmptyArray(value)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (!props.config?.name) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const rawFieldType = 'type' in (props.config || {}) ? props.config.type : '';
|
||||
if (typeof rawFieldType !== 'string' || !rawFieldType) {
|
||||
return undefined;
|
||||
return;
|
||||
}
|
||||
|
||||
// 统一将驼峰形式(如 radioGroup)归一化为连字符形式(radio-group),与内置规则的 key 保持一致
|
||||
@ -736,135 +715,43 @@ export const validateTypeMatch = (
|
||||
return validateBuiltinTypeMatch(value, fieldType, mForm, props, message);
|
||||
};
|
||||
|
||||
const toError = (error: any): Error => (error instanceof Error ? error : new Error(`${error}`));
|
||||
|
||||
export const createTypeMatchValidator = (mForm: FormState | undefined, props: any, rule: Rule) => {
|
||||
const originalValidator = typeof rule.validator === 'function' ? rule.validator : undefined;
|
||||
|
||||
/**
|
||||
* 每次校验取一个自增序号,只有最新一轮的结论会被采用。
|
||||
*
|
||||
* 旧值的在途校验不能用自己的结论结算:它可能晚于新校验结束,用过期结论覆盖新结论
|
||||
* (表单取最后结束的那次结果);也不能在新校验开始时无条件按通过结算,否则
|
||||
* `form.validate()` 会对一个还没校验过的值返回成功。因此所有尚未结算的调用都登记在
|
||||
* pendingSettlers 中,等最新一轮出结论后用同一个结论一起结算。
|
||||
*
|
||||
* 不比较取值本身:配了 names 或取值为对象/数组时拿到的是同一个引用,就地修改后比较不出变化。
|
||||
*/
|
||||
let generation = 0;
|
||||
let pendingSettlers: ((args: any[]) => void)[] = [];
|
||||
|
||||
return (asyncValidatorRule: any, value: any, callback: Function, source: any, options: any) => {
|
||||
const actualValue = props.config?.names ? props.model : value;
|
||||
|
||||
generation += 1;
|
||||
const currentGeneration = generation;
|
||||
/** 已有更新的一轮校验开始,本轮结论作废 */
|
||||
const isStale = () => currentGeneration !== generation;
|
||||
|
||||
pendingSettlers.push((args: any[]) => callback(...args));
|
||||
|
||||
/**
|
||||
* 结算本轮与被本轮取代的所有在途校验。
|
||||
*
|
||||
* async-validator 的 callback 不幂等:重复调用会让它的内部计数提前满足、错误信息重复;
|
||||
* 原始 validator 写成 async 时很容易既调 callback 又返回 Promise,故所有回调都收敛到这里,
|
||||
* 由「取出即出队」保证每个调用的 callback 只会被调用一次。
|
||||
*/
|
||||
const conclude = (...args: any[]) => {
|
||||
if (isStale()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const settlers = pendingSettlers;
|
||||
pendingSettlers = [];
|
||||
for (const settle of settlers) {
|
||||
settle(args);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 执行原始 validator 并把结果统一转成 callback。
|
||||
*
|
||||
* async-validator 只解析同步返回给它的返回值(true / false / Error / 错误数组 / Promise,
|
||||
* 抛错转成错误信息),异步路径已脱离它的调用栈,这些约定会失效导致校验永不结束,故复刻一份。
|
||||
*/
|
||||
const settleWithOriginalValidator = () => {
|
||||
// 本轮结论已作废,不必再跑一遍原始 validator 触发副作用
|
||||
if (isStale()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!originalValidator) {
|
||||
conclude();
|
||||
return;
|
||||
}
|
||||
|
||||
let result: any;
|
||||
try {
|
||||
result = originalValidator(
|
||||
{ rule: asyncValidatorRule, value: actualValue, callback: conclude, source, options },
|
||||
{
|
||||
values: mForm?.initValues || {},
|
||||
model: props.model,
|
||||
parent: mForm?.parentValues || {},
|
||||
formValue: mForm?.values || props.model,
|
||||
prop: props.prop,
|
||||
config: props.config,
|
||||
},
|
||||
mForm,
|
||||
);
|
||||
} catch (err) {
|
||||
conclude(toError(err));
|
||||
return;
|
||||
}
|
||||
|
||||
if (isPromise(result)) {
|
||||
result.then(
|
||||
() => conclude(),
|
||||
(err: any) => conclude(toError(err)),
|
||||
);
|
||||
} else if (result === true) {
|
||||
conclude();
|
||||
} else if (result === false) {
|
||||
const field = asyncValidatorRule?.fullField || asyncValidatorRule?.field || props.prop;
|
||||
conclude(new Error(rule.message || `${field} fails`));
|
||||
} else if (result instanceof Error || Array.isArray(result)) {
|
||||
conclude(result);
|
||||
}
|
||||
// 其余返回值(undefined / void)按约定由 validator 自行调用 callback
|
||||
};
|
||||
|
||||
// 校验器自身失败(如接口异常)不应阻塞用户,记录后按通过处理
|
||||
const skipFailedTypeMatch = (err: any) => {
|
||||
console.error(err);
|
||||
settleWithOriginalValidator();
|
||||
};
|
||||
|
||||
let error: string | undefined | Promise<string | undefined>;
|
||||
try {
|
||||
error = validateTypeMatch(actualValue, mForm, props, rule.message);
|
||||
} catch (err) {
|
||||
skipFailedTypeMatch(err);
|
||||
return;
|
||||
const error = validateTypeMatch(actualValue, mForm, props, rule.message);
|
||||
|
||||
if (error) {
|
||||
callback(new Error(error));
|
||||
return;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
if (isPromise(error)) {
|
||||
error.then((asyncMessage) => {
|
||||
if (asyncMessage) {
|
||||
conclude(new Error(asyncMessage));
|
||||
return;
|
||||
}
|
||||
settleWithOriginalValidator();
|
||||
}, skipFailedTypeMatch);
|
||||
return;
|
||||
if (originalValidator) {
|
||||
return originalValidator(
|
||||
{
|
||||
rule: asyncValidatorRule,
|
||||
value: actualValue,
|
||||
callback,
|
||||
source,
|
||||
options,
|
||||
},
|
||||
{
|
||||
values: mForm?.initValues || {},
|
||||
model: props.model,
|
||||
parent: mForm?.parentValues || {},
|
||||
formValue: mForm?.values || props.model,
|
||||
prop: props.prop,
|
||||
config: props.config,
|
||||
},
|
||||
mForm,
|
||||
);
|
||||
}
|
||||
|
||||
if (error) {
|
||||
conclude(new Error(error));
|
||||
return;
|
||||
}
|
||||
|
||||
settleWithOriginalValidator();
|
||||
callback();
|
||||
};
|
||||
};
|
||||
|
||||
@ -189,7 +189,9 @@ describe('Form.vue —— extendState', () => {
|
||||
expect(v2).toMatch(/^stage-/);
|
||||
});
|
||||
|
||||
test('extendState 以普通字段返回内置保留字段时静默跳过,其余字段正常合并', async () => {
|
||||
test('extendState 以普通字段返回 props 派生的只读字段时跳过并告警,不抛错', async () => {
|
||||
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
|
||||
|
||||
const wrapper = mountForm({
|
||||
keyProp: 'id',
|
||||
extendState: () => ({ keyProp: 'custom', config: [], extra: 'ok' }),
|
||||
@ -199,15 +201,18 @@ describe('Form.vue —— extendState', () => {
|
||||
await nextTick();
|
||||
await nextTick();
|
||||
|
||||
// 内置保留字段(keyProp / config)未被 extendState 覆盖
|
||||
// 只读派生字段保持 props 值,未被覆盖
|
||||
expect((wrapper.vm.formState as any).keyProp).toBe('id');
|
||||
expect(Array.isArray((wrapper.vm.formState as any).config)).toBe(true);
|
||||
// 非保留字段正常合并
|
||||
// 其他字段正常合并
|
||||
expect((wrapper.vm.formState as any).extra).toBe('ok');
|
||||
expect(warnSpy).toHaveBeenCalled();
|
||||
expect(wrapper.find('.m-form').exists()).toBe(true);
|
||||
|
||||
warnSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('extendState 以 get 访问器返回内置保留字段同名 key 时仍被拦截,无法覆盖', async () => {
|
||||
test('extendState 以 get 访问器返回只读字段同名 key 时允许显式覆盖', async () => {
|
||||
const wrapper = mountForm({
|
||||
keyProp: 'id',
|
||||
extendState: () =>
|
||||
@ -223,8 +228,7 @@ describe('Form.vue —— extendState', () => {
|
||||
await nextTick();
|
||||
await nextTick();
|
||||
|
||||
// keyProp 属于内置保留字段,即使以访问器形式返回也不允许覆盖
|
||||
expect((wrapper.vm.formState as any).keyProp).toBe('id');
|
||||
expect((wrapper.vm.formState as any).keyProp).toBe('custom-key');
|
||||
});
|
||||
|
||||
test('extendState 同步段读到的响应式数据变化时会重跑', async () => {
|
||||
|
||||
@ -16,29 +16,18 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
import { afterEach, beforeAll, describe, expect, test, vi } from 'vitest';
|
||||
import { type AppContext, createApp, defineComponent, h, inject, nextTick } from 'vue';
|
||||
import MagicForm, { FORM_SILENT_MODE_KEY, submitForm, validateForm } from '@form/index';
|
||||
import { type AppContext, createApp, defineComponent, h, nextTick } from 'vue';
|
||||
import MagicForm, { submitForm } from '@form/index';
|
||||
import ElementPlus from 'element-plus';
|
||||
|
||||
let appContext: AppContext;
|
||||
|
||||
// 探针字段:挂载时注入静默标记并记录,用于验证 submitForm/validateForm 的 provide 行为
|
||||
const silentProbeValues: (boolean | undefined)[] = [];
|
||||
const SilentProbe = defineComponent({
|
||||
name: 'MFieldsSilentProbe',
|
||||
setup() {
|
||||
silentProbeValues.push(inject(FORM_SILENT_MODE_KEY, undefined));
|
||||
return () => h('div');
|
||||
},
|
||||
});
|
||||
|
||||
beforeAll(() => {
|
||||
// 构造一个父级 app,把 element-plus 与 m-form 插件装上,
|
||||
// 之后通过 appContext 传给 submitForm 复用全局注册
|
||||
const parentApp = createApp(defineComponent({ render: () => h('div') }));
|
||||
parentApp.use(ElementPlus);
|
||||
parentApp.use(MagicForm);
|
||||
parentApp.component('m-fields-silent-probe', SilentProbe);
|
||||
appContext = parentApp._context;
|
||||
});
|
||||
|
||||
@ -90,7 +79,9 @@ describe('submitForm', () => {
|
||||
expect(extendState).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('extendState 返回 keyProp 等内置保留字段时静默跳过且正常 resolve', async () => {
|
||||
test('extendState 返回 keyProp 等只读派生字段时不抛错且正常 resolve', async () => {
|
||||
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
|
||||
|
||||
const values = await submitForm({
|
||||
config: [{ type: 'text', name: 'text', text: 'text' }],
|
||||
initValues: { text: 'foo' },
|
||||
@ -98,8 +89,10 @@ describe('submitForm', () => {
|
||||
appContext,
|
||||
});
|
||||
|
||||
// keyProp 属于内置保留字段,被静默跳过,不污染最终 values
|
||||
expect(values).toEqual({ text: 'foo' });
|
||||
expect(warnSpy).toHaveBeenCalled();
|
||||
|
||||
warnSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('在嵌套 items 配置下也能正确 resolve', async () => {
|
||||
@ -223,44 +216,6 @@ describe('submitForm', () => {
|
||||
expect(caught).toBeInstanceOf(Error);
|
||||
});
|
||||
|
||||
test('静默(隐藏挂载)模式下向字段 provide FORM_SILENT_MODE_KEY=true', async () => {
|
||||
silentProbeValues.length = 0;
|
||||
|
||||
const values = await submitForm({
|
||||
config: [{ type: 'silent-probe', name: 'text', text: 'text' }],
|
||||
initValues: { text: 'hello' },
|
||||
appContext,
|
||||
});
|
||||
|
||||
expect(values).toEqual({ text: 'hello' });
|
||||
expect(silentProbeValues).toEqual([true]);
|
||||
});
|
||||
|
||||
test('静默标记不会泄漏到父级应用的 provides', async () => {
|
||||
silentProbeValues.length = 0;
|
||||
|
||||
await submitForm({
|
||||
config: [{ type: 'silent-probe', name: 'text', text: 'text' }],
|
||||
initValues: { text: 'hello' },
|
||||
appContext,
|
||||
});
|
||||
|
||||
expect((appContext as any).provides[FORM_SILENT_MODE_KEY as symbol]).toBeUndefined();
|
||||
});
|
||||
|
||||
test('validateForm 静默模式下同样 provide FORM_SILENT_MODE_KEY=true', async () => {
|
||||
silentProbeValues.length = 0;
|
||||
|
||||
const error = await validateForm({
|
||||
config: [{ type: 'silent-probe', name: 'text', text: 'text' }],
|
||||
initValues: { text: 'hello' },
|
||||
appContext,
|
||||
});
|
||||
|
||||
expect(error).toBe('');
|
||||
expect(silentProbeValues).toEqual([true]);
|
||||
});
|
||||
|
||||
test('timeout > 0 时会注册定时器,timeout <= 0 时不注册', async () => {
|
||||
const setTimeoutSpy = vi.spyOn(globalThis, 'setTimeout');
|
||||
|
||||
@ -399,24 +354,6 @@ describe('submitForm —— debug 模式', () => {
|
||||
expect(document.body.querySelector('.m-form')).toBeNull();
|
||||
});
|
||||
|
||||
test('debug 模式不提供静默标记(表单可见,字段应正常渲染)', async () => {
|
||||
silentProbeValues.length = 0;
|
||||
|
||||
const pending = submitForm({
|
||||
config: [{ type: 'silent-probe', name: 'text', text: 'text' }],
|
||||
initValues: { text: 'hello' },
|
||||
debug: true,
|
||||
appContext,
|
||||
});
|
||||
await nextTick();
|
||||
await nextTick();
|
||||
|
||||
expect(silentProbeValues).toEqual([undefined]);
|
||||
|
||||
findButton('确定').click();
|
||||
await pending;
|
||||
});
|
||||
|
||||
test('debug 模式不注册超时定时器(等待人工操作)', async () => {
|
||||
const setTimeoutSpy = vi.spyOn(globalThis, 'setTimeout');
|
||||
|
||||
|
||||
@ -16,10 +16,9 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
import { describe, expect, test, vi } from 'vitest';
|
||||
import { describe, expect, test } from 'vitest';
|
||||
import type { FormState } from '@form/index';
|
||||
import {
|
||||
applyExtendState,
|
||||
createObjectProp,
|
||||
createValues,
|
||||
datetimeFormatter,
|
||||
@ -1015,130 +1014,3 @@ describe('createObjectProp', () => {
|
||||
expect(createObjectProp('a.b.c', 'newKey', 'c')).toBe('a.b.newKey');
|
||||
});
|
||||
});
|
||||
|
||||
describe('applyExtendState', () => {
|
||||
test('state 为 null 或 undefined 时不修改 formState', () => {
|
||||
const formState = { a: 1 } as any;
|
||||
|
||||
applyExtendState(formState, null);
|
||||
applyExtendState(formState, undefined);
|
||||
|
||||
expect(formState).toEqual({ a: 1 });
|
||||
});
|
||||
|
||||
test('普通字段(data descriptor)以新增字段形式合并进 formState', () => {
|
||||
const formState = {} as any;
|
||||
|
||||
applyExtendState(formState, { foo: 'bar', num: 1 });
|
||||
|
||||
expect(formState.foo).toBe('bar');
|
||||
expect(formState.num).toBe(1);
|
||||
});
|
||||
|
||||
test('accessor descriptor 按原样 define 且读时求值', () => {
|
||||
const formState = {} as any;
|
||||
let count = 0;
|
||||
const state = {};
|
||||
Object.defineProperty(state, 'stage', {
|
||||
get() {
|
||||
count += 1;
|
||||
return 'stageValue';
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
});
|
||||
|
||||
applyExtendState(formState, state);
|
||||
|
||||
// 读时才求值
|
||||
expect(count).toBe(0);
|
||||
expect(formState.stage).toBe('stageValue');
|
||||
expect(count).toBe(1);
|
||||
});
|
||||
|
||||
test('accessor descriptor 强制 configurable=true,可再次 define 不报错', () => {
|
||||
const formState = {} as any;
|
||||
const state = {};
|
||||
// 原始描述符 configurable 为 false
|
||||
Object.defineProperty(state, 'stage', {
|
||||
get: () => 'v',
|
||||
enumerable: true,
|
||||
configurable: false,
|
||||
});
|
||||
|
||||
applyExtendState(formState, state);
|
||||
|
||||
const descriptor = Object.getOwnPropertyDescriptor(formState, 'stage');
|
||||
expect(descriptor?.configurable).toBe(true);
|
||||
// 再次合并(重新 define)不应抛出
|
||||
expect(() => applyExtendState(formState, state)).not.toThrow();
|
||||
});
|
||||
|
||||
test('reservedKeys 命中的 key 被跳过,不覆盖已有内置字段', () => {
|
||||
const formState = { values: { origin: true } } as any;
|
||||
const reservedKeys = new Set<string | symbol>(['values']);
|
||||
|
||||
applyExtendState(formState, { values: { changed: true }, extra: 1 }, reservedKeys);
|
||||
|
||||
// reserved key 未被覆盖
|
||||
expect(formState.values).toEqual({ origin: true });
|
||||
// 非 reserved 的新字段正常新增
|
||||
expect(formState.extra).toBe(1);
|
||||
});
|
||||
|
||||
test('reservedKeys 对 accessor 形式的同名 key 同样跳过', () => {
|
||||
const formState = { keyProp: 'origin' } as any;
|
||||
const reservedKeys = new Set<string | symbol>(['keyProp']);
|
||||
const state = {};
|
||||
Object.defineProperty(state, 'keyProp', {
|
||||
get: () => 'override',
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
});
|
||||
|
||||
applyExtendState(formState, state, reservedKeys);
|
||||
|
||||
expect(formState.keyProp).toBe('origin');
|
||||
});
|
||||
|
||||
test('未传 reservedKeys 时,只读 getter 字段被跳过并告警', () => {
|
||||
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
|
||||
const formState = {} as any;
|
||||
Object.defineProperty(formState, 'keyProp', {
|
||||
get: () => 'readonly',
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
});
|
||||
|
||||
applyExtendState(formState, { keyProp: 'newValue' });
|
||||
|
||||
expect(formState.keyProp).toBe('readonly');
|
||||
expect(warnSpy).toHaveBeenCalled();
|
||||
warnSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('未传 reservedKeys 时,存在 setter 的字段可被赋值', () => {
|
||||
let inner = 'old';
|
||||
const formState = {} as any;
|
||||
Object.defineProperty(formState, 'writable', {
|
||||
get: () => inner,
|
||||
set: (v: string) => {
|
||||
inner = v;
|
||||
},
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
});
|
||||
|
||||
applyExtendState(formState, { writable: 'new' });
|
||||
|
||||
expect(formState.writable).toBe('new');
|
||||
});
|
||||
|
||||
test('未传 reservedKeys 时,普通可写字段正常覆盖赋值', () => {
|
||||
const formState = { editable: 'old' } as any;
|
||||
|
||||
applyExtendState(formState, { editable: 'new' });
|
||||
|
||||
expect(formState.editable).toBe('new');
|
||||
});
|
||||
});
|
||||
|
||||
@ -21,7 +21,6 @@ import type { FormState } from '@form/index';
|
||||
import { getRules } from '@form/utils/form';
|
||||
import {
|
||||
clearTypeMatchRules,
|
||||
createTypeMatchValidator,
|
||||
deleteTypeMatchRule,
|
||||
getTypeMatchRule,
|
||||
registerTypeMatchRule,
|
||||
@ -52,12 +51,9 @@ const mForm: FormState = {
|
||||
};
|
||||
|
||||
const propsOf = (config: Record<string, any>, model: Record<string, any> = {}) => ({
|
||||
config: {
|
||||
name: 'field',
|
||||
...config,
|
||||
},
|
||||
config,
|
||||
model,
|
||||
prop: config.name || config.prop || 'field',
|
||||
prop: config.name || 'field',
|
||||
});
|
||||
|
||||
describe('validateTypeMatch', () => {
|
||||
@ -68,19 +64,6 @@ describe('validateTypeMatch', () => {
|
||||
expect(validateTypeMatch([], mForm, propsOf({ type: 'select', multiple: true }))).toBeUndefined();
|
||||
});
|
||||
|
||||
test('config 未配置 name 时跳过校验', () => {
|
||||
const noNameProps = { config: { type: 'text' }, model: {} };
|
||||
expect(validateTypeMatch(123, mForm, noNameProps)).toBeUndefined();
|
||||
expect(validateTypeMatch({ a: 1 }, mForm, { config: { type: 'number' }, model: {} })).toBeUndefined();
|
||||
expect(
|
||||
validateTypeMatch('bad', mForm, {
|
||||
config: { type: 'select', options: [{ text: 'A', value: 'a' }] },
|
||||
model: {},
|
||||
}),
|
||||
).toBeUndefined();
|
||||
expect(validateTypeMatch(123, mForm, { config: undefined, model: {} })).toBeUndefined();
|
||||
});
|
||||
|
||||
test('0 / false 不视为空值', () => {
|
||||
expect(validateTypeMatch(0, mForm, propsOf({ type: 'number' }))).toBeUndefined();
|
||||
expect(validateTypeMatch(false, mForm, propsOf({ type: 'switch' }))).toBeUndefined();
|
||||
@ -91,17 +74,12 @@ describe('validateTypeMatch', () => {
|
||||
expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'hidden' }))).toBeUndefined();
|
||||
});
|
||||
|
||||
test('text 期望 string,允许 number', () => {
|
||||
test('text 期望 string', () => {
|
||||
expect(validateTypeMatch('ok', mForm, propsOf({ type: 'text' }))).toBeUndefined();
|
||||
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }))).toBeUndefined();
|
||||
expect(validateTypeMatch(0, mForm, propsOf({ type: 'text' }))).toBeUndefined();
|
||||
expect(validateTypeMatch(NaN, mForm, propsOf({ type: 'text' }))).toBe(
|
||||
'NaN 类型应为字符串\n\n请参考以下示例值:"文本内容"',
|
||||
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }))).toBe(
|
||||
'1 类型应为字符串\n\n请参考以下示例值:"文本内容"',
|
||||
);
|
||||
expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'text' }))).toBe(
|
||||
'[object Object] 类型应为字符串\n\n请参考以下示例值:"文本内容"',
|
||||
);
|
||||
expect(validateTypeMatch(true, mForm, propsOf({ type: 'text' }), '自定义错误')).toBe('自定义错误');
|
||||
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text' }), '自定义错误')).toBe('自定义错误');
|
||||
});
|
||||
|
||||
test('text filter=number 时期望 number', () => {
|
||||
@ -196,14 +174,13 @@ describe('validateTypeMatch', () => {
|
||||
expect(validateTypeMatch(3, mForm, propsOf(config))).toBe('3 不在可选项中\n\n请使用以下某一个值:1;2');
|
||||
});
|
||||
|
||||
test('可选项超过 20 个时建议仅展示前 20 个并以「等」省略', () => {
|
||||
const values = Array.from({ length: 21 }, (_, i) => i + 1);
|
||||
test('可选项超过 5 个时建议仅展示前 5 个并以「等」省略', () => {
|
||||
const config = {
|
||||
type: 'select',
|
||||
options: values.map((v) => ({ text: `${v}`, value: v })),
|
||||
options: [1, 2, 3, 4, 5, 6, 7].map((v) => ({ text: `${v}`, value: v })),
|
||||
};
|
||||
expect(validateTypeMatch(99, mForm, propsOf(config))).toBe(
|
||||
`99 不在可选项中\n\n请使用以下某一个值:${values.slice(0, 20).join(';')} 等`,
|
||||
'99 不在可选项中\n\n请使用以下某一个值:1;2;3;4;5 等',
|
||||
);
|
||||
});
|
||||
|
||||
@ -409,11 +386,6 @@ describe('validateTypeMatch', () => {
|
||||
).toBe('a 类型应为数组\n\n请参考以下示例值:["a"]');
|
||||
});
|
||||
|
||||
test('radio-group / checkbox-group 无 options 时跳过校验', () => {
|
||||
expect(validateTypeMatch('a', mForm, propsOf({ type: 'radio-group' }))).toBeUndefined();
|
||||
expect(validateTypeMatch('a', mForm, propsOf({ type: 'checkbox-group' }))).toBeUndefined();
|
||||
});
|
||||
|
||||
test('timerange 按 valueFormat 校验', () => {
|
||||
expect(validateTypeMatch(['12:00:00', '13:00:00'], mForm, propsOf({ type: 'timerange' }))).toBeUndefined();
|
||||
expect(validateTypeMatch(['bad'], mForm, propsOf({ type: 'timerange' }))).toMatch(
|
||||
@ -532,8 +504,8 @@ describe('validateTypeMatch', () => {
|
||||
expect(validateTypeMatch('1', mForm, propsOf({ type: 'number', defaultValue: () => Promise.resolve(123) }))).toBe(
|
||||
'1 类型应为数字\n\n请参考以下示例值:123',
|
||||
);
|
||||
expect(validateTypeMatch({ a: 1 }, mForm, propsOf({ type: 'text', defaultValue: async () => '示例' }))).toBe(
|
||||
'[object Object] 类型应为字符串\n\n请参考以下示例值:"文本内容"',
|
||||
expect(validateTypeMatch(1, mForm, propsOf({ type: 'text', defaultValue: async () => '示例' }))).toBe(
|
||||
'1 类型应为字符串\n\n请参考以下示例值:"文本内容"',
|
||||
);
|
||||
});
|
||||
});
|
||||
@ -551,7 +523,7 @@ describe('getRules typeMatch', () => {
|
||||
const rules: any = [{ typeMatch: true, message: '类型错误' }];
|
||||
const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' }));
|
||||
const callback = vi.fn();
|
||||
newRules[0].validator({}, { a: 1 }, callback);
|
||||
newRules[0].validator({}, 123, callback);
|
||||
expect(callback).toHaveBeenCalledWith(expect.any(Error));
|
||||
expect(callback.mock.calls[0][0].message).toBe('类型错误');
|
||||
});
|
||||
@ -596,7 +568,7 @@ describe('getRules tdesign validator', () => {
|
||||
const rules: any = [{ typeMatch: true, message: '类型错误' }];
|
||||
const newRules: any = getRules(mForm, rules, propsOf({ type: 'text' }));
|
||||
// TDesign 调用签名:validator(val)
|
||||
await expect(newRules[0].validator({ a: 1 })).resolves.toEqual({
|
||||
await expect(newRules[0].validator(123)).resolves.toEqual({
|
||||
result: false,
|
||||
message: '类型错误',
|
||||
});
|
||||
@ -625,88 +597,6 @@ describe('getRules tdesign validator', () => {
|
||||
});
|
||||
await expect(newRules[0].validator(1)).resolves.toBe(true);
|
||||
});
|
||||
|
||||
test('异步 typeMatch 校验器的结果能正确适配', async () => {
|
||||
registerTypeMatchRule('async-type', async (value) => (value === 'ok' ? undefined : '异步校验失败'));
|
||||
|
||||
const rules: any = [{ typeMatch: true }];
|
||||
const newRules: any = getRules(mForm, rules, propsOf({ type: 'async-type' }));
|
||||
|
||||
await expect(newRules[0].validator('ok')).resolves.toBe(true);
|
||||
await expect(newRules[0].validator('bad')).resolves.toEqual({
|
||||
result: false,
|
||||
message: '异步校验失败',
|
||||
});
|
||||
|
||||
deleteTypeMatchRule('async-type');
|
||||
});
|
||||
|
||||
test('自定义 validator 返回 Promise 时按 Promise 结果适配', async () => {
|
||||
const rules: any = [
|
||||
{ validator: () => Promise.resolve() },
|
||||
{ validator: () => Promise.reject(new Error('异步失败')) },
|
||||
{ validator: () => Promise.reject('非 Error') },
|
||||
];
|
||||
const newRules: any = getRules(mForm, rules, { config: {} });
|
||||
|
||||
await expect(newRules[0].validator('ok')).resolves.toBe(true);
|
||||
await expect(newRules[1].validator('ok')).resolves.toEqual({
|
||||
result: false,
|
||||
message: '异步失败',
|
||||
});
|
||||
await expect(newRules[2].validator('ok')).resolves.toEqual({
|
||||
result: false,
|
||||
message: '非 Error',
|
||||
});
|
||||
});
|
||||
|
||||
test('自定义 validator 同步抛错时转成 CustomValidateObj', async () => {
|
||||
const rules: any = [
|
||||
{
|
||||
validator: () => {
|
||||
throw new Error('validator 内部抛错');
|
||||
},
|
||||
},
|
||||
{
|
||||
validator: () => {
|
||||
throw 'string error';
|
||||
},
|
||||
},
|
||||
];
|
||||
const newRules: any = getRules(mForm, rules, { config: {} });
|
||||
|
||||
await expect(newRules[0].validator('ok')).resolves.toEqual({
|
||||
result: false,
|
||||
message: 'validator 内部抛错',
|
||||
});
|
||||
await expect(newRules[1].validator('ok')).resolves.toEqual({
|
||||
result: false,
|
||||
message: 'string error',
|
||||
});
|
||||
});
|
||||
|
||||
test('callback 收到错误数组时取首条展示', async () => {
|
||||
const rules: any = [
|
||||
{
|
||||
validator: ({ callback }: any) => {
|
||||
callback([new Error('错误一'), new Error('错误二')]);
|
||||
},
|
||||
},
|
||||
{
|
||||
validator: ({ callback }: any) => {
|
||||
callback([]);
|
||||
},
|
||||
},
|
||||
];
|
||||
const newRules: any = getRules(mForm, rules, { config: {} });
|
||||
|
||||
await expect(newRules[0].validator('ok')).resolves.toEqual({
|
||||
result: false,
|
||||
message: '错误一',
|
||||
});
|
||||
// 空数组视为无错误
|
||||
await expect(newRules[1].validator('ok')).resolves.toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe('typeMatch 扩展注册', () => {
|
||||
@ -804,428 +694,3 @@ describe('plugin typeMatchRules', () => {
|
||||
expect(validateTypeMatch('bad', mForm, propsOf({ type: 'install-type' }))).toBe('install error');
|
||||
});
|
||||
});
|
||||
|
||||
describe('createTypeMatchValidator', () => {
|
||||
beforeEach(() => {
|
||||
clearTypeMatchRules();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
clearTypeMatchRules();
|
||||
});
|
||||
|
||||
test('validateTypeMatch 抛异常时仍执行原始 validator', () => {
|
||||
registerTypeMatchRule('throw', () => {
|
||||
throw new Error('boom');
|
||||
});
|
||||
|
||||
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||
const originalValidator = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'throw' }), {
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
validator({}, 'value', () => {}, {}, {});
|
||||
expect(originalValidator).toHaveBeenCalled();
|
||||
expect(errorSpy).toHaveBeenCalled();
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('异步校验器返回错误文案时回调 Error', async () => {
|
||||
registerTypeMatchRule('async-type', async (value) => (value === 'ok' ? undefined : '异步校验失败'));
|
||||
|
||||
const callback = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
// 异步校验器不能把 Promise 交还给 async-validator,否则会重复回调
|
||||
expect(validator({}, 'bad', callback, {}, {})).toBeUndefined();
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0]).toBeInstanceOf(Error);
|
||||
expect(callback.mock.calls[0][0].message).toBe('异步校验失败');
|
||||
});
|
||||
|
||||
test('异步校验器通过时无参回调', async () => {
|
||||
registerTypeMatchRule('async-type', async (value) => (value === 'ok' ? undefined : '异步校验失败'));
|
||||
|
||||
const callback = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
validator({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback).toHaveBeenCalledWith();
|
||||
});
|
||||
|
||||
test('异步校验器通过后继续执行原始 validator', async () => {
|
||||
registerTypeMatchRule('async-type', async () => undefined);
|
||||
|
||||
const callback = vi.fn();
|
||||
const originalValidator = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
validator({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(originalValidator).toHaveBeenCalled());
|
||||
// 原始 validator 拿到 callback 后自行回调,这里不重复调用
|
||||
expect(callback).not.toHaveBeenCalled();
|
||||
expect(originalValidator.mock.calls[0][0].value).toBe('ok');
|
||||
});
|
||||
|
||||
test('异步校验器不通过时不执行原始 validator', async () => {
|
||||
registerTypeMatchRule('async-type', async () => '异步校验失败');
|
||||
|
||||
const callback = vi.fn();
|
||||
const originalValidator = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
validator({}, 'bad', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(originalValidator).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
test('异步校验器 reject 时忽略异常并继续执行原始 validator', async () => {
|
||||
registerTypeMatchRule('async-type', () => Promise.reject(new Error('boom')));
|
||||
|
||||
const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
|
||||
const callback = vi.fn();
|
||||
const originalValidator = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
validator({}, 'value', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(originalValidator).toHaveBeenCalled());
|
||||
expect(errorSpy).toHaveBeenCalled();
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
|
||||
test('异步路径下原始 validator 返回的 Promise 会被转成 callback', async () => {
|
||||
registerTypeMatchRule('async-type', async () => undefined);
|
||||
|
||||
const callback = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
validator: () => Promise.reject(new Error('原始校验失败')),
|
||||
} as any);
|
||||
|
||||
validator({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0].message).toBe('原始校验失败');
|
||||
});
|
||||
|
||||
test('原始 validator 既调 callback 又返回 Promise 时只回调一次', async () => {
|
||||
registerTypeMatchRule('async-type', async () => undefined);
|
||||
|
||||
const callback = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
// async 写法很常见:内部调了 callback,函数本身又返回 Promise
|
||||
validator: async ({ callback: cb }: any) => {
|
||||
cb(new Error('原始校验失败'));
|
||||
},
|
||||
} as any);
|
||||
|
||||
validator({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0].message).toBe('原始校验失败');
|
||||
|
||||
// 等 Promise 链彻底跑完,确认没有第二次回调
|
||||
await Promise.resolve();
|
||||
await Promise.resolve();
|
||||
expect(callback).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test('异步校验器不影响同步内置规则', () => {
|
||||
registerTypeMatchRule('async-type', async () => '异步校验失败');
|
||||
|
||||
const callback = vi.fn();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'number' }), { typeMatch: true } as any);
|
||||
|
||||
validator({}, 'not-a-number', callback, {}, {});
|
||||
|
||||
// 内置规则仍同步回调
|
||||
expect(callback).toHaveBeenCalledTimes(1);
|
||||
expect(callback.mock.calls[0][0].message).toContain('类型应为数字');
|
||||
});
|
||||
});
|
||||
|
||||
/**
|
||||
* async-validator 只解析同步返回给它的 validator 返回值,异步 typeMatch 通过后已脱离其调用栈,
|
||||
* 因此这些约定必须由 createTypeMatchValidator 自行复刻,否则 callback 永不触发、校验一直挂起。
|
||||
*/
|
||||
describe('createTypeMatchValidator 原始 validator 返回值约定', () => {
|
||||
beforeEach(() => {
|
||||
clearTypeMatchRules();
|
||||
registerTypeMatchRule('async-type', async () => undefined);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
clearTypeMatchRules();
|
||||
});
|
||||
|
||||
const validatorOf = (originalValidator: any, type = 'async-type') =>
|
||||
createTypeMatchValidator(mForm, propsOf({ type }), {
|
||||
typeMatch: true,
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
/** async-type 走异步 typeMatch 路径,text 走同步内置规则路径,两者行为应完全一致 */
|
||||
const paths = ['async-type', 'text'];
|
||||
|
||||
test.each(paths)('%s:返回 false 时回调错误', async (type) => {
|
||||
const callback = vi.fn();
|
||||
validatorOf(() => false, type)({ fullField: 'title' }, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0].message).toBe('title fails');
|
||||
});
|
||||
|
||||
test('返回 false 时优先使用 rule.message', async () => {
|
||||
const callback = vi.fn();
|
||||
createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
message: '自定义错误',
|
||||
validator: () => false,
|
||||
} as any)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0].message).toBe('自定义错误');
|
||||
});
|
||||
|
||||
test.each(paths)('%s:返回 true 时无参回调', async (type) => {
|
||||
const callback = vi.fn();
|
||||
validatorOf(() => true, type)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback).toHaveBeenCalledWith();
|
||||
});
|
||||
|
||||
test.each(paths)('%s:返回 Error 实例时透传', async (type) => {
|
||||
const error = new Error('返回 Error');
|
||||
const callback = vi.fn();
|
||||
validatorOf(() => error, type)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback).toHaveBeenCalledWith(error);
|
||||
});
|
||||
|
||||
test.each(paths)('%s:返回错误数组时透传', async (type) => {
|
||||
const errors = [new Error('错误一'), new Error('错误二')];
|
||||
const callback = vi.fn();
|
||||
validatorOf(() => errors, type)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback).toHaveBeenCalledWith(errors);
|
||||
});
|
||||
|
||||
test.each(paths)('%s:同步抛错时转成回调而非未捕获异常', async (type) => {
|
||||
const unhandled: any[] = [];
|
||||
const onUnhandled = (reason: any) => unhandled.push(reason);
|
||||
process.on('unhandledRejection', onUnhandled);
|
||||
|
||||
const callback = vi.fn();
|
||||
validatorOf(() => {
|
||||
throw new Error('validator 内部抛错');
|
||||
}, type)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0].message).toBe('validator 内部抛错');
|
||||
|
||||
// 等待微任务队列排空,确认异常没有变成游离的 rejected promise
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
process.off('unhandledRejection', onUnhandled);
|
||||
expect(unhandled).toEqual([]);
|
||||
});
|
||||
|
||||
test.each([
|
||||
[
|
||||
'抛出',
|
||||
() => {
|
||||
throw 'string error';
|
||||
},
|
||||
],
|
||||
['reject', () => Promise.reject('string error')],
|
||||
])('%s非 Error 时包装成 Error', async (_case, originalValidator) => {
|
||||
const callback = vi.fn();
|
||||
validatorOf(originalValidator)({}, 'ok', callback, {}, {});
|
||||
|
||||
await vi.waitFor(() => expect(callback).toHaveBeenCalledTimes(1));
|
||||
expect(callback.mock.calls[0][0]).toBeInstanceOf(Error);
|
||||
expect(callback.mock.calls[0][0].message).toBe('string error');
|
||||
});
|
||||
|
||||
test('同步 typeMatch 路径不把 Promise 交还 async-validator,避免重复回调', async () => {
|
||||
const callback = vi.fn();
|
||||
// async 写法很常见:内部调了 callback,函数本身又返回 Promise
|
||||
const returned = validatorOf(async ({ callback: cb }: any) => {
|
||||
cb(new Error('原始校验失败'));
|
||||
}, 'text')({}, 'ok', callback, {}, {});
|
||||
|
||||
// 返回 undefined,async-validator 不会再解析 Promise 二次回调
|
||||
expect(returned).toBeUndefined();
|
||||
expect(callback).toHaveBeenCalledTimes(1);
|
||||
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
expect(callback).toHaveBeenCalledTimes(1);
|
||||
expect(callback.mock.calls[0][0].message).toBe('原始校验失败');
|
||||
});
|
||||
});
|
||||
|
||||
describe('createTypeMatchValidator 异步校验竞态', () => {
|
||||
beforeEach(() => {
|
||||
clearTypeMatchRules();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
clearTypeMatchRules();
|
||||
});
|
||||
|
||||
/** 注册一个由测试手动控制结束时机的异步规则,返回按调用顺序收集的 resolve 队列 */
|
||||
const registerManualRule = () => {
|
||||
const resolvers: ((message: string | undefined) => void)[] = [];
|
||||
registerTypeMatchRule('async-type', () => new Promise<string | undefined>((resolve) => resolvers.push(resolve)));
|
||||
return resolvers;
|
||||
};
|
||||
|
||||
test('旧校验不会用过期结论结算,而是跟随最新一轮的结论', async () => {
|
||||
const resolvers = registerManualRule();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
const staleCallback = vi.fn();
|
||||
const freshCallback = vi.fn();
|
||||
validator({}, 'old', staleCallback, {}, {});
|
||||
expect(staleCallback).not.toHaveBeenCalled();
|
||||
|
||||
// 值变化触发新一轮校验:旧校验的结论作废,但不能提前按通过结算
|
||||
validator({}, 'new', freshCallback, {}, {});
|
||||
expect(staleCallback).not.toHaveBeenCalled();
|
||||
|
||||
// 旧校验先返回,它的结论被丢弃
|
||||
resolvers[0]('旧值校验失败');
|
||||
await Promise.resolve();
|
||||
expect(staleCallback).not.toHaveBeenCalled();
|
||||
|
||||
// 最新一轮出结论后,两次调用都以新结论结算
|
||||
resolvers[1]('新值校验失败');
|
||||
|
||||
await vi.waitFor(() => expect(staleCallback).toHaveBeenCalledTimes(1));
|
||||
expect(freshCallback).toHaveBeenCalledTimes(1);
|
||||
expect(staleCallback.mock.calls[0][0].message).toBe('新值校验失败');
|
||||
expect(freshCallback.mock.calls[0][0].message).toBe('新值校验失败');
|
||||
});
|
||||
|
||||
test('旧校验被同步路径的校验取代时,跟随同步结论结算', async () => {
|
||||
const resolvers = registerManualRule();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
const staleCallback = vi.fn();
|
||||
const freshCallback = vi.fn();
|
||||
validator({}, 'bad', staleCallback, {}, {});
|
||||
|
||||
// 值被清空:空值走同步路径直接通过,在途的旧校验必须跟着通过
|
||||
validator({}, '', freshCallback, {}, {});
|
||||
expect(freshCallback).toHaveBeenCalledWith();
|
||||
expect(staleCallback).toHaveBeenCalledWith();
|
||||
|
||||
// 旧校验的失败结论晚到,不能落到已经通过的新值上
|
||||
resolvers[0]('异步校验失败');
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
expect(staleCallback).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
test('取值为同一引用(names / 对象值)时也能识别出旧校验', async () => {
|
||||
const resolvers = registerManualRule();
|
||||
const model: Record<string, any> = { start: 'old' };
|
||||
const props = { ...propsOf({ type: 'async-type', names: ['start'] }), model };
|
||||
const validator = createTypeMatchValidator(mForm, props, { typeMatch: true } as any);
|
||||
|
||||
const staleCallback = vi.fn();
|
||||
const freshCallback = vi.fn();
|
||||
validator({}, 'x', staleCallback, {}, {});
|
||||
|
||||
// names 场景下校验的是 model 本身,就地修改后引用不变
|
||||
model.start = 'new';
|
||||
validator({}, 'y', freshCallback, {}, {});
|
||||
|
||||
// 新校验先通过,旧校验的失败结论后到,不能覆盖
|
||||
resolvers[1](undefined);
|
||||
resolvers[0]('旧值校验失败');
|
||||
|
||||
await vi.waitFor(() => expect(freshCallback).toHaveBeenCalledTimes(1));
|
||||
expect(freshCallback).toHaveBeenCalledWith();
|
||||
expect(staleCallback).toHaveBeenCalledTimes(1);
|
||||
expect(staleCallback).toHaveBeenCalledWith();
|
||||
});
|
||||
|
||||
test('同值的多次在途校验都会被最新一轮结算', async () => {
|
||||
const resolvers = registerManualRule();
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
const first = vi.fn();
|
||||
const second = vi.fn();
|
||||
const third = vi.fn();
|
||||
// 同一个值可能被 blur、change 触发两次校验,之后值才变化
|
||||
validator({}, 'old', first, {}, {});
|
||||
validator({}, 'old', second, {}, {});
|
||||
validator({}, 'new', third, {}, {});
|
||||
|
||||
resolvers[0]('旧值校验失败');
|
||||
resolvers[1]('旧值校验失败');
|
||||
resolvers[2]('新值校验失败');
|
||||
|
||||
await vi.waitFor(() => expect(third).toHaveBeenCalledTimes(1));
|
||||
expect(first.mock.calls[0][0].message).toBe('新值校验失败');
|
||||
expect(second.mock.calls[0][0].message).toBe('新值校验失败');
|
||||
expect(third.mock.calls[0][0].message).toBe('新值校验失败');
|
||||
});
|
||||
|
||||
test('并发的多次校验都会拿到结论,不会有调用被漏掉', async () => {
|
||||
registerTypeMatchRule('async-type', async () => '异步校验失败');
|
||||
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), { typeMatch: true } as any);
|
||||
|
||||
const first = vi.fn();
|
||||
const second = vi.fn();
|
||||
validator({}, 'same', first, {}, {});
|
||||
validator({}, 'same', second, {}, {});
|
||||
|
||||
await vi.waitFor(() => {
|
||||
expect(first).toHaveBeenCalledTimes(1);
|
||||
expect(second).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
expect(first.mock.calls[0][0].message).toBe('异步校验失败');
|
||||
expect(second.mock.calls[0][0].message).toBe('异步校验失败');
|
||||
});
|
||||
|
||||
test('结论已作废的旧校验返回后不再执行原始 validator', async () => {
|
||||
const resolvers = registerManualRule();
|
||||
const originalValidator = vi.fn(({ callback }: any) => callback());
|
||||
const validator = createTypeMatchValidator(mForm, propsOf({ type: 'async-type' }), {
|
||||
typeMatch: true,
|
||||
validator: originalValidator,
|
||||
} as any);
|
||||
|
||||
validator({}, 'old', vi.fn(), {}, {});
|
||||
validator({}, 'new', vi.fn(), {}, {});
|
||||
|
||||
// 旧校验的结论已作废,它的 typeMatch 通过后不应再触发一次原始 validator(可能带副作用)
|
||||
resolvers[0](undefined);
|
||||
resolvers[1](undefined);
|
||||
|
||||
await vi.waitFor(() => expect(originalValidator).toHaveBeenCalled());
|
||||
expect(originalValidator).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/schema",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/stage",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -84,8 +84,6 @@ export default class ActionManager extends EventEmitter {
|
||||
private containerHighlightDuration: number;
|
||||
/** 将组件加入容器的操作方式 */
|
||||
private containerHighlightType?: ContainerHighlightType;
|
||||
/** 是否仅在新增组件时才启用将组件加入容器 */
|
||||
private containerHighlightAddOnly = false;
|
||||
private isAltKeydown = false;
|
||||
private getTargetElement: GetTargetElement;
|
||||
private getElementsFromPoint: GetElementsFromPoint;
|
||||
@ -126,7 +124,6 @@ export default class ActionManager extends EventEmitter {
|
||||
this.containerHighlightClassName = config.containerHighlightClassName || CONTAINER_HIGHLIGHT_CLASS_NAME;
|
||||
this.containerHighlightDuration = config.containerHighlightDuration || defaultContainerHighlightDuration;
|
||||
this.containerHighlightType = config.containerHighlightType;
|
||||
this.containerHighlightAddOnly = config.containerHighlightAddOnly ?? false;
|
||||
this.disabledMultiSelect = config.disabledMultiSelect ?? false;
|
||||
this.alwaysMultiSelect = config.alwaysMultiSelect ?? false;
|
||||
this.getTargetElement = config.getTargetElement;
|
||||
@ -431,15 +428,10 @@ export default class ActionManager extends EventEmitter {
|
||||
* 标记的作用:1、高亮容器,给用户一个加入容器的交互感知;2、释放鼠标后,通过标记的标志找到要加入的容器
|
||||
* @param event 鼠标事件
|
||||
* @param excludeElList 计算鼠标所在容器时要排除的元素列表
|
||||
* @param isAdd 当前操作是否为新增组件(从组件列表拖入),开启 containerHighlightAddOnly 时只有新增才会标记
|
||||
* @returns timeoutId,调用方在鼠标移走时要取消该timeout,阻止标记
|
||||
*/
|
||||
public delayedMarkContainer(
|
||||
event: MouseEvent,
|
||||
excludeElList: Element[] = [],
|
||||
isAdd = false,
|
||||
): NodeJS.Timeout | undefined {
|
||||
if (this.canAddToContainer(isAdd)) {
|
||||
public delayedMarkContainer(event: MouseEvent, excludeElList: Element[] = []): NodeJS.Timeout | undefined {
|
||||
if (this.canAddToContainer()) {
|
||||
return globalThis.setTimeout(() => {
|
||||
this.addContainerHighlightClassName(event, excludeElList);
|
||||
}, this.containerHighlightDuration);
|
||||
@ -617,13 +609,9 @@ export default class ActionManager extends EventEmitter {
|
||||
}
|
||||
|
||||
/**
|
||||
* 当前状态下能否将组件加入容器,默认是鼠标悬停一段时间加入,alt模式则是按住alt+鼠标悬停一段时间加入;
|
||||
* 开启containerHighlightAddOnly时,画布中拖动已有组件不能加入容器
|
||||
* @param isAdd 当前操作是否为新增组件
|
||||
* 当前状态下能否将组件加入容器,默认是鼠标悬停一段时间加入,alt模式则是按住alt+鼠标悬停一段时间加入
|
||||
*/
|
||||
private canAddToContainer(isAdd = false): boolean {
|
||||
if (this.containerHighlightAddOnly && !isAdd) return false;
|
||||
|
||||
private canAddToContainer(): boolean {
|
||||
return (
|
||||
this.containerHighlightType === ContainerHighlightType.DEFAULT ||
|
||||
(this.containerHighlightType === ContainerHighlightType.ALT && this.isAltKeydown)
|
||||
@ -636,10 +624,10 @@ export default class ActionManager extends EventEmitter {
|
||||
*/
|
||||
private markContainerEnd(): HTMLElement | null {
|
||||
const doc = this.getRenderDocument();
|
||||
if (!doc) return null;
|
||||
|
||||
const markedContainer = removeClassNameByClassName(doc, this.containerHighlightClassName);
|
||||
return this.canAddToContainer() ? markedContainer : null;
|
||||
if (doc && this.canAddToContainer()) {
|
||||
return removeClassNameByClassName(doc, this.containerHighlightClassName);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private initMouseEvent(): void {
|
||||
|
||||
@ -263,15 +263,10 @@ export default class StageCore extends EventEmitter {
|
||||
* 标记的作用:1、高亮容器,给用户一个加入容器的交互感知;2、释放鼠标后,通过标记的标志找到要加入的容器
|
||||
* @param event 鼠标事件
|
||||
* @param excludeElList 计算鼠标所在容器时要排除的元素列表
|
||||
* @param isAdd 当前操作是否为新增组件(从组件列表拖入),开启 containerHighlightAddOnly 时只有新增才会标记
|
||||
* @returns timeoutId,调用方在鼠标移走时要取消该timeout,阻止标记
|
||||
*/
|
||||
public delayedMarkContainer(
|
||||
event: MouseEvent,
|
||||
excludeElList: Element[] = [],
|
||||
isAdd = false,
|
||||
): NodeJS.Timeout | undefined {
|
||||
return this.actionManager?.delayedMarkContainer(event, excludeElList, isAdd);
|
||||
public delayedMarkContainer(event: MouseEvent, excludeElList: Element[] = []): NodeJS.Timeout | undefined {
|
||||
return this.actionManager?.delayedMarkContainer(event, excludeElList);
|
||||
}
|
||||
|
||||
public getMoveableOption<K extends keyof MoveableOptions>(key: K): MoveableOptions[K] | undefined {
|
||||
@ -373,7 +368,6 @@ export default class StageCore extends EventEmitter {
|
||||
containerHighlightClassName: config.containerHighlightClassName,
|
||||
containerHighlightDuration: config.containerHighlightDuration,
|
||||
containerHighlightType: config.containerHighlightType,
|
||||
containerHighlightAddOnly: config.containerHighlightAddOnly,
|
||||
moveableOptions: config.moveableOptions,
|
||||
container: this.mask!.content,
|
||||
disabledDragStart: config.disabledDragStart,
|
||||
|
||||
@ -53,11 +53,7 @@ export type GetTargetElement = (id: Id) => HTMLElement | null;
|
||||
/** render提供的接口,通过坐标获得坐标下所有HTML元素数组 */
|
||||
export type GetElementsFromPoint = (point: Point) => HTMLElement[];
|
||||
export type GetRenderDocument = () => Document | undefined;
|
||||
export type DelayedMarkContainer = (
|
||||
event: MouseEvent,
|
||||
exclude?: Element[],
|
||||
isAdd?: boolean,
|
||||
) => NodeJS.Timeout | undefined;
|
||||
export type DelayedMarkContainer = (event: MouseEvent, exclude: Element[]) => NodeJS.Timeout | undefined;
|
||||
export type MarkContainerEnd = () => HTMLElement | null;
|
||||
export type GetRootContainer = () => HTMLDivElement | undefined;
|
||||
|
||||
@ -78,11 +74,6 @@ export interface StageCoreConfig {
|
||||
containerHighlightClassName?: string;
|
||||
containerHighlightDuration?: number;
|
||||
containerHighlightType?: ContainerHighlightType;
|
||||
/**
|
||||
* 是否仅在新增组件(从组件列表拖入新组件)时才启用将组件拖入容器,
|
||||
* 开启后在画布中拖动已有组件不会识别容器,默认 false
|
||||
*/
|
||||
containerHighlightAddOnly?: boolean;
|
||||
moveableOptions?: CustomizeMoveableOptions;
|
||||
/** runtime 的HTML地址,可以是一个HTTP地址,如果和编辑器不同域,需要设置跨域,也可以是一个相对或绝对路径 */
|
||||
runtimeUrl?: string;
|
||||
@ -111,8 +102,6 @@ export interface ActionManagerConfig {
|
||||
containerHighlightClassName?: string;
|
||||
containerHighlightDuration?: number;
|
||||
containerHighlightType?: ContainerHighlightType;
|
||||
/** 见 StageCoreConfig.containerHighlightAddOnly */
|
||||
containerHighlightAddOnly?: boolean;
|
||||
moveableOptions?: CustomizeMoveableOptions;
|
||||
disabledDragStart?: boolean;
|
||||
disabledMultiSelect?: boolean;
|
||||
|
||||
@ -275,84 +275,6 @@ describe('ActionManager - 交互与事件', () => {
|
||||
expect(containerEl.classList.contains('tmagic-stage-container-highlight')).toBe(true);
|
||||
});
|
||||
|
||||
test('delayedMarkContainer 未配置 containerHighlightType 时不标记容器', () => {
|
||||
am = new ActionManager(createConfig({ isContainer: async () => true }));
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin())).toBeUndefined();
|
||||
});
|
||||
|
||||
test('delayedMarkContainer alt 模式下需按住 alt 才标记容器', () => {
|
||||
am = new ActionManager(
|
||||
createConfig({
|
||||
containerHighlightType: ContainerHighlightType.ALT,
|
||||
isContainer: async () => true,
|
||||
}),
|
||||
);
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin())).toBeUndefined();
|
||||
(am as any).isAltKeydown = true;
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin())).toBeDefined();
|
||||
});
|
||||
|
||||
test('containerHighlightAddOnly 开启时拖动已有组件不标记容器', () => {
|
||||
const containerEl = globalThis.document.createElement('div');
|
||||
containerEl.dataset.tmagicId = 'container_1';
|
||||
am = new ActionManager(
|
||||
createConfig({
|
||||
containerHighlightType: ContainerHighlightType.DEFAULT,
|
||||
containerHighlightAddOnly: true,
|
||||
getElementsFromPoint: () => [containerEl],
|
||||
isContainer: async () => true,
|
||||
}),
|
||||
);
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin(), [globalThis.document.createElement('div')])).toBeUndefined();
|
||||
vi.advanceTimersByTime(900);
|
||||
expect(containerEl.classList.contains('tmagic-stage-container-highlight')).toBe(false);
|
||||
});
|
||||
|
||||
test('containerHighlightAddOnly 开启时新增组件仍按 containerHighlightType 标记容器', async () => {
|
||||
const containerEl = globalThis.document.createElement('div');
|
||||
containerEl.dataset.tmagicId = 'container_1';
|
||||
am = new ActionManager(
|
||||
createConfig({
|
||||
containerHighlightType: ContainerHighlightType.DEFAULT,
|
||||
containerHighlightAddOnly: true,
|
||||
getElementsFromPoint: () => [containerEl],
|
||||
isContainer: async () => true,
|
||||
}),
|
||||
);
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin(), [], true)).toBeDefined();
|
||||
vi.advanceTimersByTime(900);
|
||||
await Promise.resolve();
|
||||
expect(containerEl.classList.contains('tmagic-stage-container-highlight')).toBe(true);
|
||||
});
|
||||
|
||||
test('containerHighlightAddOnly 开启且 containerHighlightType 为 alt 时新增组件也需按住 alt', () => {
|
||||
am = new ActionManager(
|
||||
createConfig({
|
||||
containerHighlightType: ContainerHighlightType.ALT,
|
||||
containerHighlightAddOnly: true,
|
||||
isContainer: async () => true,
|
||||
}),
|
||||
);
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin(), [], true)).toBeUndefined();
|
||||
(am as any).isAltKeydown = true;
|
||||
expect(am.delayedMarkContainer(mouseAtOrigin(), [], true)).toBeDefined();
|
||||
});
|
||||
|
||||
test('containerHighlightAddOnly 开启时结束标记仍清理高亮但不返回容器', () => {
|
||||
const containerEl = globalThis.document.createElement('div');
|
||||
containerEl.classList.add('tmagic-stage-container-highlight');
|
||||
globalThis.document.body.appendChild(containerEl);
|
||||
am = new ActionManager(
|
||||
createConfig({
|
||||
containerHighlightType: ContainerHighlightType.DEFAULT,
|
||||
containerHighlightAddOnly: true,
|
||||
}),
|
||||
);
|
||||
|
||||
expect((am as any).markContainerEnd()).toBeNull();
|
||||
expect(containerEl.classList.contains('tmagic-stage-container-highlight')).toBe(false);
|
||||
});
|
||||
|
||||
test('updateMoveableOptions / getDragStatus 可调用', () => {
|
||||
am = new ActionManager(createConfig());
|
||||
expect(() => am.updateMoveableOptions()).not.toThrow();
|
||||
|
||||
@ -181,16 +181,6 @@ describe('StageCore', () => {
|
||||
stage.destroy();
|
||||
});
|
||||
|
||||
test('delayedMarkContainer 将新增标识透传给 actionManager', async () => {
|
||||
const { host, stage } = createStage();
|
||||
await stage.mount(host);
|
||||
const spy = vi.spyOn(stage.actionManager!, 'delayedMarkContainer');
|
||||
const event = mouseAtOrigin();
|
||||
stage.delayedMarkContainer(event, [], true);
|
||||
expect(spy).toHaveBeenCalledWith(event, [], true);
|
||||
stage.destroy();
|
||||
});
|
||||
|
||||
test('autoScrollIntoView 选中时调用 mask.observerIntersection', async () => {
|
||||
const host = globalThis.document.createElement('div');
|
||||
globalThis.document.body.appendChild(host);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/table",
|
||||
"type": "module",
|
||||
"sideEffects": [
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
:width="action.subActionConfig?.popoverWidth"
|
||||
:popper-class="action.subActionConfig?.popoverClass"
|
||||
:destroy-on-close="action.subActionConfig?.popoverDestroyOnClose ?? true"
|
||||
@clickoutside="popoverVisible = false"
|
||||
>
|
||||
<template #reference>
|
||||
<TMagicButton
|
||||
@ -85,15 +84,8 @@
|
||||
>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { ref } from 'vue';
|
||||
|
||||
// 所有行共享:同一时间仅允许一个 sub-actions 气泡展开,激活新的会自动关闭上一个
|
||||
const activePopoverId = ref<symbol | null>(null);
|
||||
</script>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { watch } from 'vue';
|
||||
import { ref } from 'vue';
|
||||
import { ArrowDown, ArrowRight } from '@element-plus/icons-vue';
|
||||
import { cloneDeep } from 'lodash-es';
|
||||
|
||||
@ -125,23 +117,7 @@ const props = withDefaults(
|
||||
},
|
||||
);
|
||||
|
||||
const popoverId = Symbol('sub-actions-popover');
|
||||
const popoverVisible = ref(false);
|
||||
|
||||
watch(popoverVisible, (visible) => {
|
||||
if (visible) {
|
||||
activePopoverId.value = popoverId;
|
||||
} else if (activePopoverId.value === popoverId) {
|
||||
activePopoverId.value = null;
|
||||
}
|
||||
});
|
||||
|
||||
watch(activePopoverId, (id) => {
|
||||
if (id !== popoverId && popoverVisible.value) {
|
||||
popoverVisible.value = false;
|
||||
}
|
||||
});
|
||||
|
||||
const togglePopover = () => {
|
||||
popoverVisible.value = !popoverVisible.value;
|
||||
};
|
||||
@ -158,8 +134,7 @@ const actionHandler = async (action: ColumnActionConfig, row: any, index: number
|
||||
} else {
|
||||
await action.handler?.(row, index);
|
||||
}
|
||||
await action.after?.(row, index);
|
||||
popoverVisible.value = false;
|
||||
action.after?.(row, index);
|
||||
};
|
||||
|
||||
const save = async (index: number, config: ColumnConfig) => {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/tdesign-vue-next-adapter",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"name": "@tmagic/utils",
|
||||
"type": "module",
|
||||
"sideEffects": false,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tmagic-playground",
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
@ -12,11 +12,11 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@element-plus/icons-vue": "^2.3.2",
|
||||
"@tmagic/core": "1.8.0-beta.19",
|
||||
"@tmagic/design": "1.8.0-beta.19",
|
||||
"@tmagic/editor": "1.8.0-beta.19",
|
||||
"@tmagic/element-plus-adapter": "1.8.0-beta.19",
|
||||
"@tmagic/tdesign-vue-next-adapter": "1.8.0-beta.19",
|
||||
"@tmagic/core": "1.8.0-beta.14",
|
||||
"@tmagic/design": "1.8.0-beta.14",
|
||||
"@tmagic/editor": "1.8.0-beta.14",
|
||||
"@tmagic/element-plus-adapter": "1.8.0-beta.14",
|
||||
"@tmagic/tdesign-vue-next-adapter": "1.8.0-beta.14",
|
||||
"@tmagic/tmagic-form-runtime": "1.1.3",
|
||||
"element-plus": "^2.14.3",
|
||||
"lodash-es": "^4.17.21",
|
||||
|
||||
228
pnpm-lock.yaml
generated
228
pnpm-lock.yaml
generated
@ -564,23 +564,23 @@ importers:
|
||||
specifier: ^2.3.2
|
||||
version: 2.3.2(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/core':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/design':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/editor':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/element-plus-adapter':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/tdesign-vue-next-adapter':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(tdesign-vue-next@1.17.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(tdesign-vue-next@1.17.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/tmagic-form-runtime':
|
||||
specifier: 1.1.3
|
||||
version: 1.1.3(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/editor@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
version: 1.1.3(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/editor@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
element-plus:
|
||||
specifier: ^2.14.3
|
||||
version: 2.14.3(vue@3.5.40(typescript@6.0.3))
|
||||
@ -920,14 +920,14 @@ importers:
|
||||
runtime/react:
|
||||
dependencies:
|
||||
'@tmagic/core':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/react-runtime-help':
|
||||
specifier: 0.2.2
|
||||
version: 0.2.2(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(lodash-es@4.18.1)(react@18.3.1)(typescript@6.0.3)
|
||||
version: 0.2.2(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(lodash-es@4.18.1)(react@18.3.1)(typescript@6.0.3)
|
||||
'@tmagic/stage':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
axios:
|
||||
specifier: ^1.13.2
|
||||
version: 1.13.2
|
||||
@ -942,8 +942,8 @@ importers:
|
||||
version: 18.3.1(react@18.3.1)
|
||||
devDependencies:
|
||||
'@tmagic/cli':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@types/fs-extra':
|
||||
specifier: ^11.0.4
|
||||
version: 11.0.4
|
||||
@ -1018,14 +1018,14 @@ importers:
|
||||
runtime/vue:
|
||||
dependencies:
|
||||
'@tmagic/core':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/stage':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/vue-runtime-help':
|
||||
specifier: ^2.0.4
|
||||
version: 2.0.4(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
version: 2.0.4(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
axios:
|
||||
specifier: ^1.13.2
|
||||
version: 1.13.2
|
||||
@ -1034,8 +1034,8 @@ importers:
|
||||
version: 3.5.40(typescript@6.0.3)
|
||||
devDependencies:
|
||||
'@tmagic/cli':
|
||||
specifier: 1.8.0-beta.19
|
||||
version: 1.8.0-beta.19(typescript@6.0.3)
|
||||
specifier: 1.8.0-beta.14
|
||||
version: 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@types/fs-extra':
|
||||
specifier: ^11.0.4
|
||||
version: 11.0.4
|
||||
@ -2997,8 +2997,8 @@ packages:
|
||||
'@sxzz/popperjs-es@2.11.8':
|
||||
resolution: {integrity: sha512-wOwESXvvED3S8xBmcPWHs2dUuzrE4XiZeFu7e1hROIJkm02a49N120pmOXxY33sBb6hArItm5W5tcg1cBtV+HQ==}
|
||||
|
||||
'@tmagic/cli@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-bE4HOcfiutLxA8YPG6AEyJm8sm6Is9kTWyOB59rUY0qNwDy1sxe9QcqWrKPNvYqchVVNpsBx3xGNeI2w059QsQ==}
|
||||
'@tmagic/cli@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-y6tTnO+NIi1xYrTDK1b/33ipJmM7jytqCMDcdNOYuG2ng416w+CxWyguAvcCwFPL50pJQereboTVsMDLFnjvBg==}
|
||||
engines: {node: '>=18'}
|
||||
hasBin: true
|
||||
peerDependencies:
|
||||
@ -3025,8 +3025,8 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/core@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-9pDaAlesKrA9Ngs+EOy/lzS3CXgFNT7hBlAKCAR16csGGAkW8wkLBPdsSUotBcOqhAw1+VrsbztU+U8l5K6kEQ==}
|
||||
'@tmagic/core@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-DrUnNGTz+LK4pSCTIkmEvAfvNJglPXd+MLLu79lWJgfjyEmjrJ1rsdw6KprPzn6LkHBL9bKi/ZXGAcxCVs7P6w==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
typescript: ^6.0.3
|
||||
@ -3054,11 +3054,11 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/data-source@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-ysOT1wG5gWUsPZFv77Lc/IShWGyMxNDqPjFTVFFk9yfBc0rd1RMZmuWTMEyGjl1wVEXgPYZ+Exbq1mJxAOoPYQ==}
|
||||
'@tmagic/data-source@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-mpmxcL/tvJx8L7QV3YWz9VM2tEc5WW/9r6JK2Dsv+La6C4wbArZVYoJMhGIxPs4MBCB9VPU+HbOpVLSapwuVaQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19
|
||||
'@tmagic/core': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
@ -3086,12 +3086,12 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/dep@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-DuZACNcHISFBIidTpPCkatTuNu/gzIVZPlIHAnVIsZLYlkkZNGExm/fvNGH6O5LTNZoqNaO4xfAq6O+3W3RreA==}
|
||||
'@tmagic/dep@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-XPdj2XBXNGTSau9cexQsMerV8MxLlnF0KWIOJlhaZKtrtpkmFgdxhB6LksDxB3H5MsHwmev5qMgWQFc0665EWQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/schema': 1.8.0-beta.19
|
||||
'@tmagic/utils': 1.8.0-beta.19
|
||||
'@tmagic/schema': 1.8.0-beta.14
|
||||
'@tmagic/utils': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
@ -3107,8 +3107,8 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/design@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-ctk5+0GPhS5NmQOGUIs5W3MA5cEmVQa1OZvNKwtUj1Jqbe5pF/j4BgnXbg2dpdnkYYe07CVP3GpCv6sbPhxm5A==}
|
||||
'@tmagic/design@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-Ia803Ps59npRlBwMh+HiRMzjbspn6xz0nG1CG5b6785njo4yEQS4fd6yOEuTIJy+25zXb0/Gl5ytc7AOjhl+OA==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
typescript: ^6.0.3
|
||||
@ -3129,11 +3129,11 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/editor@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-cXzSUTqunuGDMNDpYVt3qKOeldmk3hQVW3ykkVG2P/nPNcYYWKraXUsQ8gz6AtIVlt75OsKi1HrFvMSezhGR1w==}
|
||||
'@tmagic/editor@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-AmtB3lA3QVdunNXU6bRd+hWalNf5RiePpsi638foGIaD934mNf+POop5HCWbfuBkU7GDbSElT4cqrvE2EGLK7A==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19
|
||||
'@tmagic/core': 1.8.0-beta.14
|
||||
monaco-editor: '^0.55.1 '
|
||||
type-fest: ^5.2.0
|
||||
typescript: ^6.0.3
|
||||
@ -3144,11 +3144,11 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/element-plus-adapter@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-i3gCJB+qKVIt62hhheiaPLBiFfVbGSXki2G3CFts1kkjlQ9i7VePnkJOMbUZikJbJxk6NJ4GlPohxuot9NB99Q==}
|
||||
'@tmagic/element-plus-adapter@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-MRqnFIyoPA8wfa6fIm4Tie8f3qZjWICq95PZm9GWZMAuOIUNM1GUj86iOZExhte52+xYV4xNC3Rh+gsRntRULQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19
|
||||
'@tmagic/design': 1.8.0-beta.14
|
||||
element-plus: ^2.14.3
|
||||
typescript: ^6.0.3
|
||||
vue: ^3.5.40
|
||||
@ -3165,8 +3165,8 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/form-schema@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-BJi9n2WaMVTlPi1Tjm3O3e3QOANrbztZM6GwHHw/k9LS9cnJx+yhfTO+poF64gNPfS3fEAc80gXf2raiT+olFQ==}
|
||||
'@tmagic/form-schema@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-dVoW9YEb8A1Vcc/xZiM3lzRlhyN8h4rOkX+7Y03ZphYxvQ4x/lIuPkE07sOY8XV6aJJmwEeCDcrO+DY26a/C4Q==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
typescript: ^6.0.3
|
||||
@ -3187,13 +3187,13 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/form@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-uIELcBaNNQoKmJntpU8QOwozVKKKHU8pvwaClLFI3+cIFA2818d6BNIOUqb0fjkahUxyJ85CCa4iPjGy9Qnkjw==}
|
||||
'@tmagic/form@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-OuMn2hTugeu8LmprproMsf4BL58GdpfgBSGdzzTKQUX18CPUZoXKSNMrlAJY2P4ZzJoSk0W8InDMbF/Os+SmKA==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19
|
||||
'@tmagic/form-schema': 1.8.0-beta.19
|
||||
'@tmagic/utils': 1.8.0-beta.19
|
||||
'@tmagic/design': 1.8.0-beta.14
|
||||
'@tmagic/form-schema': 1.8.0-beta.14
|
||||
'@tmagic/utils': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
vue: ^3.5.40
|
||||
peerDependenciesMeta:
|
||||
@ -3235,8 +3235,8 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/schema@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-I30VYTns7KqG8TQVELlEYYB6ghKLMw5uOHk7Lksh7IxbEkNT4gaYLg8uFlOiDx5SOjRxjeI4IRfIoQYBVok3JA==}
|
||||
'@tmagic/schema@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-cjqm0LtXRoaCpqTJxKsPBuQh8RsdRf+EpPstMz7UKHf8DagHDHds/UK3mjDYPj7npKes04E0xw/o5bIsOjYmWQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
typescript: ^6.0.3
|
||||
@ -3264,11 +3264,11 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/stage@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-YEXJVOPtI0m3garxOf/LS/bZpWDj643pvB2FXDSIeXtgg3roy3wnqaJ44Y2s/+ekdwyJ2XencN9BAFov/Zrk2g==}
|
||||
'@tmagic/stage@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-OlDNwlxwV1pZgqyV5ICrbSjrBuqGU20cMagBi0Faq0kSZJ2hDNhhzxXXE1O4lUpZf0hXGl+rKvUjtV+UJ5l+aQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19
|
||||
'@tmagic/core': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
@ -3286,24 +3286,24 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/table@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-4bKUAk3NPUEGfPTCXLW8LQOS8QKXv1UmSuuOTWJMchI2o3f2BhY2VleXS3vcpEnNruvr0EODHQKdidhXWrxCtA==}
|
||||
'@tmagic/table@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-gCRepIj7OgW+8DJP7Gs5MMXiTweYdOFnr+OLP1CxH8Fpt8d0rtT+06e/GkGiwKwlW0Dve+yrPE41MVRNbrBwYQ==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19
|
||||
'@tmagic/form': 1.8.0-beta.19
|
||||
'@tmagic/utils': 1.8.0-beta.19
|
||||
'@tmagic/design': 1.8.0-beta.14
|
||||
'@tmagic/form': 1.8.0-beta.14
|
||||
'@tmagic/utils': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
vue: ^3.5.40
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/tdesign-vue-next-adapter@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-ihCOW/YaSZfnxzvi3uC/kAHTXD2arvjgtBhNW00IN0+2y2xrIaO1k2YRNdMg6PjGwXbjZOEQ7aScbQaTtHcT+g==}
|
||||
'@tmagic/tdesign-vue-next-adapter@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-iKEvhPbPK8+QVWxXHTF6jHrbC433vUAm8cChaaT0zm0KEffw+XSpPpdGP2Xqx0Cmd64oDVW4yPY3ZQn3sbk2xA==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19
|
||||
'@tmagic/design': 1.8.0-beta.14
|
||||
tdesign-vue-next: ^1.17.1
|
||||
typescript: ^6.0.3
|
||||
vue: ^3.5.40
|
||||
@ -3346,11 +3346,11 @@ packages:
|
||||
typescript:
|
||||
optional: true
|
||||
|
||||
'@tmagic/utils@1.8.0-beta.19':
|
||||
resolution: {integrity: sha512-MsjCwnm6uwag2UNrZEDnyeVVYyMYnw4uRFhPwK/uJZ/SZwUnim3Mrz7Ay8oD68adcv69wdKWzatkqQ5ExJT/XA==}
|
||||
'@tmagic/utils@1.8.0-beta.14':
|
||||
resolution: {integrity: sha512-yi5e6pNiSFU0IMc9vBRMBXjHcMrSoosVHCiwvxEHMK0VKJYcV+n408O39UEZIupOtBvl7d6Z91yk1hG0nTk38w==}
|
||||
engines: {node: '>=18'}
|
||||
peerDependencies:
|
||||
'@tmagic/schema': 1.8.0-beta.19
|
||||
'@tmagic/schema': 1.8.0-beta.14
|
||||
typescript: ^6.0.3
|
||||
peerDependenciesMeta:
|
||||
typescript:
|
||||
@ -8737,7 +8737,7 @@ snapshots:
|
||||
|
||||
'@sxzz/popperjs-es@2.11.8': {}
|
||||
|
||||
'@tmagic/cli@1.8.0-beta.19(typescript@6.0.3)':
|
||||
'@tmagic/cli@1.8.0-beta.14(typescript@6.0.3)':
|
||||
dependencies:
|
||||
cac: 6.7.14
|
||||
chokidar: 3.6.0
|
||||
@ -8772,12 +8772,12 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/core@1.8.0-beta.19(typescript@6.0.3)':
|
||||
'@tmagic/core@1.8.0-beta.14(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@tmagic/data-source': 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/dep': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/schema': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/data-source': 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/dep': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/schema': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
events: 3.3.0
|
||||
lodash-es: 4.18.1
|
||||
optionalDependencies:
|
||||
@ -8801,9 +8801,9 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/data-source@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)':
|
||||
'@tmagic/data-source@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
deep-state-observer: 5.5.14
|
||||
events: 3.3.0
|
||||
lodash-es: 4.18.1
|
||||
@ -8824,10 +8824,10 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/dep@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)':
|
||||
'@tmagic/dep@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@tmagic/schema': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/schema': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
@ -8838,7 +8838,7 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@popperjs/core': 2.11.8
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
@ -8872,15 +8872,15 @@ snapshots:
|
||||
- '@tmagic/form-schema'
|
||||
- '@tmagic/schema'
|
||||
|
||||
'@tmagic/editor@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/editor@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/design': 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form': 1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/stage': 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/table': 1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/utils': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/design': 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form': 1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/stage': 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/table': 1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/utils': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
buffer: 6.0.3
|
||||
deep-object-diff: 1.1.9
|
||||
emmet-monaco-es: 5.7.0(monaco-editor@0.55.1)
|
||||
@ -8900,9 +8900,9 @@ snapshots:
|
||||
- '@tmagic/form-schema'
|
||||
- '@tmagic/schema'
|
||||
|
||||
'@tmagic/element-plus-adapter@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/element-plus-adapter@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/design': 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
element-plus: 2.14.3(vue@3.5.40(typescript@6.0.3))
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
@ -8914,9 +8914,9 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3)':
|
||||
'@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@tmagic/schema': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/schema': 1.8.0-beta.14(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
@ -8934,13 +8934,13 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/form@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/form@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.40(typescript@6.0.3))
|
||||
'@popperjs/core': 2.11.8
|
||||
'@tmagic/design': 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form-schema': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/design': 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form-schema': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/utils': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
dayjs: 1.11.21
|
||||
lodash-es: 4.18.1
|
||||
sortablejs: 1.15.6
|
||||
@ -8948,13 +8948,13 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/react-runtime-help@0.2.2(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(lodash-es@4.18.1)(react@18.3.1)(typescript@6.0.3)':
|
||||
'@tmagic/react-runtime-help@0.2.2(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(lodash-es@4.18.1)(react@18.3.1)(typescript@6.0.3)':
|
||||
dependencies:
|
||||
lodash-es: 4.18.1
|
||||
react: 18.3.1
|
||||
optionalDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/stage': 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/stage': 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/schema@1.7.0(typescript@6.0.3)':
|
||||
@ -8965,7 +8965,7 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/schema@1.8.0-beta.19(typescript@6.0.3)':
|
||||
'@tmagic/schema@1.8.0-beta.14(typescript@6.0.3)':
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
@ -8995,10 +8995,10 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/stage@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)':
|
||||
'@tmagic/stage@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@scena/guides': 0.29.2
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@zumer/snapdom': 2.8.0
|
||||
events: 3.3.0
|
||||
keycon: 1.4.0
|
||||
@ -9018,32 +9018,32 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/table@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/table@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@element-plus/icons-vue': 2.3.2(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/design': 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form': 1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/utils': 1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/design': 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/form': 1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/utils': 1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
lodash-es: 4.18.1
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/tdesign-vue-next-adapter@1.8.0-beta.19(@tmagic/design@1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(tdesign-vue-next@1.17.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/tdesign-vue-next-adapter@1.8.0-beta.14(@tmagic/design@1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(tdesign-vue-next@1.17.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@tmagic/design': 1.8.0-beta.19(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/design': 1.8.0-beta.14(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
tdesign-vue-next: 1.17.3(vue@3.5.40(typescript@6.0.3))
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/tmagic-form-runtime@1.1.3(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/editor@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/tmagic-form-runtime@1.1.3(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/editor@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3)))(element-plus@2.14.3(vue@3.5.40(typescript@6.0.3)))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
'@tmagic/editor': 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.19(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
'@tmagic/editor': 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/form-schema@1.8.0-beta.14(typescript@6.0.3))(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(monaco-editor@0.55.1)(type-fest@5.2.0)(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))
|
||||
element-plus: 2.14.3(vue@3.5.40(typescript@6.0.3))
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/utils@1.7.0(@tmagic/schema@1.7.0(typescript@6.0.3))(typescript@6.0.3)':
|
||||
@ -9060,19 +9060,19 @@ snapshots:
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/utils@1.8.0-beta.19(@tmagic/schema@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)':
|
||||
'@tmagic/utils@1.8.0-beta.14(@tmagic/schema@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)':
|
||||
dependencies:
|
||||
'@tmagic/schema': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/schema': 1.8.0-beta.14(typescript@6.0.3)
|
||||
lodash-es: 4.18.1
|
||||
optionalDependencies:
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tmagic/vue-runtime-help@2.0.4(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
'@tmagic/vue-runtime-help@2.0.4(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(@tmagic/stage@1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3))(typescript@6.0.3)(vue@3.5.40(typescript@6.0.3))':
|
||||
dependencies:
|
||||
vue: 3.5.40(typescript@6.0.3)
|
||||
optionalDependencies:
|
||||
'@tmagic/core': 1.8.0-beta.19(typescript@6.0.3)
|
||||
'@tmagic/stage': 1.8.0-beta.19(@tmagic/core@1.8.0-beta.19(typescript@6.0.3))(typescript@6.0.3)
|
||||
'@tmagic/core': 1.8.0-beta.14(typescript@6.0.3)
|
||||
'@tmagic/stage': 1.8.0-beta.14(@tmagic/core@1.8.0-beta.14(typescript@6.0.3))(typescript@6.0.3)
|
||||
typescript: 6.0.3
|
||||
|
||||
'@tybys/wasm-util@0.10.3':
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "runtime-react",
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"engines": {
|
||||
@ -16,16 +16,16 @@
|
||||
"build:playground": "node scripts/build.mjs --type=playground"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tmagic/core": "1.8.0-beta.19",
|
||||
"@tmagic/core": "1.8.0-beta.14",
|
||||
"@tmagic/react-runtime-help": "0.2.2",
|
||||
"@tmagic/stage": "1.8.0-beta.19",
|
||||
"@tmagic/stage": "1.8.0-beta.14",
|
||||
"axios": "^1.13.2",
|
||||
"qrcode": "^1.5.0",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tmagic/cli": "1.8.0-beta.19",
|
||||
"@tmagic/cli": "1.8.0-beta.14",
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@types/react": "^18.3.3",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "runtime-vue",
|
||||
"version": "1.8.0-beta.19",
|
||||
"version": "1.8.0-beta.14",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"engines": {
|
||||
@ -16,14 +16,14 @@
|
||||
"build:playground": "node scripts/build.mjs --type=playground"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tmagic/core": "1.8.0-beta.19",
|
||||
"@tmagic/stage": "1.8.0-beta.19",
|
||||
"@tmagic/core": "1.8.0-beta.14",
|
||||
"@tmagic/stage": "1.8.0-beta.14",
|
||||
"@tmagic/vue-runtime-help": "^2.0.4",
|
||||
"axios": "^1.13.2",
|
||||
"vue": "catalog:"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tmagic/cli": "1.8.0-beta.19",
|
||||
"@tmagic/cli": "1.8.0-beta.14",
|
||||
"@types/fs-extra": "^11.0.4",
|
||||
"@types/node": "^24.0.10",
|
||||
"@vitejs/plugin-legacy": "^8.0.1",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user