@tmagic/editor 1.8.0-beta.4 → 1.8.0-beta.5

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 (57) hide show
  1. package/dist/es/components/CompareForm.vue_vue_type_script_setup_true_lang.js +1 -1
  2. package/dist/es/components/ToolButton.vue_vue_type_script_setup_true_lang.js +6 -6
  3. package/dist/es/index.js +6 -3
  4. package/dist/es/initService.js +1 -1
  5. package/dist/es/layouts/Framework.vue_vue_type_script_setup_true_lang.js +1 -1
  6. package/dist/es/layouts/history-list/Bucket.vue_vue_type_script_setup_true_lang.js +19 -55
  7. package/dist/es/layouts/history-list/BucketTab.vue_vue_type_script_setup_true_lang.js +22 -39
  8. package/dist/es/layouts/history-list/GroupRow.vue_vue_type_script_setup_true_lang.js +149 -103
  9. package/dist/es/layouts/history-list/HistoryDiffDialog.vue_vue_type_script_setup_true_lang.js +32 -8
  10. package/dist/es/layouts/history-list/HistoryListPanel.vue_vue_type_script_setup_true_lang.js +333 -211
  11. package/dist/es/layouts/history-list/InitialRow.vue_vue_type_script_setup_true_lang.js +28 -7
  12. package/dist/es/layouts/history-list/PageTab.vue_vue_type_script_setup_true_lang.js +47 -60
  13. package/dist/es/layouts/history-list/composables.js +73 -32
  14. package/dist/es/layouts/page-bar/PageBar.vue_vue_type_script_setup_true_lang.js +4 -2
  15. package/dist/es/layouts/sidebar/Sidebar.vue_vue_type_script_setup_true_lang.js +5 -1
  16. package/dist/es/services/codeBlock.js +85 -37
  17. package/dist/es/services/dataSource.js +62 -26
  18. package/dist/es/services/editor.js +243 -100
  19. package/dist/es/services/history.js +270 -206
  20. package/dist/es/services/ui.js +3 -0
  21. package/dist/es/style.css +49 -6
  22. package/dist/es/utils/editor.js +35 -1
  23. package/dist/es/utils/history.js +223 -0
  24. package/dist/es/utils/indexed-db.js +86 -0
  25. package/dist/es/utils/undo-redo.js +60 -1
  26. package/dist/style.css +49 -6
  27. package/dist/tmagic-editor.umd.cjs +1799 -905
  28. package/package.json +7 -7
  29. package/src/components/CompareForm.vue +3 -1
  30. package/src/components/ToolButton.vue +2 -2
  31. package/src/index.ts +1 -0
  32. package/src/initService.ts +1 -1
  33. package/src/layouts/Framework.vue +1 -1
  34. package/src/layouts/history-list/Bucket.vue +34 -71
  35. package/src/layouts/history-list/BucketTab.vue +46 -54
  36. package/src/layouts/history-list/GroupRow.vue +146 -111
  37. package/src/layouts/history-list/HistoryDiffDialog.vue +94 -68
  38. package/src/layouts/history-list/HistoryListPanel.vue +296 -113
  39. package/src/layouts/history-list/InitialRow.vue +25 -9
  40. package/src/layouts/history-list/PageTab.vue +57 -51
  41. package/src/layouts/history-list/composables.ts +157 -36
  42. package/src/layouts/page-bar/PageBar.vue +4 -2
  43. package/src/layouts/sidebar/Sidebar.vue +6 -1
  44. package/src/services/codeBlock.ts +107 -37
  45. package/src/services/dataSource.ts +89 -40
  46. package/src/services/editor.ts +370 -134
  47. package/src/services/history.ts +305 -203
  48. package/src/services/ui.ts +7 -0
  49. package/src/theme/history-list-panel.scss +72 -5
  50. package/src/theme/page-bar.scss +0 -4
  51. package/src/type.ts +167 -63
  52. package/src/utils/editor.ts +41 -1
  53. package/src/utils/history.ts +298 -0
  54. package/src/utils/index.ts +2 -0
  55. package/src/utils/indexed-db.ts +122 -0
  56. package/src/utils/undo-redo.ts +88 -0
  57. package/types/index.d.ts +783 -291
@@ -4,109 +4,147 @@ import { Fragment, computed, createCommentVNode, createElementBlock, createEleme
4
4
  var _hoisted_1 = ["title"];
5
5
  var _hoisted_2 = ["title"];
6
6
  var _hoisted_3 = { class: "m-editor-history-list-item-desc" };
7
- var _hoisted_4 = ["title"];
8
- var _hoisted_5 = ["title"];
9
- var _hoisted_6 = {
10
- key: 2,
7
+ var _hoisted_4 = {
8
+ key: 0,
9
+ class: "m-editor-history-list-item-saved",
10
+ title: "该记录为最近一次保存的状态"
11
+ };
12
+ var _hoisted_5 = {
13
+ key: 1,
14
+ class: "m-editor-history-list-item-actions"
15
+ };
16
+ var _hoisted_6 = ["title"];
17
+ var _hoisted_7 = ["title"];
18
+ var _hoisted_8 = {
19
+ key: 4,
11
20
  class: "m-editor-history-list-item-merge"
12
21
  };
13
- var _hoisted_7 = {
22
+ var _hoisted_9 = {
14
23
  key: 0,
15
24
  class: "m-editor-history-list-substeps"
16
25
  };
17
- var _hoisted_8 = ["title"];
18
- var _hoisted_9 = { class: "m-editor-history-list-item-index" };
19
- var _hoisted_10 = { class: "m-editor-history-list-substep-desc" };
20
- var _hoisted_11 = ["title"];
21
- var _hoisted_12 = ["title"];
22
- var _hoisted_13 = ["onClick"];
23
- var _hoisted_14 = ["onClick"];
26
+ var _hoisted_10 = ["title", "onClick"];
27
+ var _hoisted_11 = { class: "m-editor-history-list-item-index" };
28
+ var _hoisted_12 = { class: "m-editor-history-list-substep-desc" };
29
+ var _hoisted_13 = {
30
+ key: 0,
31
+ class: "m-editor-history-list-item-saved",
32
+ title: "该记录为最近一次保存的状态"
33
+ };
34
+ var _hoisted_14 = {
35
+ key: 1,
36
+ class: "m-editor-history-list-item-actions"
37
+ };
24
38
  var _hoisted_15 = ["onClick"];
39
+ var _hoisted_16 = ["onClick"];
40
+ var _hoisted_17 = ["onClick"];
41
+ var _hoisted_18 = ["title"];
42
+ var _hoisted_19 = ["title"];
25
43
  var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
26
44
  name: "MEditorHistoryListGroupRow",
27
45
  __name: "GroupRow",
28
46
  props: {
29
- groupKey: {},
30
- applied: { type: Boolean },
31
- merged: { type: Boolean },
32
- opType: {},
33
- desc: {},
34
- source: {},
35
- time: {},
36
- timeTitle: {},
37
- stepCount: {},
38
- subSteps: {},
47
+ group: {},
39
48
  expanded: { type: Boolean },
40
- isCurrent: {
41
- type: Boolean,
42
- default: false
43
- },
44
49
  gotoEnabled: {
45
50
  type: Boolean,
46
51
  default: true
52
+ },
53
+ selectEnabled: {
54
+ type: Boolean,
55
+ default: false
47
56
  }
48
57
  },
49
58
  emits: [
50
59
  "toggle",
51
60
  "goto",
52
61
  "diff-step",
53
- "revert-step"
62
+ "revert-step",
63
+ "select"
54
64
  ],
55
65
  setup(__props, { emit: __emit }) {
56
66
  const props = __props;
57
67
  const emit = __emit;
68
+ /** 子步数大于 1 即为合并组:决定是否展示合并标记与可展开的子步列表。 */
69
+ const merged = computed(() => props.group.subSteps.length > 1);
70
+ /** 组内 step 总数,仅在合并组时显示为 "合并 N 步"。 */
71
+ const stepCount = computed(() => props.group.subSteps.length);
58
72
  /**
59
- * 仅合并组头部可点击(切换展开 / 收起);
60
- * 单步组的跳转改由头部的「回退」按钮触发,整行不再可点击。
73
+ * 头部可点击的场景:
74
+ * - 合并组:点击切换展开 / 收起;
75
+ * - 开启 `selectEnabled`(页面 tab):点击选中对应节点。
76
+ * 单步组的跳转仍由头部的「回到」按钮触发。
61
77
  */
62
- const isHeadClickable = computed(() => props.merged);
78
+ const isHeadClickable = computed(() => merged.value || props.selectEnabled);
63
79
  const headTitle = computed(() => {
64
- if (props.merged) return props.expanded ? "点击收起子步" : "点击展开子步";
65
- if (props.isCurrent) return "当前所在记录";
80
+ if (merged.value) {
81
+ const expandHint = props.expanded ? "点击收起子步" : "点击展开子步";
82
+ return props.selectEnabled ? `${expandHint}(并选中该节点)` : expandHint;
83
+ }
84
+ if (props.selectEnabled) return "点击选中该节点";
85
+ if (props.group.isCurrent) return "当前所在记录";
66
86
  return "";
67
87
  });
68
88
  /**
69
- * 头部点击行为:仅合并组切换展开 / 收起;单步组不再响应整行点击。
89
+ * 头部点击行为:
90
+ * - 开启 selectEnabled 时,发出 select(携带组内首步 index,上层据此选中节点);
91
+ * - 合并组同时切换展开 / 收起。
70
92
  */
71
93
  const onHeadClick = () => {
72
- if (props.merged) emit("toggle", props.groupKey);
94
+ if (props.selectEnabled && props.group.subSteps.length) emit("select", props.group.subSteps[0].index);
95
+ if (merged.value) emit("toggle", props.group.key);
73
96
  };
74
97
  const onGotoClick = (index) => {
75
98
  if (!props.gotoEnabled) return;
76
99
  emit("goto", index);
77
100
  };
101
+ /** 点击子步行:开启 selectEnabled 时选中该子步对应的节点。 */
102
+ const onSubStepClick = (index) => {
103
+ if (!props.selectEnabled) return;
104
+ emit("select", index);
105
+ };
78
106
  const subStepTitle = (s) => {
107
+ if (props.selectEnabled) return "点击选中该节点";
79
108
  if (s.isCurrent) return "当前所在记录";
80
109
  return "";
81
110
  };
111
+ /**
112
+ * 头部是否展示「已保存」标记:
113
+ * - 单步组:取该唯一子步的 saved;
114
+ * - 合并组:组内任一子步为已保存即在头部提示(具体落在哪一步可展开查看)。
115
+ */
116
+ const headSaved = computed(() => merged.value ? props.group.subSteps.some((s) => s.saved) : Boolean(props.group.subSteps[0]?.saved));
82
117
  /** 单步组头部是否展示"查看差异"入口:要求该唯一子步本身可对比。 */
83
- const headDiffable = computed(() => !props.merged && Boolean(props.subSteps[0]?.diffable));
118
+ const headDiffable = computed(() => !merged.value && Boolean(props.group.subSteps[0]?.diffable));
84
119
  /** 单步组头部是否展示"回滚"入口:要求该唯一子步本身可回滚(已应用)。 */
85
- const headRevertable = computed(() => !props.merged && Boolean(props.subSteps[0]?.revertable));
120
+ const headRevertable = computed(() => !merged.value && Boolean(props.group.subSteps[0]?.revertable));
121
+ /** 单步组头部是否展示"回到"入口:可跳转、非当前、且存在唯一子步。 */
122
+ const canHeadGoto = computed(() => !merged.value && props.gotoEnabled && !props.group.isCurrent && props.group.subSteps.length > 0);
86
123
  /**
87
124
  * 合并组展开后的子步渲染顺序:与外层分组列表保持一致——倒序展示(最新的子步在最上方)。
88
125
  * 外层 page tab / bucket 都已对 groups 做了 reverse,子步沿用同样的视觉规则更直观。
89
126
  * 注意:仅用于渲染,原 `subSteps` 保持时间正序,`headIndexLabel` 等基于首尾索引的展示语义不变。
90
127
  */
91
- const subStepsDisplay = computed(() => props.subSteps.slice().reverse());
128
+ const subStepsDisplay = computed(() => props.group.subSteps.slice().reverse());
92
129
  /**
93
130
  * 头部索引展示:
94
- * - 单步组(merged=false):显示该唯一 step 的编号,如 `#5`;
131
+ * - 单步组(非合并):显示该唯一 step 的编号,如 `#5`;
95
132
  * - 合并组:显示组内 step 的编号范围,如 `#3-#7`(首尾相同则退化为 `#5`)。
96
133
  *
97
134
  * 这里展示的是 step.index + 1(与子步列表 `#{{ s.index + 1 }}` 保持一致),从 1 起编号更符合直觉。
98
135
  */
99
136
  const headIndexLabel = computed(() => {
100
- const list = props.subSteps;
137
+ const list = props.group.subSteps;
101
138
  if (!list.length) return "";
102
139
  const first = list[0].index + 1;
103
140
  const last = list[list.length - 1].index + 1;
104
- if (!props.merged || first === last) return `#${first}`;
141
+ if (!merged.value || first === last) return `#${first}`;
105
142
  return `#${first}-#${last}`;
106
143
  });
107
144
  const headIndexTitle = computed(() => {
108
- if (!props.merged) return `历史步骤编号 #${props.subSteps[0]?.index + 1}`;
109
- return `合并了第 ${props.subSteps[0]?.index + 1} 至第 ${props.subSteps[props.subSteps.length - 1]?.index + 1} 共 ${props.subSteps.length} 条历史步骤`;
145
+ const list = props.group.subSteps;
146
+ if (!merged.value) return `历史步骤编号 #${list[0]?.index + 1}`;
147
+ return `合并了第 ${list[0]?.index + 1} 至第 ${list[list.length - 1]?.index + 1} 共 ${list.length} 条历史步骤`;
110
148
  });
111
149
  const onDiffClick = (index) => {
112
150
  emit("diff-step", index);
@@ -116,9 +154,9 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
116
154
  };
117
155
  return (_ctx, _cache) => {
118
156
  return openBlock(), createElementBlock("li", { class: normalizeClass(["m-editor-history-list-item m-editor-history-list-group", {
119
- "is-undone": !__props.applied,
120
- "is-merged": __props.merged,
121
- "is-current": __props.isCurrent
157
+ "is-undone": !__props.group.applied,
158
+ "is-merged": merged.value,
159
+ "is-current": __props.group.isCurrent
122
160
  }]) }, [createElementVNode("div", {
123
161
  class: normalizeClass(["m-editor-history-list-group-head", { "is-clickable": isHeadClickable.value }]),
124
162
  title: headTitle.value,
@@ -128,81 +166,89 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
128
166
  class: "m-editor-history-list-item-index",
129
167
  title: headIndexTitle.value
130
168
  }, toDisplayString(headIndexLabel.value), 9, _hoisted_2),
131
- createElementVNode("span", { class: normalizeClass(["m-editor-history-list-item-op", `op-${__props.opType}`]) }, toDisplayString(unref(opLabel)(__props.opType)), 3),
132
- createElementVNode("span", _hoisted_3, toDisplayString(__props.desc), 1),
133
- !__props.merged && unref(sourceLabel)(__props.source) ? (openBlock(), createElementBlock("span", {
134
- key: 0,
169
+ createElementVNode("span", { class: normalizeClass(["m-editor-history-list-item-op", `op-${__props.group.opType}`]) }, toDisplayString(unref(opLabel)(__props.group.opType)), 3),
170
+ createElementVNode("span", _hoisted_3, toDisplayString(__props.group.desc), 1),
171
+ headSaved.value ? (openBlock(), createElementBlock("span", _hoisted_4, "已保存")) : createCommentVNode("v-if", true),
172
+ !merged.value && (headRevertable.value || headDiffable.value || canHeadGoto.value) ? (openBlock(), createElementBlock("span", _hoisted_5, [
173
+ headRevertable.value ? (openBlock(), createElementBlock("span", {
174
+ key: 0,
175
+ class: "m-editor-history-list-item-revert",
176
+ title: "将该步骤的修改作为一次新操作反向应用(不影响后续历史)",
177
+ onClick: _cache[0] || (_cache[0] = withModifiers(($event) => onRevertClick(__props.group.subSteps[0].index), ["stop"]))
178
+ }, "回滚")) : createCommentVNode("v-if", true),
179
+ canHeadGoto.value ? (openBlock(), createElementBlock("span", {
180
+ key: 1,
181
+ class: "m-editor-history-list-item-goto",
182
+ title: "回到该记录",
183
+ onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onGotoClick(__props.group.subSteps[0].index), ["stop"]))
184
+ }, "回到")) : createCommentVNode("v-if", true),
185
+ headDiffable.value ? (openBlock(), createElementBlock("span", {
186
+ key: 2,
187
+ class: "m-editor-history-list-item-diff",
188
+ title: "查看修改差异",
189
+ onClick: _cache[2] || (_cache[2] = withModifiers(($event) => onDiffClick(__props.group.subSteps[0].index), ["stop"]))
190
+ }, "查看差异")) : createCommentVNode("v-if", true)
191
+ ])) : createCommentVNode("v-if", true),
192
+ !merged.value && unref(sourceLabel)(__props.group.source) ? (openBlock(), createElementBlock("span", {
193
+ key: 2,
135
194
  class: "m-editor-history-list-item-source",
136
- title: `操作途径:${unref(sourceLabel)(__props.source)}`
137
- }, toDisplayString(unref(sourceLabel)(__props.source)), 9, _hoisted_4)) : createCommentVNode("v-if", true),
138
- !__props.merged && __props.time ? (openBlock(), createElementBlock("span", {
139
- key: 1,
140
- class: "m-editor-history-list-item-time",
141
- title: __props.timeTitle || __props.time
142
- }, toDisplayString(__props.time), 9, _hoisted_5)) : createCommentVNode("v-if", true),
143
- __props.merged ? (openBlock(), createElementBlock("span", _hoisted_6, "合并 " + toDisplayString(__props.stepCount) + " 步", 1)) : createCommentVNode("v-if", true),
144
- !__props.merged && headRevertable.value ? (openBlock(), createElementBlock("span", {
195
+ title: `操作途径:${unref(sourceLabel)(__props.group.source)}`
196
+ }, toDisplayString(unref(sourceLabel)(__props.group.source)), 9, _hoisted_6)) : createCommentVNode("v-if", true),
197
+ !merged.value && __props.group.time ? (openBlock(), createElementBlock("span", {
145
198
  key: 3,
146
- class: "m-editor-history-list-item-revert",
147
- title: "将该步骤的修改作为一次新操作反向应用(不影响后续历史)",
148
- onClick: _cache[0] || (_cache[0] = withModifiers(($event) => onRevertClick(__props.subSteps[0].index), ["stop"]))
149
- }, "回滚")) : createCommentVNode("v-if", true),
150
- !__props.merged && __props.gotoEnabled && !__props.isCurrent && __props.subSteps.length ? (openBlock(), createElementBlock("span", {
151
- key: 4,
152
- class: "m-editor-history-list-item-goto",
153
- title: "回到该记录",
154
- onClick: _cache[1] || (_cache[1] = withModifiers(($event) => onGotoClick(__props.subSteps[0].index), ["stop"]))
155
- }, "回到")) : createCommentVNode("v-if", true),
156
- !__props.merged && headDiffable.value ? (openBlock(), createElementBlock("span", {
199
+ class: "m-editor-history-list-item-time",
200
+ title: __props.group.timeTitle || __props.group.time
201
+ }, toDisplayString(__props.group.time), 9, _hoisted_7)) : createCommentVNode("v-if", true),
202
+ merged.value ? (openBlock(), createElementBlock("span", _hoisted_8, "合并 " + toDisplayString(stepCount.value) + " 步", 1)) : createCommentVNode("v-if", true),
203
+ merged.value ? (openBlock(), createElementBlock("span", {
157
204
  key: 5,
158
- class: "m-editor-history-list-item-diff",
159
- title: "查看修改差异",
160
- onClick: _cache[2] || (_cache[2] = withModifiers(($event) => onDiffClick(__props.subSteps[0].index), ["stop"]))
161
- }, "查看差异")) : createCommentVNode("v-if", true),
162
- __props.merged ? (openBlock(), createElementBlock("span", {
163
- key: 6,
164
205
  class: normalizeClass(["m-editor-history-list-group-toggle", { "is-expanded": __props.expanded }])
165
206
  }, "▾", 2)) : createCommentVNode("v-if", true)
166
- ], 10, _hoisted_1), __props.merged && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_7, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
207
+ ], 10, _hoisted_1), merged.value && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_9, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
167
208
  return openBlock(), createElementBlock("li", {
168
209
  key: s.index,
169
210
  class: normalizeClass({
170
211
  "is-undone": !s.applied,
171
- "is-current": s.isCurrent
212
+ "is-current": s.isCurrent,
213
+ "is-clickable": __props.selectEnabled
172
214
  }),
173
- title: subStepTitle(s)
215
+ title: subStepTitle(s),
216
+ onClick: ($event) => onSubStepClick(s.index)
174
217
  }, [
175
- createElementVNode("span", _hoisted_9, "#" + toDisplayString(s.index + 1), 1),
176
- createElementVNode("span", _hoisted_10, toDisplayString(s.desc), 1),
218
+ createElementVNode("span", _hoisted_11, "#" + toDisplayString(s.index + 1), 1),
219
+ createElementVNode("span", _hoisted_12, toDisplayString(s.desc), 1),
220
+ s.saved ? (openBlock(), createElementBlock("span", _hoisted_13, "已保存")) : createCommentVNode("v-if", true),
221
+ s.revertable || s.diffable || __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_14, [
222
+ s.revertable ? (openBlock(), createElementBlock("span", {
223
+ key: 0,
224
+ class: "m-editor-history-list-item-revert",
225
+ title: "将该步骤的修改作为一次新操作反向应用(不影响后续历史)",
226
+ onClick: withModifiers(($event) => onRevertClick(s.index), ["stop"])
227
+ }, "回滚", 8, _hoisted_15)) : createCommentVNode("v-if", true),
228
+ __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", {
229
+ key: 1,
230
+ class: "m-editor-history-list-item-goto",
231
+ title: "回到该记录",
232
+ onClick: withModifiers(($event) => onGotoClick(s.index), ["stop"])
233
+ }, "回到", 8, _hoisted_16)) : createCommentVNode("v-if", true),
234
+ s.diffable ? (openBlock(), createElementBlock("span", {
235
+ key: 2,
236
+ class: "m-editor-history-list-item-diff",
237
+ title: "查看修改差异",
238
+ onClick: withModifiers(($event) => onDiffClick(s.index), ["stop"])
239
+ }, "查看差异", 8, _hoisted_17)) : createCommentVNode("v-if", true)
240
+ ])) : createCommentVNode("v-if", true),
177
241
  unref(sourceLabel)(s.source) ? (openBlock(), createElementBlock("span", {
178
- key: 0,
242
+ key: 2,
179
243
  class: "m-editor-history-list-item-source",
180
244
  title: `操作途径:${unref(sourceLabel)(s.source)}`
181
- }, toDisplayString(unref(sourceLabel)(s.source)), 9, _hoisted_11)) : createCommentVNode("v-if", true),
245
+ }, toDisplayString(unref(sourceLabel)(s.source)), 9, _hoisted_18)) : createCommentVNode("v-if", true),
182
246
  s.time ? (openBlock(), createElementBlock("span", {
183
- key: 1,
247
+ key: 3,
184
248
  class: "m-editor-history-list-item-time",
185
249
  title: s.timeTitle || s.time
186
- }, toDisplayString(s.time), 9, _hoisted_12)) : createCommentVNode("v-if", true),
187
- s.revertable ? (openBlock(), createElementBlock("span", {
188
- key: 2,
189
- class: "m-editor-history-list-item-revert",
190
- title: "将该步骤的修改作为一次新操作反向应用(不影响后续历史)",
191
- onClick: withModifiers(($event) => onRevertClick(s.index), ["stop"])
192
- }, "回滚", 8, _hoisted_13)) : createCommentVNode("v-if", true),
193
- __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", {
194
- key: 3,
195
- class: "m-editor-history-list-item-goto",
196
- title: "回到该记录",
197
- onClick: withModifiers(($event) => onGotoClick(s.index), ["stop"])
198
- }, "回到", 8, _hoisted_14)) : createCommentVNode("v-if", true),
199
- s.diffable ? (openBlock(), createElementBlock("span", {
200
- key: 4,
201
- class: "m-editor-history-list-item-diff",
202
- title: "查看修改差异",
203
- onClick: withModifiers(($event) => onDiffClick(s.index), ["stop"])
204
- }, "查看差异", 8, _hoisted_15)) : createCommentVNode("v-if", true)
205
- ], 10, _hoisted_8);
250
+ }, toDisplayString(s.time), 9, _hoisted_19)) : createCommentVNode("v-if", true)
251
+ ], 10, _hoisted_10);
206
252
  }), 128))])) : createCommentVNode("v-if", true)], 2);
207
253
  };
208
254
  }
@@ -1,7 +1,7 @@
1
1
  import CodeEditor_default from "../CodeEditor.js";
2
2
  import CompareForm_default from "../../components/CompareForm.js";
3
3
  import { TMagicButton, TMagicDialog, TMagicRadioButton, TMagicRadioGroup, TMagicTag } from "@tmagic/design";
4
- import { Fragment, Teleport, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, ref, toDisplayString, unref, watch, withCtx } from "vue";
4
+ import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, ref, toDisplayString, unref, watch, withCtx } from "vue";
5
5
  import { isEqual } from "lodash-es";
6
6
  //#region packages/editor/src/layouts/history-list/HistoryDiffDialog.vue?vue&type=script&setup=true&lang.ts
7
7
  var _hoisted_1 = {
@@ -27,6 +27,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
27
27
  extendState: {},
28
28
  loadConfig: {},
29
29
  width: { default: "900px" },
30
+ isConfirm: { type: Boolean },
30
31
  onConfirm: {},
31
32
  selfDiffFieldTypes: {}
32
33
  },
@@ -81,9 +82,12 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
81
82
  if (mode.value !== "current" || !payload.value) return false;
82
83
  return isEqual(payload.value.value, payload.value.currentValue);
83
84
  });
85
+ /** confirm() 的 resolve,仅在「等待用户确认回滚」期间存在 */
86
+ let confirmResolve = null;
84
87
  const onConfirmClick = () => {
85
- const cb = props.onConfirm;
86
- cb?.();
88
+ props.onConfirm?.();
89
+ confirmResolve?.(true);
90
+ confirmResolve = null;
87
91
  visible.value = false;
88
92
  };
89
93
  const targetText = computed(() => {
@@ -105,21 +109,41 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
105
109
  viewMode.value = "form";
106
110
  visible.value = true;
107
111
  };
112
+ /**
113
+ * 以 Promise 形式打开确认回滚弹窗:
114
+ * - 用户点击「确定回滚」时 resolve(true);
115
+ * - 取消 / 关闭 / 按 Esc 等其他方式关闭弹窗时 resolve(false)。
116
+ *
117
+ * 同一时刻只允许一个待确认流程,重复调用会先 resolve(false) 掉上一个。
118
+ */
119
+ const confirm = (p) => {
120
+ confirmResolve?.(false);
121
+ confirmResolve = null;
122
+ return new Promise((resolve) => {
123
+ confirmResolve = resolve;
124
+ open(p);
125
+ });
126
+ };
108
127
  const close = () => {
109
128
  visible.value = false;
110
129
  };
111
130
  watch(visible, (v) => {
112
- if (!v) payload.value = null;
131
+ if (!v) {
132
+ payload.value = null;
133
+ confirmResolve?.(false);
134
+ confirmResolve = null;
135
+ }
113
136
  });
114
137
  const onClose = () => {
115
138
  emit("close");
116
139
  };
117
140
  __expose({
118
141
  open,
142
+ confirm,
119
143
  close
120
144
  });
121
145
  return (_ctx, _cache) => {
122
- return openBlock(), createBlock(Teleport, { to: "body" }, [createVNode(unref(TMagicDialog), {
146
+ return openBlock(), createBlock(unref(TMagicDialog), {
123
147
  modelValue: visible.value,
124
148
  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => visible.value = $event),
125
149
  class: "m-editor-history-diff-dialog",
@@ -130,7 +154,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
130
154
  width: __props.width,
131
155
  onClose
132
156
  }, {
133
- footer: withCtx(() => [__props.onConfirm ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [createVNode(unref(TMagicButton), {
157
+ footer: withCtx(() => [__props.isConfirm ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [createVNode(unref(TMagicButton), {
134
158
  size: "small",
135
159
  onClick: _cache[2] || (_cache[2] = ($event) => visible.value = false)
136
160
  }, {
@@ -151,7 +175,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
151
175
  default: withCtx(() => [..._cache[12] || (_cache[12] = [createTextVNode("关闭", -1)])]),
152
176
  _: 1
153
177
  }))]),
154
- default: withCtx(() => [payload.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
178
+ default: withCtx(() => [payload.value && visible.value ? (openBlock(), createElementBlock("div", _hoisted_1, [
155
179
  __props.onConfirm ? (openBlock(), createElementBlock("div", _hoisted_2, "仅回滚有差异的字段")) : createCommentVNode("v-if", true),
156
180
  createElementVNode("div", _hoisted_3, [createElementVNode("span", _hoisted_4, toDisplayString(targetText.value), 1), createElementVNode("div", _hoisted_5, [createVNode(unref(TMagicRadioGroup), {
157
181
  modelValue: viewMode.value,
@@ -239,7 +263,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
239
263
  "modelValue",
240
264
  "title",
241
265
  "width"
242
- ])]);
266
+ ]);
243
267
  };
244
268
  }
245
269
  });