@tmagic/editor 1.8.0-beta.7 → 1.8.0-manmanyu.10

package/dist/es/layouts/AddPageBox.vue_vue_type_script_setup_true_lang.js

@@ -7,7 +7,7 @@ import { Plus } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/AddPageBox.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-empty-panel" };
 var _hoisted_2 = { class: "m-editor-empty-content" };
-var AddPageBox_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var AddPageBox_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorAddPageBox",
 	__name: "AddPageBox",
 	props: { disabledPageFragment: { type: Boolean } },

package/dist/es/layouts/CodeEditor.vue_vue_type_script_setup_true_lang.js

@@ -12,7 +12,7 @@ var _hoisted_2 = {
 	ref: "codeEditor",
 	class: "magic-code-editor-content"
 };
-var CodeEditor_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var CodeEditor_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorCodeEditor",
 	__name: "CodeEditor",
 	props: {

package/dist/es/layouts/Framework.vue_vue_type_script_setup_true_lang.js

@@ -6,21 +6,17 @@ import SplitView_default from "../components/SplitView.js";
 import PageBar_default from "./page-bar/PageBar.js";
 import AddPageBox_default from "./AddPageBox.js";
 import CodeEditor_default from "./CodeEditor.js";
-import { computed, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, inject, onBeforeUnmount, onMounted, openBlock, renderSlot, unref, useTemplateRef, vShow, watch, withCtx, withDirectives } from "vue";
+import { computed, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, inject, normalizeClass, onBeforeUnmount, onMounted, openBlock, renderSlot, unref, useTemplateRef, vShow, watch, withCtx, withDirectives } from "vue";
 //#region packages/editor/src/layouts/Framework.vue?vue&type=script&setup=true&lang.ts
-var _hoisted_1 = {
-	class: "m-editor",
-	ref: "content",
-	style: { "min-width": "900px" }
-};
-var Framework_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Framework_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorFramework",
 	__name: "Framework",
 	props: {
 		disabledPageFragment: { type: Boolean },
 		pageBarSortOptions: {},
 		pageFilterFunction: { type: Function },
-		hideSidebar: { type: Boolean }
+		hideSidebar: { type: Boolean },
+		theme: {}
 	},
 	setup(__props) {
 		const props = __props;
@@ -72,7 +68,15 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 			}
 		};
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", _hoisted_1, [
+			return openBlock(), createElementBlock("div", {
+				ref: "content",
+				class: normalizeClass([
+					"m-editor",
+					__props.theme ? `m-editor--${__props.theme}` : "",
+					__props.theme ? `m-theme--${__props.theme}` : ""
+				]),
+				style: { "min-width": "900px" }
+			}, [
 				renderSlot(_ctx.$slots, "header"),
 				renderSlot(_ctx.$slots, "nav"),
 				renderSlot(_ctx.$slots, "content-before"),
@@ -91,7 +95,7 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 					"right-class": "m-editor-framework-right",
 					left: __props.hideSidebar ? void 0 : columnWidth.value.left,
 					right: columnWidth.value.right,
-					"min-left": __props.hideSidebar ? 0 : unref(200),
+					"min-left": __props.hideSidebar ? 0 : unref(238),
 					"min-right": unref(300),
 					"min-center": unref(400),
 					width: frameworkRect.value.width,
@@ -131,7 +135,7 @@ var Framework_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 				]), [[vShow, !showSrc.value]]),
 				renderSlot(_ctx.$slots, "content-after"),
 				renderSlot(_ctx.$slots, "footer")
-			], 512);
+			], 2);
 		};
 	}
 });

package/dist/es/layouts/NavMenu.vue_vue_type_script_setup_true_lang.js

@@ -6,7 +6,7 @@ import { NodeType } from "@tmagic/core";
 import { Fragment, computed, createBlock, createElementBlock, defineComponent, markRaw, normalizeStyle, onBeforeUnmount, onMounted, openBlock, renderList, unref, useTemplateRef } from "vue";
 import { Back, Delete, FullScreen, Grid, Memo, Right, ScaleToOriginal, ZoomIn, ZoomOut } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/NavMenu.vue?vue&type=script&setup=true&lang.ts
-var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var NavMenu_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorNavMenu",
 	__name: "NavMenu",
 	props: {
@@ -55,7 +55,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						className: "undo",
 						icon: markRaw(Back),
 						tooltip: `后退(${ctrl}+z)`,
-						disabled: () => !historyService.state.canUndo,
+						disabled: () => !historyService.canUndo("page", editorService.get("page")?.id),
 						handler: () => editorService.undo()
 					});
 					break;
@@ -65,7 +65,7 @@ var NavMenu_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ define
 						className: "redo",
 						icon: markRaw(Right),
 						tooltip: `前进(${ctrl}+Shift+z)`,
-						disabled: () => !historyService.state.canRedo,
+						disabled: () => !historyService.canRedo("page", editorService.get("page")?.id),
 						handler: () => editorService.redo()
 					});
 					break;

package/dist/es/layouts/NavMenuColumn.vue_vue_type_script_setup_true_lang.js

@@ -4,7 +4,7 @@ import { Fragment, computed, createBlock, createElementBlock, createElementVNode
 import { ArrowDown, ArrowUp } from "@element-plus/icons-vue";
 //#region packages/editor/src/layouts/NavMenuColumn.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = { class: "m-editor-nav-menu-overflow-list" };
-var NavMenuColumn_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var NavMenuColumn_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorNavMenuColumn",
 	__name: "NavMenuColumn",
 	props: {

package/dist/es/layouts/history-list/Bucket.vue_vue_type_script_setup_true_lang.js

@@ -7,7 +7,7 @@ var _hoisted_1 = { class: "m-editor-history-list-bucket" };
 var _hoisted_2 = { class: "m-editor-history-list-bucket-title" };
 var _hoisted_3 = { class: "m-editor-history-list-bucket-count" };
 var _hoisted_4 = { class: "m-editor-history-list-ul" };
-var Bucket_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var Bucket_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryListBucket",
 	__name: "Bucket",
 	props: {

package/dist/es/layouts/history-list/BucketTab.vue_vue_type_script_setup_true_lang.js

@@ -8,7 +8,7 @@ var _hoisted_1 = {
 };
 var _hoisted_2 = { class: "m-editor-history-list-toolbar" };
 var _hoisted_3 = ["title"];
-var BucketTab_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var BucketTab_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryListBucketTab",
 	__name: "BucketTab",
 	props: {

package/dist/es/layouts/history-list/GroupRow.vue_vue_type_script_setup_true_lang.js

@@ -15,32 +15,34 @@ var _hoisted_5 = {
 };
 var _hoisted_6 = ["title"];
 var _hoisted_7 = ["title"];
-var _hoisted_8 = {
-	key: 4,
+var _hoisted_8 = ["title"];
+var _hoisted_9 = {
+	key: 5,
 	class: "m-editor-history-list-item-merge"
 };
-var _hoisted_9 = {
+var _hoisted_10 = {
 	key: 0,
 	class: "m-editor-history-list-substeps"
 };
-var _hoisted_10 = ["title", "onClick"];
-var _hoisted_11 = { class: "m-editor-history-list-item-index" };
-var _hoisted_12 = { class: "m-editor-history-list-substep-desc" };
-var _hoisted_13 = {
+var _hoisted_11 = ["title", "onClick"];
+var _hoisted_12 = { class: "m-editor-history-list-item-index" };
+var _hoisted_13 = { class: "m-editor-history-list-substep-desc" };
+var _hoisted_14 = {
 	key: 0,
 	class: "m-editor-history-list-item-saved",
 	title: "该记录为最近一次保存的状态"
 };
-var _hoisted_14 = {
+var _hoisted_15 = {
 	key: 1,
 	class: "m-editor-history-list-item-actions"
 };
-var _hoisted_15 = ["onClick"];
 var _hoisted_16 = ["onClick"];
 var _hoisted_17 = ["onClick"];
-var _hoisted_18 = ["title"];
+var _hoisted_18 = ["onClick"];
 var _hoisted_19 = ["title"];
-var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var _hoisted_20 = ["title"];
+var _hoisted_21 = ["title"];
+var GroupRow_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryListGroupRow",
 	__name: "GroupRow",
 	props: {
@@ -194,17 +196,22 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 					class: "m-editor-history-list-item-source",
 					title: `操作途径：${unref(sourceLabel)(__props.group.source)}`
 				}, toDisplayString(unref(sourceLabel)(__props.group.source)), 9, _hoisted_6)) : createCommentVNode("v-if", true),
-				!merged.value && __props.group.time ? (openBlock(), createElementBlock("span", {
+				!merged.value && __props.group.operator ? (openBlock(), createElementBlock("span", {
 					key: 3,
+					class: "m-editor-history-list-item-operator",
+					title: `操作人：${__props.group.operator}`
+				}, toDisplayString(__props.group.operator), 9, _hoisted_7)) : createCommentVNode("v-if", true),
+				!merged.value && __props.group.time ? (openBlock(), createElementBlock("span", {
+					key: 4,
 					class: "m-editor-history-list-item-time",
 					title: __props.group.timeTitle || __props.group.time
-				}, toDisplayString(__props.group.time), 9, _hoisted_7)) : createCommentVNode("v-if", true),
-				merged.value ? (openBlock(), createElementBlock("span", _hoisted_8, "合并 " + toDisplayString(stepCount.value) + " 步", 1)) : createCommentVNode("v-if", true),
+				}, toDisplayString(__props.group.time), 9, _hoisted_8)) : createCommentVNode("v-if", true),
+				merged.value ? (openBlock(), createElementBlock("span", _hoisted_9, "合并 " + toDisplayString(stepCount.value) + " 步", 1)) : createCommentVNode("v-if", true),
 				merged.value ? (openBlock(), createElementBlock("span", {
-					key: 5,
+					key: 6,
 					class: normalizeClass(["m-editor-history-list-group-toggle", { "is-expanded": __props.expanded }])
 				}, "▾", 2)) : createCommentVNode("v-if", true)
-			], 10, _hoisted_1), merged.value && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_9, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
+			], 10, _hoisted_1), merged.value && __props.expanded ? (openBlock(), createElementBlock("ul", _hoisted_10, [(openBlock(true), createElementBlock(Fragment, null, renderList(subStepsDisplay.value, (s) => {
 				return openBlock(), createElementBlock("li", {
 					key: s.index,
 					class: normalizeClass({
@@ -215,40 +222,45 @@ var GroupRow_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defin
 					title: subStepTitle(s),
 					onClick: ($event) => onSubStepClick(s.index)
 				}, [
-					createElementVNode("span", _hoisted_11, "#" + toDisplayString(s.index + 1), 1),
-					createElementVNode("span", _hoisted_12, toDisplayString(s.desc), 1),
-					s.saved ? (openBlock(), createElementBlock("span", _hoisted_13, "已保存")) : createCommentVNode("v-if", true),
-					s.revertable || s.diffable || __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_14, [
+					createElementVNode("span", _hoisted_12, "#" + toDisplayString(s.index + 1), 1),
+					createElementVNode("span", _hoisted_13, toDisplayString(s.desc), 1),
+					s.saved ? (openBlock(), createElementBlock("span", _hoisted_14, "已保存")) : createCommentVNode("v-if", true),
+					s.revertable || s.diffable || __props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", _hoisted_15, [
 						s.revertable ? (openBlock(), createElementBlock("span", {
 							key: 0,
 							class: "m-editor-history-list-item-revert",
 							title: "将该步骤的修改作为一次新操作反向应用（不影响后续历史）",
 							onClick: withModifiers(($event) => onRevertClick(s.index), ["stop"])
-						}, "回滚", 8, _hoisted_15)) : createCommentVNode("v-if", true),
+						}, "回滚", 8, _hoisted_16)) : createCommentVNode("v-if", true),
 						__props.gotoEnabled && !s.isCurrent ? (openBlock(), createElementBlock("span", {
 							key: 1,
 							class: "m-editor-history-list-item-goto",
 							title: "回到该记录",
 							onClick: withModifiers(($event) => onGotoClick(s.index), ["stop"])
-						}, "回到", 8, _hoisted_16)) : createCommentVNode("v-if", true),
+						}, "回到", 8, _hoisted_17)) : createCommentVNode("v-if", true),
 						s.diffable ? (openBlock(), createElementBlock("span", {
 							key: 2,
 							class: "m-editor-history-list-item-diff",
 							title: "查看修改差异",
 							onClick: withModifiers(($event) => onDiffClick(s.index), ["stop"])
-						}, "查看差异", 8, _hoisted_17)) : createCommentVNode("v-if", true)
+						}, "查看差异", 8, _hoisted_18)) : createCommentVNode("v-if", true)
 					])) : createCommentVNode("v-if", true),
 					unref(sourceLabel)(s.source) ? (openBlock(), createElementBlock("span", {
 						key: 2,
 						class: "m-editor-history-list-item-source",
 						title: `操作途径：${unref(sourceLabel)(s.source)}`
-					}, toDisplayString(unref(sourceLabel)(s.source)), 9, _hoisted_18)) : createCommentVNode("v-if", true),
-					s.time ? (openBlock(), createElementBlock("span", {
+					}, toDisplayString(unref(sourceLabel)(s.source)), 9, _hoisted_19)) : createCommentVNode("v-if", true),
+					s.operator ? (openBlock(), createElementBlock("span", {
 						key: 3,
+						class: "m-editor-history-list-item-operator",
+						title: `操作人：${s.operator}`
+					}, toDisplayString(s.operator), 9, _hoisted_20)) : createCommentVNode("v-if", true),
+					s.time ? (openBlock(), createElementBlock("span", {
+						key: 4,
 						class: "m-editor-history-list-item-time",
 						title: s.timeTitle || s.time
-					}, toDisplayString(s.time), 9, _hoisted_19)) : createCommentVNode("v-if", true)
-				], 10, _hoisted_10);
+					}, toDisplayString(s.time), 9, _hoisted_21)) : createCommentVNode("v-if", true)
+				], 10, _hoisted_11);
 			}), 128))])) : createCommentVNode("v-if", true)], 2);
 		};
 	}

package/dist/es/layouts/history-list/HistoryDiffDialog.vue_vue_type_script_setup_true_lang.js

@@ -1,3 +1,4 @@
+import { useServices } from "../../hooks/use-services.js";
 import CodeEditor_default from "../CodeEditor.js";
 import CompareForm_default from "../../components/CompareForm.js";
 import { TMagicButton, TMagicDialog, TMagicRadioButton, TMagicRadioGroup, TMagicTag } from "@tmagic/design";
@@ -20,10 +21,11 @@ var _hoisted_7 = {
 	key: 0,
 	class: "m-editor-history-diff-dialog-tip"
 };
-var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
+var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defineComponent({
 	name: "MEditorHistoryDiffDialog",
 	__name: "HistoryDiffDialog",
 	props: {
+		services: { default: () => useServices() },
 		extendState: {},
 		loadConfig: {},
 		width: { default: "900px" },
@@ -237,6 +239,7 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						"extend-state": __props.extendState,
 						"load-config": __props.loadConfig,
 						"self-diff-field-types": __props.selfDiffFieldTypes,
+						services: props.services,
 						height: "70vh"
 					}, null, 8, [
 						"category",
@@ -246,7 +249,8 @@ var HistoryDiffDialog_vue_vue_type_script_setup_true_lang_default = /* @__PURE__
 						"last-value",
 						"extend-state",
 						"load-config",
-						"self-diff-field-types"
+						"self-diff-field-types",
+						"services"
 					])) : (openBlock(), createBlock(CodeEditor_default, {
 						key: 2,
 						type: "diff",