@tmagic/editor 1.8.0-beta.0 → 1.8.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/dist/es/Editor.vue_vue_type_script_setup_true_lang.js +11 -2
  2. package/dist/es/components/CodeBlockEditor.vue_vue_type_script_setup_true_lang.js +18 -110
  3. package/dist/es/components/CodeParams.vue_vue_type_script_setup_true_lang.js +6 -0
  4. package/dist/es/components/CompareForm.js +5 -0
  5. package/dist/es/components/CompareForm.vue_vue_type_script_setup_true_lang.js +167 -0
  6. package/dist/es/fields/Code.vue_vue_type_script_setup_true_lang.js +19 -3
  7. package/dist/es/fields/CodeSelect.vue_vue_type_script_setup_true_lang.js +18 -2
  8. package/dist/es/fields/CodeSelectCol.vue_vue_type_script_setup_true_lang.js +37 -6
  9. package/dist/es/fields/DataSourceFieldSelect/FieldSelect.vue_vue_type_script_setup_true_lang.js +3 -1
  10. package/dist/es/fields/DataSourceFieldSelect/Index.vue_vue_type_script_setup_true_lang.js +12 -3
  11. package/dist/es/fields/DataSourceFields.vue_vue_type_script_setup_true_lang.js +14 -6
  12. package/dist/es/fields/DataSourceMethodSelect.vue_vue_type_script_setup_true_name_true_lang.js +3 -1
  13. package/dist/es/fields/DataSourceMethods.vue_vue_type_script_setup_true_lang.js +15 -7
  14. package/dist/es/fields/DataSourceMocks.vue_vue_type_script_setup_true_lang.js +14 -6
  15. package/dist/es/fields/DataSourceSelect.vue_vue_type_script_setup_true_lang.js +3 -1
  16. package/dist/es/fields/EventSelect.vue_vue_type_script_setup_true_lang.js +58 -11
  17. package/dist/es/fields/KeyValue.vue_vue_type_script_setup_true_lang.js +11 -6
  18. package/dist/es/fields/StyleSetter/Index.vue_vue_type_script_setup_true_lang.js +8 -2
  19. package/dist/es/fields/StyleSetter/components/Border.vue_vue_type_script_setup_true_lang.js +10 -2
  20. package/dist/es/fields/StyleSetter/components/Box.vue_vue_type_script_setup_true_lang.js +3 -1
  21. package/dist/es/fields/StyleSetter/pro/Background.vue_vue_type_script_setup_true_lang.js +10 -2
  22. package/dist/es/fields/StyleSetter/pro/Border.vue_vue_type_script_setup_true_lang.js +16 -3
  23. package/dist/es/fields/StyleSetter/pro/Font.vue_vue_type_script_setup_true_lang.js +10 -2
  24. package/dist/es/fields/StyleSetter/pro/Layout.vue_vue_type_script_setup_true_lang.js +14 -2
  25. package/dist/es/fields/StyleSetter/pro/Position.vue_vue_type_script_setup_true_lang.js +10 -2
  26. package/dist/es/fields/StyleSetter/pro/Transform.vue_vue_type_script_setup_true_lang.js +10 -2
  27. package/dist/es/fields/UISelect.vue_vue_type_script_setup_true_lang.js +8 -5
  28. package/dist/es/hooks/use-code-block-edit.js +2 -2
  29. package/dist/es/hooks/use-stage.js +15 -7
  30. package/dist/es/index.js +3 -1
  31. package/dist/es/initService.js +6 -6
  32. package/dist/es/layouts/CodeEditor.vue_vue_type_script_setup_true_lang.js +4 -0
  33. package/dist/es/layouts/Framework.vue_vue_type_script_setup_true_lang.js +12 -7
  34. package/dist/es/layouts/NavMenu.vue_vue_type_script_setup_true_lang.js +8 -0
  35. package/dist/es/layouts/history-list/Bucket.js +5 -0
  36. package/dist/es/layouts/history-list/Bucket.vue_vue_type_script_setup_true_lang.js +84 -0
  37. package/dist/es/layouts/history-list/CodeBlockTab.js +5 -0
  38. package/dist/es/layouts/history-list/CodeBlockTab.vue_vue_type_script_setup_true_lang.js +62 -0
  39. package/dist/es/layouts/history-list/DataSourceTab.js +5 -0
  40. package/dist/es/layouts/history-list/DataSourceTab.vue_vue_type_script_setup_true_lang.js +62 -0
  41. package/dist/es/layouts/history-list/GroupRow.js +5 -0
  42. package/dist/es/layouts/history-list/GroupRow.vue_vue_type_script_setup_true_lang.js +180 -0
  43. package/dist/es/layouts/history-list/HistoryDiffDialog.js +5 -0
  44. package/dist/es/layouts/history-list/HistoryDiffDialog.vue_vue_type_script_setup_true_lang.js +195 -0
  45. package/dist/es/layouts/history-list/HistoryListPanel.js +5 -0
  46. package/dist/es/layouts/history-list/HistoryListPanel.vue_vue_type_script_setup_true_lang.js +270 -0
  47. package/dist/es/layouts/history-list/InitialRow.js +5 -0
  48. package/dist/es/layouts/history-list/InitialRow.vue_vue_type_script_setup_true_lang.js +48 -0
  49. package/dist/es/layouts/history-list/PageTab.js +5 -0
  50. package/dist/es/layouts/history-list/PageTab.vue_vue_type_script_setup_true_lang.js +99 -0
  51. package/dist/es/layouts/history-list/composables.js +154 -0
  52. package/dist/es/layouts/sidebar/layer/use-node-status.js +38 -4
  53. package/dist/es/services/BaseService.js +31 -68
  54. package/dist/es/services/codeBlock.js +205 -8
  55. package/dist/es/services/componentList.js +2 -2
  56. package/dist/es/services/dataSource.js +217 -8
  57. package/dist/es/services/dep.js +21 -9
  58. package/dist/es/services/editor.js +350 -160
  59. package/dist/es/services/events.js +2 -2
  60. package/dist/es/services/history.js +407 -12
  61. package/dist/es/services/keybinding.js +2 -2
  62. package/dist/es/services/props.js +8 -8
  63. package/dist/es/services/stageOverlay.js +2 -2
  64. package/dist/es/services/storage.js +2 -2
  65. package/dist/es/services/ui.js +2 -2
  66. package/dist/es/style.css +347 -1
  67. package/dist/es/utils/code-block.js +122 -0
  68. package/dist/es/utils/content-menu.js +4 -5
  69. package/dist/es/utils/dep/worker.js +1 -1
  70. package/dist/es/utils/editor.js +3 -3
  71. package/dist/es/utils/undo-redo.js +20 -0
  72. package/dist/style.css +347 -1
  73. package/dist/tmagic-editor.umd.cjs +3273 -766
  74. package/package.json +7 -7
  75. package/src/Editor.vue +7 -0
  76. package/src/components/CodeBlockEditor.vue +20 -109
  77. package/src/components/CodeParams.vue +6 -0
  78. package/src/components/CompareForm.vue +225 -0
  79. package/src/editorProps.ts +2 -0
  80. package/src/fields/Code.vue +19 -3
  81. package/src/fields/CodeSelect.vue +17 -1
  82. package/src/fields/CodeSelectCol.vue +30 -2
  83. package/src/fields/DataSourceFieldSelect/FieldSelect.vue +7 -1
  84. package/src/fields/DataSourceFieldSelect/Index.vue +9 -2
  85. package/src/fields/DataSourceFields.vue +12 -3
  86. package/src/fields/DataSourceMethodSelect.vue +4 -1
  87. package/src/fields/DataSourceMethods.vue +14 -4
  88. package/src/fields/DataSourceMocks.vue +13 -3
  89. package/src/fields/DataSourceSelect.vue +4 -1
  90. package/src/fields/EventSelect.vue +57 -8
  91. package/src/fields/KeyValue.vue +17 -4
  92. package/src/fields/StyleSetter/Index.vue +6 -0
  93. package/src/fields/StyleSetter/components/Border.vue +15 -1
  94. package/src/fields/StyleSetter/components/Box.vue +2 -0
  95. package/src/fields/StyleSetter/pro/Background.vue +15 -1
  96. package/src/fields/StyleSetter/pro/Border.vue +24 -2
  97. package/src/fields/StyleSetter/pro/Font.vue +15 -1
  98. package/src/fields/StyleSetter/pro/Layout.vue +17 -1
  99. package/src/fields/StyleSetter/pro/Position.vue +15 -1
  100. package/src/fields/StyleSetter/pro/Transform.vue +15 -1
  101. package/src/fields/UISelect.vue +5 -2
  102. package/src/hooks/use-code-block-edit.ts +5 -2
  103. package/src/hooks/use-stage.ts +23 -7
  104. package/src/index.ts +1 -0
  105. package/src/layouts/CodeEditor.vue +15 -0
  106. package/src/layouts/Framework.vue +10 -5
  107. package/src/layouts/NavMenu.vue +9 -0
  108. package/src/layouts/history-list/Bucket.vue +99 -0
  109. package/src/layouts/history-list/CodeBlockTab.vue +61 -0
  110. package/src/layouts/history-list/DataSourceTab.vue +61 -0
  111. package/src/layouts/history-list/GroupRow.vue +207 -0
  112. package/src/layouts/history-list/HistoryDiffDialog.vue +212 -0
  113. package/src/layouts/history-list/HistoryListPanel.vue +271 -0
  114. package/src/layouts/history-list/InitialRow.vue +41 -0
  115. package/src/layouts/history-list/PageTab.vue +94 -0
  116. package/src/layouts/history-list/composables.ts +195 -0
  117. package/src/layouts/sidebar/layer/use-node-status.ts +64 -12
  118. package/src/services/BaseService.ts +35 -86
  119. package/src/services/codeBlock.ts +256 -5
  120. package/src/services/dataSource.ts +257 -6
  121. package/src/services/dep.ts +32 -9
  122. package/src/services/editor.ts +454 -171
  123. package/src/services/history.ts +452 -8
  124. package/src/services/props.ts +2 -2
  125. package/src/theme/history-list-panel.scss +423 -0
  126. package/src/theme/theme.scss +1 -0
  127. package/src/type.ts +179 -6
  128. package/src/utils/code-block.ts +150 -0
  129. package/src/utils/content-menu.ts +8 -5
  130. package/src/utils/dep/worker.ts +5 -3
  131. package/src/utils/editor.ts +4 -1
  132. package/src/utils/index.ts +1 -0
  133. package/src/utils/undo-redo.ts +23 -0
  134. package/types/index.d.ts +2107 -810
  135. package/dist/es/utils/compose.js +0 -44
  136. package/dist/es/utils/editor-history.js +0 -100
  137. package/src/utils/compose.ts +0 -52
  138. package/src/utils/editor-history.ts +0 -138
@@ -6,7 +6,7 @@
6
6
  </div>
7
7
  <div class="m-fields-ui-select" v-else style="display: flex">
8
8
  <template v-if="val">
9
- <TMagicTooltip content="清除" placement="top">
9
+ <TMagicTooltip v-if="!isCompare" content="清除" placement="top">
10
10
  <TMagicButton
11
11
  style="padding: 0"
12
12
  type="danger"
@@ -32,7 +32,7 @@
32
32
  </TMagicTooltip>
33
33
  </template>
34
34
 
35
- <TMagicTooltip v-else content="点击此处选择" placement="top">
35
+ <TMagicTooltip v-else-if="!isCompare" content="点击此处选择" placement="top">
36
36
  <TMagicButton link style="padding: 0; margin: 0" :disabled="disabled" :size="size" @click="startSelect"
37
37
  >点击此处选择</TMagicButton
38
38
  >
@@ -67,6 +67,9 @@ const mForm = inject<FormState>('mForm');
67
67
  const val = computed(() => props.model[props.name]);
68
68
  const uiSelectMode = ref(false);
69
69
 
70
+ /** 对比模式下隐藏清除/选择等操作按钮,仅保留只读展示。 */
71
+ const isCompare = computed(() => Boolean(mForm?.isCompare));
72
+
70
73
  const cancelHandler = () => {
71
74
  uiService.set('uiSelectMode', false);
72
75
  uiSelectMode.value = false;
@@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash-es';
3
3
 
4
4
  import type { CodeBlockContent } from '@tmagic/core';
5
5
  import { tMagicMessage } from '@tmagic/design';
6
+ import type { ContainerChangeEventData } from '@tmagic/form';
6
7
 
7
8
  import CodeBlockEditor from '@editor/components/CodeBlockEditor.vue';
8
9
  import type { Services } from '@editor/type';
@@ -61,10 +62,12 @@ export const useCodeBlockEdit = (codeBlockService: Services['codeBlockService'])
61
62
  codeBlockService.deleteCodeDslByIds([key]);
62
63
  };
63
64
 
64
- const submitCodeBlockHandler = async (values: CodeBlockContent) => {
65
+ const submitCodeBlockHandler = async (values: CodeBlockContent, eventData?: ContainerChangeEventData) => {
65
66
  if (!codeId.value) return;
66
67
 
67
- await codeBlockService.setCodeDslById(codeId.value, values);
68
+ await codeBlockService.setCodeDslById(codeId.value, values, {
69
+ changeRecords: eventData?.changeRecords,
70
+ });
68
71
 
69
72
  codeBlockEditorRef.value?.hide();
70
73
  };
@@ -97,23 +97,39 @@ export const useStage = (stageOptions: StageOptions) => {
97
97
 
98
98
  stage.on('update', (ev: UpdateEventData) => {
99
99
  if (ev.parentEl) {
100
- for (const data of ev.data) {
101
- const id = getIdFromEl()(data.el);
102
- const pId = getIdFromEl()(ev.parentEl);
103
- id && pId && editorService.moveToContainer({ id, style: data.style }, pId);
100
+ // 拖动多选元素到一个新容器:整批合成一次 moveToContainer,只产生一条历史记录
101
+ const pId = getIdFromEl()(ev.parentEl);
102
+ if (!pId) return;
103
+ const configs = ev.data
104
+ .map((data) => {
105
+ const id = getIdFromEl()(data.el);
106
+ if (!id) return null;
107
+ const cfg: MNode = { id, style: data.style };
108
+ return cfg;
109
+ })
110
+ .filter((cfg): cfg is MNode => Boolean(cfg));
111
+ if (configs.length > 0) {
112
+ editorService.moveToContainer(configs, pId);
104
113
  }
105
114
  return;
106
115
  }
107
116
 
108
- // 为每个元素单独更新,确保 changeRecords 与对应的元素关联
117
+ // 多选拖动 / 多选缩放:所有元素整批走一次 update,避免历史栈被切成 N 条
118
+ // changeRecordList 与 configs 同序,每个节点保留自己的 records;
119
+ // 不能把多个节点的 records 合并到同一个数组里,否则 doUpdate / nodeUpdateHandler 会把别的节点的 propPath 当成自己的。
120
+ const configs: MNode[] = [];
121
+ const changeRecordList: ReturnType<typeof buildChangeRecords>[] = [];
109
122
  ev.data.forEach((data) => {
110
123
  const id = getIdFromEl()(data.el);
111
124
  if (!id) return;
112
125
 
113
126
  const { style = {} } = data;
114
-
115
- editorService.update({ id, style }, { changeRecords: buildChangeRecords(style, 'style') });
127
+ configs.push({ id, style });
128
+ changeRecordList.push(buildChangeRecords(style, 'style'));
116
129
  });
130
+ if (configs.length === 0) return;
131
+
132
+ editorService.update(configs, { changeRecordList });
117
133
  });
118
134
 
119
135
  stage.on('sort', (ev: SortEventData) => {
package/src/index.ts CHANGED
@@ -70,6 +70,7 @@ export { default as LayoutContainer } from './components/SplitView.vue';
70
70
  export { default as SplitView } from './components/SplitView.vue';
71
71
  export { default as Resizer } from './components/Resizer.vue';
72
72
  export { default as CodeBlockEditor } from './components/CodeBlockEditor.vue';
73
+ export { default as CompareForm } from './components/CompareForm.vue';
73
74
  export { default as FloatingBox } from './components/FloatingBox.vue';
74
75
  export { default as Tree } from './components/Tree.vue';
75
76
  export { default as TreeNode } from './components/TreeNode.vue';
@@ -330,6 +330,21 @@ watch(
330
330
  },
331
331
  );
332
332
 
333
+ // diff 模式下,对比的"当前值"(modifiedValues)也可能在外部变化(例如 lastValues 不变、当前 model 变了),
334
+ // 此时同样需要重新设置编辑器值,否则右侧编辑器内容会停留在初始化时的快照。
335
+ watch(
336
+ () => props.modifiedValues,
337
+ (v, preV) => {
338
+ if (props.type !== 'diff') return;
339
+ if (v !== preV) {
340
+ setEditorValue(props.initValues, props.modifiedValues);
341
+ }
342
+ },
343
+ {
344
+ deep: true,
345
+ },
346
+ );
347
+
333
348
  watch(
334
349
  () => props.options,
335
350
  (v) => {
@@ -23,15 +23,15 @@
23
23
  left-class="m-editor-framework-left"
24
24
  center-class="m-editor-framework-center"
25
25
  right-class="m-editor-framework-right"
26
- :left="columnWidth.left"
26
+ :left="hideSidebar ? undefined : columnWidth.left"
27
27
  :right="columnWidth.right"
28
- :min-left="MIN_LEFT_COLUMN_WIDTH"
28
+ :min-left="hideSidebar ? 0 : MIN_LEFT_COLUMN_WIDTH"
29
29
  :min-right="MIN_RIGHT_COLUMN_WIDTH"
30
30
  :min-center="MIN_CENTER_COLUMN_WIDTH"
31
31
  :width="frameworkRect.width"
32
32
  @change="columnWidthChange"
33
33
  >
34
- <template #left>
34
+ <template v-if="!hideSidebar" #left>
35
35
  <slot name="sidebar"></slot>
36
36
  </template>
37
37
 
@@ -94,10 +94,12 @@ defineOptions({
94
94
  name: 'MEditorFramework',
95
95
  });
96
96
 
97
- defineProps<{
97
+ const props = defineProps<{
98
98
  disabledPageFragment: boolean;
99
99
  pageBarSortOptions?: PageBarSortOptions;
100
100
  pageFilterFunction?: (_page: MPage | MPageFragment, _keyword: string) => boolean;
101
+ /** 是否隐藏左侧面板 */
102
+ hideSidebar?: boolean;
101
103
  }>();
102
104
 
103
105
  const codeOptions = inject('codeOptions', {});
@@ -132,7 +134,10 @@ watch(
132
134
  );
133
135
 
134
136
  const columnWidthChange = (columnW: GetColumnWidth) => {
135
- storageService.setItem(LEFT_COLUMN_WIDTH_STORAGE_KEY, columnW.left, { protocol: Protocol.NUMBER });
137
+ // 隐藏左侧面板时 left 恒为 0,不覆盖已持久化的左栏宽度,避免重新展示时丢失宽度
138
+ if (!props.hideSidebar) {
139
+ storageService.setItem(LEFT_COLUMN_WIDTH_STORAGE_KEY, columnW.left, { protocol: Protocol.NUMBER });
140
+ }
136
141
  storageService.setItem(RIGHT_COLUMN_WIDTH_STORAGE_KEY, columnW.right, { protocol: Protocol.NUMBER });
137
142
 
138
143
  uiService.set('columnWidth', columnW);
@@ -19,6 +19,7 @@ import { NodeType } from '@tmagic/core';
19
19
  import { useServices } from '@editor/hooks/use-services';
20
20
  import { ColumnLayout, MenuBarData, MenuButton, MenuComponent, MenuItem } from '@editor/type';
21
21
 
22
+ import HistoryListPanel from './history-list/HistoryListPanel.vue';
22
23
  import NavMenuColumn from './NavMenuColumn.vue';
23
24
 
24
25
  defineOptions({
@@ -103,6 +104,14 @@ const getConfig = (item: MenuItem): (MenuButton | MenuComponent)[] => {
103
104
  handler: () => editorService.redo(),
104
105
  });
105
106
  break;
107
+ case 'history-list':
108
+ // 历史记录面板:以 component 形式挂入,自带 popover;点击 nav 上的图标弹出。
109
+ config.push({
110
+ type: 'component',
111
+ className: 'history-list',
112
+ component: markRaw(HistoryListPanel),
113
+ });
114
+ break;
106
115
  case 'zoom-in':
107
116
  config.push({
108
117
  type: 'button',
@@ -0,0 +1,99 @@
1
+ <template>
2
+ <div class="m-editor-history-list-bucket">
3
+ <div class="m-editor-history-list-bucket-title">
4
+ <span>{{ title }}</span>
5
+ <code>{{ String(bucketId) }}</code>
6
+ <span class="m-editor-history-list-bucket-count">{{ groups.length }} 组</span>
7
+ </div>
8
+
9
+ <ul class="m-editor-history-list-ul">
10
+ <GroupRow
11
+ v-for="(group, gIdx) in groups"
12
+ :key="`${prefix}-${bucketId}-${gIdx}`"
13
+ :group-key="`${prefix}-${bucketId}-${gIdx}`"
14
+ :applied="group.applied"
15
+ :merged="group.steps.length > 1"
16
+ :op-type="group.opType"
17
+ :desc="describeGroup(group)"
18
+ :step-count="group.steps.length"
19
+ :sub-steps="
20
+ group.steps.map((s: any) => ({
21
+ index: s.index,
22
+ applied: s.applied,
23
+ isCurrent: s.isCurrent,
24
+ desc: describeStep(s.step),
25
+ diffable: isStepDiffable ? isStepDiffable(s.step) : false,
26
+ revertable: s.applied,
27
+ }))
28
+ "
29
+ :is-current="group.isCurrent"
30
+ :expanded="!!expanded[`${prefix}-${bucketId}-${gIdx}`]"
31
+ @toggle="(key: string) => $emit('toggle', key)"
32
+ @goto="(index: number) => $emit('goto', bucketId, index)"
33
+ @diff-step="(index: number) => $emit('diff-step', bucketId, index)"
34
+ @revert-step="(index: number) => $emit('revert-step', bucketId, index)"
35
+ />
36
+ <!--
37
+ 初始状态项:永远位于该 bucket 列表底部(同样按倒序展示,最底部 = 最早状态)。
38
+ 当 bucket 内所有 group 都未 applied 时即为当前位置。
39
+ -->
40
+ <InitialRow :is-current="isInitial" @goto-initial="$emit('goto-initial', bucketId)" />
41
+ </ul>
42
+ </div>
43
+ </template>
44
+
45
+ <script lang="ts" setup>
46
+ import { computed } from 'vue';
47
+
48
+ import type { HistoryOpType } from '@editor/type';
49
+
50
+ import GroupRow from './GroupRow.vue';
51
+ import InitialRow from './InitialRow.vue';
52
+
53
+ defineOptions({
54
+ name: 'MEditorHistoryListBucket',
55
+ });
56
+
57
+ const props = defineProps<{
58
+ /** Bucket 标题,例如 "数据源" / "代码块",渲染在 bucket 头部。 */
59
+ title: string;
60
+ /** 当前 bucket 对应的目标 id(dataSource.id 或 codeBlock.id),同时用于组装子项的 key。 */
61
+ bucketId: string | number;
62
+ /** 子项 key 的命名空间前缀:`ds` 表示数据源,`cb` 表示代码块。与上层折叠状态 key 保持一致。 */
63
+ prefix: 'ds' | 'cb';
64
+ /** 当前 bucket 下的所有历史分组,按时间倒序展示(最近的操作在前)。 */
65
+ groups: {
66
+ applied: boolean;
67
+ isCurrent?: boolean;
68
+ opType: HistoryOpType;
69
+ steps: { index: number; applied: boolean; isCurrent?: boolean; step: any }[];
70
+ }[];
71
+ /** 组级描述文案生成器,接收一个 group,返回展示文本。由父组件按业务类型注入。 */
72
+ describeGroup: (_group: any) => string;
73
+ /** 单步描述文案生成器,接收一个 step,返回展示文本。用于合并组展开后的子步列表。 */
74
+ describeStep: (_step: any) => string;
75
+ /** 判断某个 step 是否可查看差异(前后值都存在)。由父组件按业务类型注入;不传则一律不展示差异入口。 */
76
+ isStepDiffable?: (_step: any) => boolean;
77
+ /** 共享的折叠状态表(key -> 是否展开),由顶层 panel 统一维护以便跨 tab 复用。 */
78
+ expanded: Record<string, boolean>;
79
+ }>();
80
+
81
+ defineEmits<{
82
+ /** 透传子组件 GroupRow 的 toggle,由上层 panel 更新 expanded。 */
83
+ (_e: 'toggle', _key: string): void;
84
+ /**
85
+ * 透传子组件 GroupRow 的 goto,并附带当前 bucket 对应的 id(dataSourceId / codeBlockId),
86
+ * 上层据此调用对应 service.goto(id, targetCursor)。
87
+ */
88
+ (_e: 'goto', _bucketId: string | number, _index: number): void;
89
+ /** 用户点击初始项希望该 bucket 回到未修改状态;携带 bucketId 用于上层路由到正确的 service。 */
90
+ (_e: 'goto-initial', _bucketId: string | number): void;
91
+ /** 用户点击"查看差异",携带 bucketId 与 step 索引。 */
92
+ (_e: 'diff-step', _bucketId: string | number, _index: number): void;
93
+ /** 用户点击"回滚"按钮,携带 bucketId 与 step 索引,类 git revert。 */
94
+ (_e: 'revert-step', _bucketId: string | number, _index: number): void;
95
+ }>();
96
+
97
+ /** 该 bucket 是否处于初始状态(栈 cursor=0),等价于全部 group 都未 applied。 */
98
+ const isInitial = computed(() => props.groups.length > 0 && props.groups.every((g) => !g.applied));
99
+ </script>
@@ -0,0 +1,61 @@
1
+ <template>
2
+ <div v-if="!buckets.length" class="m-editor-history-list-empty">暂无操作记录</div>
3
+ <TMagicScrollbar v-else max-height="360px">
4
+ <Bucket
5
+ v-for="bucket in buckets"
6
+ :key="`cb-${bucket.id}`"
7
+ title="代码块"
8
+ :bucket-id="bucket.id"
9
+ prefix="cb"
10
+ :groups="bucket.groups"
11
+ :describe-group="describeCodeBlockGroup"
12
+ :describe-step="describeCodeBlockStep"
13
+ :is-step-diffable="isCodeBlockStepDiffable"
14
+ :expanded="expanded"
15
+ @toggle="(key: string) => $emit('toggle', key)"
16
+ @goto="(id: string | number, index: number) => $emit('goto', id, index)"
17
+ @goto-initial="(id: string | number) => $emit('goto-initial', id)"
18
+ @diff-step="(id: string | number, index: number) => $emit('diff-step', id, index)"
19
+ @revert-step="(id: string | number, index: number) => $emit('revert-step', id, index)"
20
+ />
21
+ </TMagicScrollbar>
22
+ </template>
23
+
24
+ <script lang="ts" setup>
25
+ import { TMagicScrollbar } from '@tmagic/design';
26
+
27
+ import type { CodeBlockHistoryGroup, CodeBlockStepValue } from '@editor/type';
28
+
29
+ import Bucket from './Bucket.vue';
30
+ import { describeCodeBlockGroup, describeCodeBlockStep } from './composables';
31
+
32
+ defineOptions({
33
+ name: 'MEditorHistoryListCodeBlockTab',
34
+ });
35
+
36
+ defineProps<{
37
+ /**
38
+ * 已按 codeBlock.id 聚拢成的 bucket 列表,每个 bucket 内部的 groups 已按时间倒序排好。
39
+ * 空数组时显示空态。
40
+ */
41
+ buckets: { id: string | number; groups: CodeBlockHistoryGroup[] }[];
42
+ /** 共享的折叠状态表(key -> 是否展开),由顶层 panel 统一维护。本 tab 使用 `cb-${id}-${idx}` 作为 key。 */
43
+ expanded: Record<string, boolean>;
44
+ }>();
45
+
46
+ defineEmits<{
47
+ /** 透传子组件 Bucket 的 toggle 事件给上层 panel,由其更新 expanded。 */
48
+ (_e: 'toggle', _key: string): void;
49
+ /** 透传 Bucket 的 goto 事件,携带 codeBlock id 与目标 step 索引。 */
50
+ (_e: 'goto', _codeBlockId: string | number, _index: number): void;
51
+ /** 透传 Bucket 的 goto-initial 事件,携带 codeBlock id(回到该代码块未修改时的状态)。 */
52
+ (_e: 'goto-initial', _codeBlockId: string | number): void;
53
+ /** 透传 Bucket 的 diff-step 事件,携带 codeBlock id 与 step 索引。 */
54
+ (_e: 'diff-step', _codeBlockId: string | number, _index: number): void;
55
+ /** 透传 Bucket 的 revert-step 事件,携带 codeBlock id 与 step 索引(类 git revert)。 */
56
+ (_e: 'revert-step', _codeBlockId: string | number, _index: number): void;
57
+ }>();
58
+
59
+ /** 仅 update(前后 content 都存在)时可查看差异。 */
60
+ const isCodeBlockStepDiffable = (step: CodeBlockStepValue) => Boolean(step.oldContent && step.newContent);
61
+ </script>
@@ -0,0 +1,61 @@
1
+ <template>
2
+ <div v-if="!buckets.length" class="m-editor-history-list-empty">暂无操作记录</div>
3
+ <TMagicScrollbar v-else max-height="360px">
4
+ <Bucket
5
+ v-for="bucket in buckets"
6
+ :key="`ds-${bucket.id}`"
7
+ title="数据源"
8
+ :bucket-id="bucket.id"
9
+ prefix="ds"
10
+ :groups="bucket.groups"
11
+ :describe-group="describeDataSourceGroup"
12
+ :describe-step="describeDataSourceStep"
13
+ :is-step-diffable="isDataSourceStepDiffable"
14
+ :expanded="expanded"
15
+ @toggle="(key: string) => $emit('toggle', key)"
16
+ @goto="(id: string | number, index: number) => $emit('goto', id, index)"
17
+ @goto-initial="(id: string | number) => $emit('goto-initial', id)"
18
+ @diff-step="(id: string | number, index: number) => $emit('diff-step', id, index)"
19
+ @revert-step="(id: string | number, index: number) => $emit('revert-step', id, index)"
20
+ />
21
+ </TMagicScrollbar>
22
+ </template>
23
+
24
+ <script lang="ts" setup>
25
+ import { TMagicScrollbar } from '@tmagic/design';
26
+
27
+ import type { DataSourceHistoryGroup, DataSourceStepValue } from '@editor/type';
28
+
29
+ import Bucket from './Bucket.vue';
30
+ import { describeDataSourceGroup, describeDataSourceStep } from './composables';
31
+
32
+ defineOptions({
33
+ name: 'MEditorHistoryListDataSourceTab',
34
+ });
35
+
36
+ defineProps<{
37
+ /**
38
+ * 已按 dataSource.id 聚拢成的 bucket 列表,每个 bucket 内部的 groups 已按时间倒序排好。
39
+ * 空数组时显示空态。
40
+ */
41
+ buckets: { id: string | number; groups: DataSourceHistoryGroup[] }[];
42
+ /** 共享的折叠状态表(key -> 是否展开),由顶层 panel 统一维护。本 tab 使用 `ds-${id}-${idx}` 作为 key。 */
43
+ expanded: Record<string, boolean>;
44
+ }>();
45
+
46
+ defineEmits<{
47
+ /** 透传子组件 Bucket 的 toggle 事件给上层 panel,由其更新 expanded。 */
48
+ (_e: 'toggle', _key: string): void;
49
+ /** 透传 Bucket 的 goto 事件,携带 dataSource id 与目标 step 索引。 */
50
+ (_e: 'goto', _dataSourceId: string | number, _index: number): void;
51
+ /** 透传 Bucket 的 goto-initial 事件,携带 dataSource id(回到该数据源未修改时的状态)。 */
52
+ (_e: 'goto-initial', _dataSourceId: string | number): void;
53
+ /** 透传 Bucket 的 diff-step 事件,携带 dataSource id 与 step 索引。 */
54
+ (_e: 'diff-step', _dataSourceId: string | number, _index: number): void;
55
+ /** 透传 Bucket 的 revert-step 事件,携带 dataSource id 与 step 索引(类 git revert)。 */
56
+ (_e: 'revert-step', _dataSourceId: string | number, _index: number): void;
57
+ }>();
58
+
59
+ /** 仅 update(前后 schema 都存在)时可查看差异。 */
60
+ const isDataSourceStepDiffable = (step: DataSourceStepValue) => Boolean(step.oldSchema && step.newSchema);
61
+ </script>
@@ -0,0 +1,207 @@
1
+ <template>
2
+ <li
3
+ class="m-editor-history-list-item m-editor-history-list-group"
4
+ :class="{ 'is-undone': !applied, 'is-merged': merged, 'is-current': isCurrent }"
5
+ >
6
+ <div
7
+ class="m-editor-history-list-group-head"
8
+ :class="{ 'is-clickable': isHeadClickable }"
9
+ :title="headTitle"
10
+ @click="onHeadClick"
11
+ >
12
+ <span class="m-editor-history-list-item-index" :title="headIndexTitle">{{ headIndexLabel }}</span>
13
+ <span class="m-editor-history-list-item-op" :class="`op-${opType}`">{{ opLabel(opType) }}</span>
14
+ <span class="m-editor-history-list-item-desc">{{ desc }}</span>
15
+ <span v-if="isCurrent" class="m-editor-history-list-item-current">当前</span>
16
+ <span
17
+ v-if="!merged && headDiffable"
18
+ class="m-editor-history-list-item-diff"
19
+ title="查看修改差异"
20
+ @click.stop="onDiffClick(subSteps[0].index)"
21
+ >查看差异</span
22
+ >
23
+ <span v-if="merged" class="m-editor-history-list-item-merge">合并 {{ stepCount }} 步</span>
24
+ <span
25
+ v-if="!merged && headRevertable"
26
+ class="m-editor-history-list-item-revert"
27
+ title="将该步骤的修改作为一次新操作反向应用(不影响后续历史)"
28
+ @click.stop="onRevertClick(subSteps[0].index)"
29
+ >回滚</span
30
+ >
31
+ <span v-if="merged" class="m-editor-history-list-group-toggle" :class="{ 'is-expanded': expanded }">▾</span>
32
+ </div>
33
+
34
+ <ul v-if="merged && expanded" class="m-editor-history-list-substeps">
35
+ <li
36
+ v-for="s in subStepsDisplay"
37
+ :key="s.index"
38
+ :class="{ 'is-undone': !s.applied, 'is-current': s.isCurrent, 'is-clickable': !s.isCurrent }"
39
+ :title="s.isCurrent ? '当前所在记录' : '点击跳转到该记录'"
40
+ @click="onSubStepClick(s)"
41
+ >
42
+ <span class="m-editor-history-list-item-index">#{{ s.index + 1 }}</span>
43
+ <span class="m-editor-history-list-substep-desc">{{ s.desc }}</span>
44
+ <span v-if="s.isCurrent" class="m-editor-history-list-item-current">当前</span>
45
+ <span
46
+ v-if="s.diffable"
47
+ class="m-editor-history-list-item-diff"
48
+ title="查看修改差异"
49
+ @click.stop="onDiffClick(s.index)"
50
+ >查看差异</span
51
+ >
52
+ <span
53
+ v-if="s.revertable"
54
+ class="m-editor-history-list-item-revert"
55
+ title="将该步骤的修改作为一次新操作反向应用(不影响后续历史)"
56
+ @click.stop="onRevertClick(s.index)"
57
+ >回滚</span
58
+ >
59
+ </li>
60
+ </ul>
61
+ </li>
62
+ </template>
63
+
64
+ <script lang="ts" setup>
65
+ import { computed } from 'vue';
66
+
67
+ import type { HistoryOpType } from '@editor/type';
68
+
69
+ import { opLabel } from './composables';
70
+
71
+ defineOptions({
72
+ name: 'MEditorHistoryListGroupRow',
73
+ });
74
+
75
+ const props = defineProps<{
76
+ /** 唯一标识当前组的 key,作为 toggle 事件的 payload 回传给上层。形如 `pg-${idx}` / `ds-${id}-${idx}` / `cb-${id}-${idx}`。 */
77
+ groupKey: string;
78
+ /** 该组当前是否处于已应用状态(false 表示已被 undo 撤销,UI 会显示为灰态)。 */
79
+ applied: boolean;
80
+ /** 是否为合并组(即组内 step 数大于 1,由多次连续操作合并而来)。决定是否展示合并标记与可展开的子步列表。 */
81
+ merged: boolean;
82
+ /** 操作类型:`add` / `remove` / `update`,用于决定操作徽标的颜色和文案。 */
83
+ opType: HistoryOpType;
84
+ /** 组的整体描述文案,由上层根据 step / group 计算后传入,例如 "修改 button · style.color"。 */
85
+ desc: string;
86
+ /** 组内的 step 总数,仅在 merged 为 true 时显示为 "合并 N 步"。 */
87
+ stepCount: number;
88
+ /** 子步列表,用于在展开状态下逐条展示每个 step 的索引、应用状态与描述文案。 */
89
+ subSteps: {
90
+ index: number;
91
+ applied: boolean;
92
+ desc: string;
93
+ isCurrent?: boolean;
94
+ diffable?: boolean;
95
+ /** 是否可对该子步执行「回滚」(已应用 + 业务侧确认支持反向)。父级根据 step 与 applied 决定。 */
96
+ revertable?: boolean;
97
+ }[];
98
+ /** 当前组是否处于展开状态。仅在 merged 为 true 时生效,控制子步列表是否渲染。 */
99
+ expanded: boolean;
100
+ /** 是否为当前所在的分组(包含栈中最近一次已应用步骤的那一组),UI 高亮展示。 */
101
+ isCurrent?: boolean;
102
+ }>();
103
+
104
+ const emit = defineEmits<{
105
+ /**
106
+ * 用户点击合并组头部时触发,携带 groupKey;上层用其切换 expanded 状态。
107
+ * 对单步组(非合并)头部点击不会发该事件——因为单步组没有"展开"的概念。
108
+ */
109
+ (_e: 'toggle', _key: string): void;
110
+ /**
111
+ * 用户希望跳转到该记录时触发,携带"目标 step 在所属栈中的索引"——上层据此计算目标 cursor (= index + 1)。
112
+ * 触发场景:
113
+ * - 单步组(merged=false)头部:取该唯一 step 的 index;
114
+ * - 子步条目:取该子步的 index。
115
+ * 合并组头部不再触发 goto,避免与展开/收起冲突;用户应展开后点具体子步精准跳转。
116
+ * 当前所在的步骤(isCurrent)始终不会触发 goto。
117
+ */
118
+ (_e: 'goto', _index: number): void;
119
+ /**
120
+ * 用户希望查看该 step 的修改差异(旧值 vs 新值)。
121
+ * 只在 step 满足"前后值都存在"(如 update / 数据源、代码块的 update)时由父级标记 `diffable=true`。
122
+ * payload 为该 step 在所属栈中的索引,由上层根据 index 取 step 内容并展示对比。
123
+ */
124
+ (_e: 'diff-step', _index: number): void;
125
+ /**
126
+ * 用户希望「回滚」该 step——把它的修改作为一次新操作反向应用(类 git revert)。
127
+ * payload 为该 step 在所属栈中的索引。仅在单步组头部(headRevertable)或合并组的可回滚子步上触发。
128
+ */
129
+ (_e: 'revert-step', _index: number): void;
130
+ }>();
131
+
132
+ /** 单步组:头部可点击 goto;合并组:头部可点击切换展开。当前组(isCurrent)的单步组头部不可点击。 */
133
+ const isHeadClickable = computed(() => {
134
+ if (props.merged) return true;
135
+ return !props.isCurrent;
136
+ });
137
+
138
+ const headTitle = computed(() => {
139
+ if (props.merged) return props.expanded ? '点击收起子步' : '点击展开子步';
140
+ if (props.isCurrent) return '当前所在记录';
141
+ return '点击跳转到该记录';
142
+ });
143
+
144
+ /**
145
+ * 头部点击行为分流:
146
+ * - 合并组:仅切换展开 / 收起,不触发 goto;
147
+ * - 单步组:跳转到该唯一步骤;当前组忽略点击。
148
+ */
149
+ const onHeadClick = () => {
150
+ if (props.merged) {
151
+ emit('toggle', props.groupKey);
152
+ return;
153
+ }
154
+ if (props.isCurrent) return;
155
+ if (!props.subSteps.length) return;
156
+ emit('goto', props.subSteps[0].index);
157
+ };
158
+
159
+ const onSubStepClick = (s: { index: number; isCurrent?: boolean }) => {
160
+ if (s.isCurrent) return;
161
+ emit('goto', s.index);
162
+ };
163
+
164
+ /** 单步组头部是否展示"查看差异"入口:要求该唯一子步本身可对比。 */
165
+ const headDiffable = computed(() => !props.merged && Boolean(props.subSteps[0]?.diffable));
166
+
167
+ /** 单步组头部是否展示"回滚"入口:要求该唯一子步本身可回滚(已应用)。 */
168
+ const headRevertable = computed(() => !props.merged && Boolean(props.subSteps[0]?.revertable));
169
+
170
+ /**
171
+ * 合并组展开后的子步渲染顺序:与外层分组列表保持一致——倒序展示(最新的子步在最上方)。
172
+ * 外层 page tab / bucket 都已对 groups 做了 reverse,子步沿用同样的视觉规则更直观。
173
+ * 注意:仅用于渲染,原 `subSteps` 保持时间正序,`headIndexLabel` 等基于首尾索引的展示语义不变。
174
+ */
175
+ const subStepsDisplay = computed(() => props.subSteps.slice().reverse());
176
+
177
+ /**
178
+ * 头部索引展示:
179
+ * - 单步组(merged=false):显示该唯一 step 的编号,如 `#5`;
180
+ * - 合并组:显示组内 step 的编号范围,如 `#3-#7`(首尾相同则退化为 `#5`)。
181
+ *
182
+ * 这里展示的是 step.index + 1(与子步列表 `#{{ s.index + 1 }}` 保持一致),从 1 起编号更符合直觉。
183
+ */
184
+ const headIndexLabel = computed(() => {
185
+ const list = props.subSteps;
186
+ if (!list.length) return '';
187
+ const first = list[0].index + 1;
188
+ const last = list[list.length - 1].index + 1;
189
+ if (!props.merged || first === last) return `#${first}`;
190
+ return `#${first}-#${last}`;
191
+ });
192
+
193
+ const headIndexTitle = computed(() => {
194
+ if (!props.merged) return `历史步骤编号 #${props.subSteps[0]?.index + 1}`;
195
+ return `合并了第 ${props.subSteps[0]?.index + 1} 至第 ${
196
+ props.subSteps[props.subSteps.length - 1]?.index + 1
197
+ } 共 ${props.subSteps.length} 条历史步骤`;
198
+ });
199
+
200
+ const onDiffClick = (index: number) => {
201
+ emit('diff-step', index);
202
+ };
203
+
204
+ const onRevertClick = (index: number) => {
205
+ emit('revert-step', index);
206
+ };
207
+ </script>