@tmagic/editor 1.8.0-manmanyu.25 → 1.8.0-manmanyu.27

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 (7) hide show
  1. package/dist/es/style.css +18 -2
  2. package/dist/style.css +18 -2
  3. package/dist/themes/magic-admin.css +31 -2
  4. package/package.json +7 -7
  5. package/src/theme/framework.scss +4 -1
  6. package/src/theme/nav-menu.scss +5 -1
  7. package/src/theme/themes/magic-admin/index.scss +18 -0
package/dist/es/style.css CHANGED
@@ -168,6 +168,22 @@
168
168
  color: #999;
169
169
  }
170
170
 
171
+ .tmagic-table-sub-actions {
172
+ display: flex;
173
+ flex-direction: column;
174
+ gap: 4px;
175
+ align-items: flex-start;
176
+ }
177
+ .tmagic-table-sub-actions .sub-action-btn {
178
+ width: 100%;
179
+ }
180
+ .tmagic-table-sub-actions .tmagic-design-button + .tmagic-design-button {
181
+ margin-left: 0;
182
+ }
183
+ .tmagic-table-sub-actions .tmagic-design-button {
184
+ justify-content: flex-start;
185
+ }
186
+
171
187
  .tmagic-design-form-inline .m-form-container {
172
188
  display: inline-flex;
173
189
  }
@@ -638,7 +654,7 @@ fieldset.m-fieldset .m-form-tip {
638
654
  font-weight: 400;
639
655
  box-sizing: border-box;
640
656
  margin: 0px;
641
- flex: 0 0 35px;
657
+ flex: 0 0 var(--editor-nav-height, 35px);
642
658
  border-bottom: 1px solid #d8dee8;
643
659
  }
644
660
  .m-editor-nav-menu > div {
@@ -1199,7 +1215,7 @@ fieldset.m-fieldset .m-form-tip {
1199
1215
  width: 100%;
1200
1216
  }
1201
1217
  .m-editor-content {
1202
- height: calc(100% - 35px);
1218
+ height: calc(100% - var(--editor-nav-height, 35px));
1203
1219
  }
1204
1220
  .m-editor-framework-center {
1205
1221
  position: relative;
package/dist/style.css CHANGED
@@ -168,6 +168,22 @@
168
168
  color: #999;
169
169
  }
170
170
 
171
+ .tmagic-table-sub-actions {
172
+ display: flex;
173
+ flex-direction: column;
174
+ gap: 4px;
175
+ align-items: flex-start;
176
+ }
177
+ .tmagic-table-sub-actions .sub-action-btn {
178
+ width: 100%;
179
+ }
180
+ .tmagic-table-sub-actions .tmagic-design-button + .tmagic-design-button {
181
+ margin-left: 0;
182
+ }
183
+ .tmagic-table-sub-actions .tmagic-design-button {
184
+ justify-content: flex-start;
185
+ }
186
+
171
187
  .tmagic-design-form-inline .m-form-container {
172
188
  display: inline-flex;
173
189
  }
@@ -638,7 +654,7 @@ fieldset.m-fieldset .m-form-tip {
638
654
  font-weight: 400;
639
655
  box-sizing: border-box;
640
656
  margin: 0px;
641
- flex: 0 0 35px;
657
+ flex: 0 0 var(--editor-nav-height, 35px);
642
658
  border-bottom: 1px solid #d8dee8;
643
659
  }
644
660
  .m-editor-nav-menu > div {
@@ -1199,7 +1215,7 @@ fieldset.m-fieldset .m-form-tip {
1199
1215
  width: 100%;
1200
1216
  }
1201
1217
  .m-editor-content {
1202
- height: calc(100% - 35px);
1218
+ height: calc(100% - var(--editor-nav-height, 35px));
1203
1219
  }
1204
1220
  .m-editor-framework-center {
1205
1221
  position: relative;
package/dist/themes/magic-admin.css CHANGED
@@ -148,6 +148,22 @@
148
148
  color: #999;
149
149
  }
150
150
 
151
+ .tmagic-table-sub-actions {
152
+ display: flex;
153
+ flex-direction: column;
154
+ gap: 4px;
155
+ align-items: flex-start;
156
+ }
157
+ .tmagic-table-sub-actions .sub-action-btn {
158
+ width: 100%;
159
+ }
160
+ .tmagic-table-sub-actions .tmagic-design-button + .tmagic-design-button {
161
+ margin-left: 0;
162
+ }
163
+ .tmagic-table-sub-actions .tmagic-design-button {
164
+ justify-content: flex-start;
165
+ }
166
+
151
167
  .tmagic-design-form-inline .m-form-container {
152
168
  display: inline-flex;
153
169
  }
@@ -671,7 +687,7 @@ fieldset.m-fieldset .m-form-tip {
671
687
  font-weight: 400;
672
688
  box-sizing: border-box;
673
689
  margin: 0px;
674
- flex: 0 0 35px;
690
+ flex: 0 0 var(--editor-nav-height, 35px);
675
691
  border-bottom: 1px solid #d8dee8;
676
692
  }
677
693
  .m-editor-nav-menu > div {
@@ -1232,7 +1248,7 @@ fieldset.m-fieldset .m-form-tip {
1232
1248
  width: 100%;
1233
1249
  }
1234
1250
  .m-editor-content {
1235
- height: calc(100% - 35px);
1251
+ height: calc(100% - var(--editor-nav-height, 35px));
1236
1252
  }
1237
1253
  .m-editor-framework-center {
1238
1254
  position: relative;
@@ -2761,6 +2777,9 @@ fieldset.m-fieldset .m-form-tip {
2761
2777
  opacity: 0;
2762
2778
  }
2763
2779
 
2780
+ .m-editor.m-editor--magic-admin {
2781
+ --editor-nav-height: 40px;
2782
+ }
2764
2783
  .m-editor.m-editor--magic-admin .m-editor-sidebar .m-editor-sidebar-header {
2765
2784
  width: 61px;
2766
2785
  padding-top: 4px;
@@ -2891,6 +2910,16 @@ fieldset.m-fieldset .m-form-tip {
2891
2910
  display: none;
2892
2911
  }
2893
2912
 
2913
+ .m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-right > .menu-item > button,
2914
+ .m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-left > .menu-item > button {
2915
+ color: #111;
2916
+ }
2917
+ .m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-item {
2918
+ margin-right: 8px;
2919
+ }
2920
+ .m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-item .el-button--small {
2921
+ font-size: 14px;
2922
+ }
2894
2923
  .m-editor.m-theme--magic-admin .m-editor-nav-menu .menu-item > button > i {
2895
2924
  font-size: 16px;
2896
2925
  }
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "1.8.0-manmanyu.25",
2
+ "version": "1.8.0-manmanyu.27",
3
3
  "name": "@tmagic/editor",
4
4
  "type": "module",
5
5
  "sideEffects": [
@@ -58,11 +58,11 @@
58
58
  "moveable": "^0.53.0",
59
59
  "serialize-javascript": "^7.0.0",
60
60
  "sortablejs": "^1.15.6",
61
- "@tmagic/design": "1.8.0-manmanyu.25",
62
- "@tmagic/stage": "1.8.0-manmanyu.25",
63
- "@tmagic/table": "1.8.0-manmanyu.25",
64
- "@tmagic/form": "1.8.0-manmanyu.25",
65
- "@tmagic/utils": "1.8.0-manmanyu.25"
61
+ "@tmagic/design": "1.8.0-manmanyu.27",
62
+ "@tmagic/form": "1.8.0-manmanyu.27",
63
+ "@tmagic/stage": "1.8.0-manmanyu.27",
64
+ "@tmagic/table": "1.8.0-manmanyu.27",
65
+ "@tmagic/utils": "1.8.0-manmanyu.27"
66
66
  },
67
67
  "devDependencies": {
68
68
  "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
76
76
  "type-fest": "^5.2.0",
77
77
  "typescript": "^6.0.3",
78
78
  "vue": "^3.5.38",
79
- "@tmagic/core": "1.8.0-manmanyu.25"
79
+ "@tmagic/core": "1.8.0-manmanyu.27"
80
80
  },
81
81
  "peerDependenciesMeta": {
82
82
  "typescript": {
package/src/theme/framework.scss CHANGED
@@ -6,7 +6,10 @@
6
6
  width: 100%;
7
7
 
8
8
  &-content {
9
- height: calc(100% - #{$nav-height});
9
+ // 与 nav-menu.scss 的 `--editor-nav-height` 联动：默认 fallback 到 SCSS
10
+ // `$nav-height`（35px），主题覆盖时两处会同时切成同一个高度，保证 nav 和
11
+ // 主内容区总高度 = 100%。
12
+ height: calc(100% - var(--editor-nav-height, #{$nav-height}));
10
13
  }
11
14
 
12
15
  &-framework-center {
package/src/theme/nav-menu.scss CHANGED
@@ -13,7 +13,11 @@
13
13
  font-weight: 400;
14
14
  box-sizing: border-box;
15
15
  margin: 0px;
16
- flex: 0 0 $nav-height;
16
+ // 用 CSS 变量做主题化开关：默认没设 `--editor-nav-height` 时回落到
17
+ // SCSS 变量 `$nav-height`（common/var.scss，35px）；主题（如 magic-admin）
18
+ // 只需在祖先节点声明 `--editor-nav-height: 40px` 即可运行时覆盖，避免
19
+ // 走 `@use with` 那条对加载顺序极敏感的 SCSS 模块配置路径。
20
+ flex: 0 0 var(--editor-nav-height, #{$nav-height});
17
21
  border-bottom: 1px solid #d8dee8;
18
22
 
19
23
  > div {
package/src/theme/themes/magic-admin/index.scss CHANGED
@@ -17,6 +17,12 @@
17
17
  // 仅作用于编辑器内部 DOM 的具体样式仍保留「双类」，避免误中 portal 上只挂 `m-theme--*`
18
18
  // 的节点。
19
19
  .m-editor.m-editor--magic-admin {
20
+ // 主题级 CSS 变量入口：想覆盖 nav 高度等 token 时，改这里一行即可；
21
+ // 走 CSS 级联，运行时切主题（换 `.m-editor--magic-admin` class）即可即时生效，
22
+ // 不受 SCSS `@use` 加载顺序限制。fallback 值定义在 common/var.scss，未启用主题
23
+ // 时自动回落 35px。
24
+ --editor-nav-height: 40px;
25
+
20
26
  .m-editor-sidebar {
21
27
  .m-editor-sidebar-header {
22
28
  // padding: 8px 0;
@@ -185,7 +191,19 @@
185
191
 
186
192
  .m-editor.m-theme--magic-admin {
187
193
  .m-editor-nav-menu {
194
+ .menu-right,
195
+ .menu-left {
196
+ > .menu-item {
197
+ > button {
198
+ color: #111;
199
+ }
200
+ }
201
+ }
188
202
  .menu-item {
203
+ margin-right: 8px;
204
+ .el-button--small {
205
+ font-size: 14px;
206
+ }
189
207
  > button {
190
208
  > i {
191
209
  font-size: 16px;