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

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 (84) hide show
  1. package/dist/es/Editor.vue_vue_type_script_setup_true_lang.js +9 -0
  2. package/dist/es/components/CompareForm.vue_vue_type_script_setup_true_lang.js +46 -28
  3. package/dist/es/editorProps.js +2 -0
  4. package/dist/es/fields/CodeLink.vue_vue_type_script_setup_true_lang.js +2 -5
  5. package/dist/es/hooks/use-code-block-edit.js +6 -3
  6. package/dist/es/hooks/use-data-source-edit.js +5 -2
  7. package/dist/es/hooks/use-stage.js +8 -4
  8. package/dist/es/index.js +3 -1
  9. package/dist/es/layouts/CodeEditor.vue_vue_type_script_setup_true_lang.js +2 -5
  10. package/dist/es/layouts/NavMenu.vue_vue_type_script_setup_true_lang.js +1 -1
  11. package/dist/es/layouts/history-list/Bucket.vue_vue_type_script_setup_true_lang.js +37 -14
  12. package/dist/es/layouts/history-list/BucketTab.js +5 -0
  13. package/dist/es/layouts/history-list/{CodeBlockTab.vue_vue_type_script_setup_true_lang.js → BucketTab.vue_vue_type_script_setup_true_lang.js} +30 -16
  14. package/dist/es/layouts/history-list/GroupRow.vue_vue_type_script_setup_true_lang.js +91 -60
  15. package/dist/es/layouts/history-list/HistoryDiffDialog.vue_vue_type_script_setup_true_lang.js +82 -30
  16. package/dist/es/layouts/history-list/HistoryListPanel.vue_vue_type_script_setup_true_lang.js +140 -66
  17. package/dist/es/layouts/history-list/InitialRow.vue_vue_type_script_setup_true_lang.js +15 -9
  18. package/dist/es/layouts/history-list/PageTab.vue_vue_type_script_setup_true_lang.js +15 -6
  19. package/dist/es/layouts/history-list/composables.js +72 -2
  20. package/dist/es/layouts/props-panel/PropsPanel.vue_vue_type_script_setup_true_lang.js +5 -1
  21. package/dist/es/layouts/sidebar/ComponentListPanel.vue_vue_type_script_setup_true_lang.js +1 -1
  22. package/dist/es/layouts/sidebar/code-block/CodeBlockList.vue_vue_type_script_setup_true_lang.js +3 -3
  23. package/dist/es/layouts/sidebar/code-block/CodeBlockListPanel.vue_vue_type_script_setup_true_lang.js +1 -1
  24. package/dist/es/layouts/sidebar/code-block/useContentMenu.js +1 -1
  25. package/dist/es/layouts/sidebar/data-source/DataSourceListPanel.vue_vue_type_script_setup_true_lang.js +1 -1
  26. package/dist/es/layouts/sidebar/data-source/useContentMenu.js +1 -1
  27. package/dist/es/layouts/sidebar/layer/LayerMenu.vue_vue_type_script_setup_true_lang.js +5 -5
  28. package/dist/es/layouts/sidebar/layer/LayerNodeTool.vue_vue_type_script_setup_true_lang.js +1 -1
  29. package/dist/es/layouts/workspace/viewer/Stage.vue_vue_type_script_setup_true_lang.js +1 -1
  30. package/dist/es/layouts/workspace/viewer/ViewerMenu.vue_vue_type_script_setup_true_lang.js +8 -8
  31. package/dist/es/services/codeBlock.js +25 -10
  32. package/dist/es/services/dataSource.js +24 -10
  33. package/dist/es/services/editor.js +98 -46
  34. package/dist/es/services/history.js +7 -2
  35. package/dist/es/services/keybinding.js +3 -3
  36. package/dist/es/style.css +60 -16
  37. package/dist/es/utils/content-menu.js +17 -9
  38. package/dist/style.css +60 -16
  39. package/dist/tmagic-editor.umd.cjs +795 -443
  40. package/package.json +7 -7
  41. package/src/Editor.vue +8 -0
  42. package/src/components/CompareForm.vue +50 -19
  43. package/src/editorProps.ts +7 -0
  44. package/src/fields/CodeLink.vue +2 -5
  45. package/src/hooks/use-code-block-edit.ts +4 -3
  46. package/src/hooks/use-data-source-edit.ts +2 -2
  47. package/src/hooks/use-stage.ts +4 -3
  48. package/src/index.ts +2 -0
  49. package/src/layouts/CodeEditor.vue +2 -5
  50. package/src/layouts/NavMenu.vue +1 -1
  51. package/src/layouts/history-list/Bucket.vue +58 -29
  52. package/src/layouts/history-list/BucketTab.vue +80 -0
  53. package/src/layouts/history-list/GroupRow.vue +110 -58
  54. package/src/layouts/history-list/HistoryDiffDialog.vue +53 -33
  55. package/src/layouts/history-list/HistoryListPanel.vue +165 -52
  56. package/src/layouts/history-list/InitialRow.vue +17 -6
  57. package/src/layouts/history-list/PageTab.vue +25 -7
  58. package/src/layouts/history-list/composables.ts +92 -1
  59. package/src/layouts/props-panel/PropsPanel.vue +5 -1
  60. package/src/layouts/sidebar/ComponentListPanel.vue +9 -5
  61. package/src/layouts/sidebar/code-block/CodeBlockList.vue +5 -5
  62. package/src/layouts/sidebar/code-block/CodeBlockListPanel.vue +1 -1
  63. package/src/layouts/sidebar/code-block/useContentMenu.ts +1 -1
  64. package/src/layouts/sidebar/data-source/DataSourceListPanel.vue +1 -1
  65. package/src/layouts/sidebar/data-source/useContentMenu.ts +1 -1
  66. package/src/layouts/sidebar/layer/LayerMenu.vue +19 -11
  67. package/src/layouts/sidebar/layer/LayerNodeTool.vue +7 -4
  68. package/src/layouts/workspace/viewer/Stage.vue +1 -1
  69. package/src/layouts/workspace/viewer/ViewerMenu.vue +8 -8
  70. package/src/services/codeBlock.ts +33 -9
  71. package/src/services/dataSource.ts +30 -8
  72. package/src/services/editor.ts +111 -34
  73. package/src/services/history.ts +10 -0
  74. package/src/services/keybinding.ts +3 -3
  75. package/src/theme/history-list-panel.scss +67 -14
  76. package/src/theme/props-panel.scss +3 -3
  77. package/src/type.ts +146 -0
  78. package/src/utils/content-menu.ts +18 -9
  79. package/types/index.d.ts +387 -156
  80. package/dist/es/layouts/history-list/CodeBlockTab.js +0 -5
  81. package/dist/es/layouts/history-list/DataSourceTab.js +0 -5
  82. package/dist/es/layouts/history-list/DataSourceTab.vue_vue_type_script_setup_true_lang.js +0 -62
  83. package/src/layouts/history-list/CodeBlockTab.vue +0 -61
  84. package/src/layouts/history-list/DataSourceTab.vue +0 -61
package/dist/es/style.css CHANGED
@@ -592,7 +592,7 @@ fieldset.m-fieldset .m-form-tip {
592
592
  position: absolute;
593
593
  top: 4px;
594
594
  right: 4px;
595
- z-index: 1;
595
+ z-index: 2;
596
596
  display: flex;
597
597
  align-items: center;
598
598
  height: 40px;
@@ -678,17 +678,17 @@ fieldset.m-fieldset .m-form-tip {
678
678
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged {
679
679
  margin: 4px 0;
680
680
  padding: 4px 8px 6px;
681
- background-color: rgba(144, 105, 219, 0.06);
682
- border: 1px solid rgba(144, 105, 219, 0.18);
683
- border-left: 3px solid #9069db;
681
+ background-color: rgba(47, 84, 235, 0.06);
682
+ border: 1px solid rgba(47, 84, 235, 0.18);
683
+ border-left: 3px solid #2f54eb;
684
684
  border-radius: 4px;
685
685
  }
686
686
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged:hover {
687
- background-color: rgba(144, 105, 219, 0.1);
687
+ background-color: rgba(47, 84, 235, 0.1);
688
688
  }
689
689
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged .m-editor-history-list-group-head {
690
690
  font-weight: 600;
691
- color: #5b3fa5;
691
+ color: #1d39c4;
692
692
  }
693
693
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-undone {
694
694
  background-color: rgba(192, 196, 204, 0.08);
@@ -711,7 +711,7 @@ fieldset.m-fieldset .m-form-tip {
711
711
  margin: 6px 0 0 6px;
712
712
  padding: 0;
713
713
  list-style: none;
714
- border-left: 1px dashed rgba(144, 105, 219, 0.45);
714
+ border-left: 1px dashed rgba(47, 84, 235, 0.45);
715
715
  }
716
716
  .m-editor-history-list-popover .m-editor-history-list-substeps li {
717
717
  display: flex;
@@ -727,7 +727,7 @@ fieldset.m-fieldset .m-form-tip {
727
727
  cursor: pointer;
728
728
  }
729
729
  .m-editor-history-list-popover .m-editor-history-list-substeps li.is-clickable:hover {
730
- background-color: rgba(144, 105, 219, 0.1);
730
+ background-color: rgba(47, 84, 235, 0.1);
731
731
  }
732
732
  .m-editor-history-list-popover .m-editor-history-list-substeps li.is-undone {
733
733
  color: #c0c4cc;
@@ -756,6 +756,14 @@ fieldset.m-fieldset .m-form-tip {
756
756
  font-weight: 400;
757
757
  white-space: nowrap;
758
758
  }
759
+ .m-editor-history-list-popover .m-editor-history-list-item-time {
760
+ flex: 0 0 auto;
761
+ color: #a8abb2;
762
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
763
+ font-size: 11px;
764
+ font-weight: 400;
765
+ white-space: nowrap;
766
+ }
759
767
  .m-editor-history-list-popover .m-editor-history-list-item-op {
760
768
  flex: 0 0 auto;
761
769
  padding: 0 6px;
@@ -772,7 +780,7 @@ fieldset.m-fieldset .m-form-tip {
772
780
  background-color: #f56c6c;
773
781
  }
774
782
  .m-editor-history-list-popover .m-editor-history-list-item-op.op-update {
775
- background-color: #409eff;
783
+ background-color: #e6a23c;
776
784
  }
777
785
  .m-editor-history-list-popover .m-editor-history-list-item-op.op-initial {
778
786
  background-color: #909399;
@@ -796,6 +804,18 @@ fieldset.m-fieldset .m-form-tip {
796
804
  text-overflow: ellipsis;
797
805
  white-space: nowrap;
798
806
  }
807
+ .m-editor-history-list-popover .m-editor-history-list-item-source {
808
+ flex: 0 0 auto;
809
+ padding: 0 6px;
810
+ border: 1px solid #dcdfe6;
811
+ border-radius: 8px;
812
+ font-size: 10px;
813
+ line-height: 14px;
814
+ color: #909399;
815
+ background-color: #f4f4f5;
816
+ white-space: nowrap;
817
+ font-weight: 400;
818
+ }
799
819
  .m-editor-history-list-popover .m-editor-history-list-item-merge {
800
820
  flex: 0 0 auto;
801
821
  padding: 0 8px;
@@ -803,7 +823,7 @@ fieldset.m-fieldset .m-form-tip {
803
823
  font-size: 10px;
804
824
  line-height: 16px;
805
825
  color: #fff;
806
- background-color: #9069db;
826
+ background-color: #2f54eb;
807
827
  font-weight: 500;
808
828
  letter-spacing: 0.2px;
809
829
  }
@@ -821,19 +841,33 @@ fieldset.m-fieldset .m-form-tip {
821
841
  .m-editor-history-list-popover .m-editor-history-list-item-diff:hover {
822
842
  background-color: rgba(64, 158, 255, 0.2);
823
843
  }
844
+ .m-editor-history-list-popover .m-editor-history-list-item-goto {
845
+ flex: 0 0 auto;
846
+ padding: 0 6px;
847
+ border-radius: 2px;
848
+ font-size: 10px;
849
+ line-height: 16px;
850
+ color: #606266;
851
+ background-color: rgba(96, 98, 102, 0.1);
852
+ cursor: pointer;
853
+ user-select: none;
854
+ }
855
+ .m-editor-history-list-popover .m-editor-history-list-item-goto:hover {
856
+ background-color: rgba(96, 98, 102, 0.18);
857
+ }
824
858
  .m-editor-history-list-popover .m-editor-history-list-item-revert {
825
859
  flex: 0 0 auto;
826
860
  padding: 0 6px;
827
861
  border-radius: 2px;
828
862
  font-size: 10px;
829
863
  line-height: 16px;
830
- color: #e6a23c;
831
- background-color: rgba(230, 162, 60, 0.12);
864
+ color: #f56c6c;
865
+ background-color: rgba(245, 108, 108, 0.12);
832
866
  cursor: pointer;
833
867
  user-select: none;
834
868
  }
835
869
  .m-editor-history-list-popover .m-editor-history-list-item-revert:hover {
836
- background-color: rgba(230, 162, 60, 0.25);
870
+ background-color: rgba(245, 108, 108, 0.25);
837
871
  }
838
872
  .m-editor-history-list-popover .m-editor-history-list-substep-desc {
839
873
  flex: 1 1 auto;
@@ -878,6 +912,16 @@ fieldset.m-fieldset .m-form-tip {
878
912
  display: flex;
879
913
  flex-direction: column;
880
914
  }
915
+ .m-editor-history-diff-dialog .m-editor-history-diff-dialog-notice {
916
+ margin-bottom: 8px;
917
+ padding: 8px 12px;
918
+ background-color: #fdf6ec;
919
+ border: 1px solid #faecd8;
920
+ border-radius: 4px;
921
+ color: #e6a23c;
922
+ font-size: 13px;
923
+ line-height: 1.5;
924
+ }
881
925
  .m-editor-history-diff-dialog .m-editor-history-diff-dialog-header {
882
926
  display: flex;
883
927
  align-items: center;
@@ -1420,7 +1464,7 @@ fieldset.m-fieldset .m-form-tip {
1420
1464
  position: absolute;
1421
1465
  right: 15px;
1422
1466
  bottom: 15px;
1423
- z-index: 30;
1467
+ z-index: 32;
1424
1468
  opacity: 0.5;
1425
1469
  }
1426
1470
  .m-editor-props-panel .m-editor-props-panel-src-icon:hover {
@@ -1430,7 +1474,7 @@ fieldset.m-fieldset .m-form-tip {
1430
1474
  position: absolute;
1431
1475
  right: 15px;
1432
1476
  bottom: 60px;
1433
- z-index: 30;
1477
+ z-index: 31;
1434
1478
  opacity: 0.5;
1435
1479
  }
1436
1480
  .m-editor-props-panel .m-editor-props-panel-style-icon:hover {
@@ -1440,7 +1484,7 @@ fieldset.m-fieldset .m-form-tip {
1440
1484
  position: absolute;
1441
1485
  left: 0;
1442
1486
  top: 0;
1443
- z-index: 10;
1487
+ z-index: 31;
1444
1488
  }
1445
1489
  .m-editor-props-panel .m-editor-resizer {
1446
1490
  position: absolute;
package/dist/es/utils/content-menu.js CHANGED
@@ -4,7 +4,12 @@ import { NodeType, cloneDeep } from "@tmagic/core";
4
4
  import { computed, markRaw } from "vue";
5
5
  import { CopyDocument, Delete, DocumentCopy } from "@element-plus/icons-vue";
6
6
  //#region packages/editor/src/utils/content-menu.ts
7
- var useDeleteMenu = () => ({
7
+ /**
8
+ * 共享的右键菜单项构造器（画布 ViewerMenu 与图层树 LayerMenu 共用）。
9
+ * `historySource` 用于标记本次操作的途径，调用方按所在面板传入：
10
+ * 画布传 `'stage-contextmenu'`，树形面板传 `'tree-contextmenu'`。
11
+ */
12
+ var useDeleteMenu = (historySource) => ({
8
13
  type: "button",
9
14
  text: "删除",
10
15
  icon: Delete,
@@ -14,7 +19,7 @@ var useDeleteMenu = () => ({
14
19
  },
15
20
  handler: ({ editorService }) => {
16
21
  const nodes = editorService.get("nodes");
17
- nodes && editorService.remove(nodes);
22
+ nodes && editorService.remove(nodes, { historySource });
18
23
  }
19
24
  });
20
25
  var useCopyMenu = () => ({
@@ -26,7 +31,7 @@ var useCopyMenu = () => ({
26
31
  nodes && editorService?.copy(nodes);
27
32
  }
28
33
  });
29
- var usePasteMenu = (menu) => ({
34
+ var usePasteMenu = (historySource, menu) => ({
30
35
  type: "button",
31
36
  text: "粘贴",
32
37
  icon: markRaw(DocumentCopy),
@@ -43,17 +48,20 @@ var usePasteMenu = (menu) => ({
43
48
  editorService.paste({
44
49
  left: initialLeft,
45
50
  top: initialTop
46
- });
47
- } else editorService.paste();
51
+ }, void 0, { historySource });
52
+ } else editorService.paste(void 0, void 0, { historySource });
48
53
  }
49
54
  });
50
- var moveTo = async (id, { editorService }) => {
55
+ var moveTo = async (id, { editorService }, historySource) => {
51
56
  const nodes = editorService.get("nodes") || [];
52
57
  const parent = editorService.getNodeById(id);
53
58
  if (!parent || nodes.length === 0) return;
54
- await editorService.moveToContainer(cloneDeep(nodes), parent.id, { doNotSwitchPage: true });
59
+ await editorService.moveToContainer(cloneDeep(nodes), parent.id, {
60
+ doNotSwitchPage: true,
61
+ historySource
62
+ });
55
63
  };
56
- var useMoveToMenu = ({ editorService }) => {
64
+ var useMoveToMenu = ({ editorService }, historySource) => {
57
65
  return {
58
66
  type: "button",
59
67
  text: "移动至",
@@ -66,7 +74,7 @@ var useMoveToMenu = ({ editorService }) => {
66
74
  text: `${page.name}(${page.id})`,
67
75
  type: "button",
68
76
  handler: (services) => {
69
- moveTo(page.id, services);
77
+ moveTo(page.id, services, historySource);
70
78
  }
71
79
  }))
72
80
  };
package/dist/style.css CHANGED
@@ -592,7 +592,7 @@ fieldset.m-fieldset .m-form-tip {
592
592
  position: absolute;
593
593
  top: 4px;
594
594
  right: 4px;
595
- z-index: 1;
595
+ z-index: 2;
596
596
  display: flex;
597
597
  align-items: center;
598
598
  height: 40px;
@@ -678,17 +678,17 @@ fieldset.m-fieldset .m-form-tip {
678
678
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged {
679
679
  margin: 4px 0;
680
680
  padding: 4px 8px 6px;
681
- background-color: rgba(144, 105, 219, 0.06);
682
- border: 1px solid rgba(144, 105, 219, 0.18);
683
- border-left: 3px solid #9069db;
681
+ background-color: rgba(47, 84, 235, 0.06);
682
+ border: 1px solid rgba(47, 84, 235, 0.18);
683
+ border-left: 3px solid #2f54eb;
684
684
  border-radius: 4px;
685
685
  }
686
686
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged:hover {
687
- background-color: rgba(144, 105, 219, 0.1);
687
+ background-color: rgba(47, 84, 235, 0.1);
688
688
  }
689
689
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged .m-editor-history-list-group-head {
690
690
  font-weight: 600;
691
- color: #5b3fa5;
691
+ color: #1d39c4;
692
692
  }
693
693
  .m-editor-history-list-popover .m-editor-history-list-group.is-merged.is-undone {
694
694
  background-color: rgba(192, 196, 204, 0.08);
@@ -711,7 +711,7 @@ fieldset.m-fieldset .m-form-tip {
711
711
  margin: 6px 0 0 6px;
712
712
  padding: 0;
713
713
  list-style: none;
714
- border-left: 1px dashed rgba(144, 105, 219, 0.45);
714
+ border-left: 1px dashed rgba(47, 84, 235, 0.45);
715
715
  }
716
716
  .m-editor-history-list-popover .m-editor-history-list-substeps li {
717
717
  display: flex;
@@ -727,7 +727,7 @@ fieldset.m-fieldset .m-form-tip {
727
727
  cursor: pointer;
728
728
  }
729
729
  .m-editor-history-list-popover .m-editor-history-list-substeps li.is-clickable:hover {
730
- background-color: rgba(144, 105, 219, 0.1);
730
+ background-color: rgba(47, 84, 235, 0.1);
731
731
  }
732
732
  .m-editor-history-list-popover .m-editor-history-list-substeps li.is-undone {
733
733
  color: #c0c4cc;
@@ -756,6 +756,14 @@ fieldset.m-fieldset .m-form-tip {
756
756
  font-weight: 400;
757
757
  white-space: nowrap;
758
758
  }
759
+ .m-editor-history-list-popover .m-editor-history-list-item-time {
760
+ flex: 0 0 auto;
761
+ color: #a8abb2;
762
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
763
+ font-size: 11px;
764
+ font-weight: 400;
765
+ white-space: nowrap;
766
+ }
759
767
  .m-editor-history-list-popover .m-editor-history-list-item-op {
760
768
  flex: 0 0 auto;
761
769
  padding: 0 6px;
@@ -772,7 +780,7 @@ fieldset.m-fieldset .m-form-tip {
772
780
  background-color: #f56c6c;
773
781
  }
774
782
  .m-editor-history-list-popover .m-editor-history-list-item-op.op-update {
775
- background-color: #409eff;
783
+ background-color: #e6a23c;
776
784
  }
777
785
  .m-editor-history-list-popover .m-editor-history-list-item-op.op-initial {
778
786
  background-color: #909399;
@@ -796,6 +804,18 @@ fieldset.m-fieldset .m-form-tip {
796
804
  text-overflow: ellipsis;
797
805
  white-space: nowrap;
798
806
  }
807
+ .m-editor-history-list-popover .m-editor-history-list-item-source {
808
+ flex: 0 0 auto;
809
+ padding: 0 6px;
810
+ border: 1px solid #dcdfe6;
811
+ border-radius: 8px;
812
+ font-size: 10px;
813
+ line-height: 14px;
814
+ color: #909399;
815
+ background-color: #f4f4f5;
816
+ white-space: nowrap;
817
+ font-weight: 400;
818
+ }
799
819
  .m-editor-history-list-popover .m-editor-history-list-item-merge {
800
820
  flex: 0 0 auto;
801
821
  padding: 0 8px;
@@ -803,7 +823,7 @@ fieldset.m-fieldset .m-form-tip {
803
823
  font-size: 10px;
804
824
  line-height: 16px;
805
825
  color: #fff;
806
- background-color: #9069db;
826
+ background-color: #2f54eb;
807
827
  font-weight: 500;
808
828
  letter-spacing: 0.2px;
809
829
  }
@@ -821,19 +841,33 @@ fieldset.m-fieldset .m-form-tip {
821
841
  .m-editor-history-list-popover .m-editor-history-list-item-diff:hover {
822
842
  background-color: rgba(64, 158, 255, 0.2);
823
843
  }
844
+ .m-editor-history-list-popover .m-editor-history-list-item-goto {
845
+ flex: 0 0 auto;
846
+ padding: 0 6px;
847
+ border-radius: 2px;
848
+ font-size: 10px;
849
+ line-height: 16px;
850
+ color: #606266;
851
+ background-color: rgba(96, 98, 102, 0.1);
852
+ cursor: pointer;
853
+ user-select: none;
854
+ }
855
+ .m-editor-history-list-popover .m-editor-history-list-item-goto:hover {
856
+ background-color: rgba(96, 98, 102, 0.18);
857
+ }
824
858
  .m-editor-history-list-popover .m-editor-history-list-item-revert {
825
859
  flex: 0 0 auto;
826
860
  padding: 0 6px;
827
861
  border-radius: 2px;
828
862
  font-size: 10px;
829
863
  line-height: 16px;
830
- color: #e6a23c;
831
- background-color: rgba(230, 162, 60, 0.12);
864
+ color: #f56c6c;
865
+ background-color: rgba(245, 108, 108, 0.12);
832
866
  cursor: pointer;
833
867
  user-select: none;
834
868
  }
835
869
  .m-editor-history-list-popover .m-editor-history-list-item-revert:hover {
836
- background-color: rgba(230, 162, 60, 0.25);
870
+ background-color: rgba(245, 108, 108, 0.25);
837
871
  }
838
872
  .m-editor-history-list-popover .m-editor-history-list-substep-desc {
839
873
  flex: 1 1 auto;
@@ -878,6 +912,16 @@ fieldset.m-fieldset .m-form-tip {
878
912
  display: flex;
879
913
  flex-direction: column;
880
914
  }
915
+ .m-editor-history-diff-dialog .m-editor-history-diff-dialog-notice {
916
+ margin-bottom: 8px;
917
+ padding: 8px 12px;
918
+ background-color: #fdf6ec;
919
+ border: 1px solid #faecd8;
920
+ border-radius: 4px;
921
+ color: #e6a23c;
922
+ font-size: 13px;
923
+ line-height: 1.5;
924
+ }
881
925
  .m-editor-history-diff-dialog .m-editor-history-diff-dialog-header {
882
926
  display: flex;
883
927
  align-items: center;
@@ -1420,7 +1464,7 @@ fieldset.m-fieldset .m-form-tip {
1420
1464
  position: absolute;
1421
1465
  right: 15px;
1422
1466
  bottom: 15px;
1423
- z-index: 30;
1467
+ z-index: 32;
1424
1468
  opacity: 0.5;
1425
1469
  }
1426
1470
  .m-editor-props-panel .m-editor-props-panel-src-icon:hover {
@@ -1430,7 +1474,7 @@ fieldset.m-fieldset .m-form-tip {
1430
1474
  position: absolute;
1431
1475
  right: 15px;
1432
1476
  bottom: 60px;
1433
- z-index: 30;
1477
+ z-index: 31;
1434
1478
  opacity: 0.5;
1435
1479
  }
1436
1480
  .m-editor-props-panel .m-editor-props-panel-style-icon:hover {
@@ -1440,7 +1484,7 @@ fieldset.m-fieldset .m-form-tip {
1440
1484
  position: absolute;
1441
1485
  left: 0;
1442
1486
  top: 0;
1443
- z-index: 10;
1487
+ z-index: 31;
1444
1488
  }
1445
1489
  .m-editor-props-panel .m-editor-resizer {
1446
1490
  position: absolute;