@jx3box/jx3box-editor 2.2.38 → 2.2.40

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.
@@ -1,6 +1,11 @@
1
1
  // 输出样式
2
2
  .w-qixue-box {
3
3
  @url: "https://img.jx3box.com/img/";
4
+ @color-0-border: "@{url}qixue/newqixue1_9.png";
5
+ @color-1-border: "@{url}qixue/newqixue1_1.png";
6
+ @color-2-border: "@{url}qixue/newqixue1_2.png";
7
+ @color-3-border: "@{url}qixue/newqixue1_4.png";
8
+ @color-4-border: "@{url}qixue/newqixue1_5.png";
4
9
 
5
10
  zoom: 1;
6
11
 
@@ -12,6 +17,7 @@
12
17
  @out-bo: 2px;
13
18
  @lp:@xf-l + @xf-r + @xf + @out-bo;
14
19
  @space: 10px;
20
+ @big-space: 30px;
15
21
  @bo: 2px;
16
22
 
17
23
  //局部z级别
@@ -22,9 +28,7 @@
22
28
  color: #fff;
23
29
  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
24
30
  }
25
- // .dbi;
26
- display:inline-flex;
27
-
31
+ .dbi;
28
32
  background-color: @color;
29
33
  .r(5px);
30
34
  border: @out-bo solid @gray;
@@ -33,14 +37,13 @@
33
37
  padding-top: 8px;
34
38
  padding-bottom: 8px;
35
39
  padding-right: 20px;
36
- // padding-left: 10px;
37
40
  white-space: nowrap;
38
41
  font-size: 0;
39
42
  // width:860px;
40
43
  // overflow-x: auto;
41
44
  // display: block;
42
45
 
43
- &.isQQBrowser{
46
+ &.isQQBrowser {
44
47
  padding-right: 30px !important; //fix
45
48
  }
46
49
 
@@ -63,12 +66,12 @@
63
66
 
64
67
  //心法label
65
68
  .w-qixue-xf {
66
- // .dbi;
69
+ .dbi;
67
70
  .y(top);
68
71
  .fz(14px);
69
72
  .white;
70
73
  .x;
71
-
74
+ padding: 0 4px 0 0;
72
75
  box-sizing: border-box;
73
76
  .retext(y);
74
77
  background: url("@{url}qixue/label.png") no-repeat 0 0;
@@ -82,12 +85,8 @@
82
85
  margin-top: 0;
83
86
  margin-bottom: 0;
84
87
  line-height: 1.1;
85
- padding-right:5px;
86
- letter-spacing:1px;
87
-
88
- // word-wrap: break-word;
89
- // padding-left:26px;
90
- // white-space: wrap;
88
+ // 不知道哪个地方加了这个属性,找不到,先覆盖掉了。
89
+ text-combine-upright: none !important;
91
90
  }
92
91
 
93
92
  .w-qixue-clist {
@@ -97,6 +96,32 @@
97
96
  //公共单项
98
97
  .w-qixue-clist-item,
99
98
  .w-qixue-olist-item {
99
+ &[data-color="0"]:not([data-is_skill="1"]) .u-pic {
100
+ &:after {
101
+ background: url("@{color-0-border}") no-repeat 0 0;
102
+ }
103
+ }
104
+ &[data-color="1"] .u-pic {
105
+ &:after {
106
+ background: url("@{color-1-border}") no-repeat 0 0;
107
+ }
108
+ }
109
+ &[data-color="2"] .u-pic {
110
+ &:after {
111
+ background: url("@{color-2-border}") no-repeat 0 0;
112
+ }
113
+ }
114
+ &[data-color="3"] .u-pic {
115
+ &:after {
116
+ background: url("@{color-3-border}") no-repeat 0 0;
117
+ }
118
+ }
119
+ &[data-color="4"] .u-pic {
120
+ &:after {
121
+ background: url("@{color-4-border}") no-repeat 0 0;
122
+ }
123
+ }
124
+
100
125
  .u-pic {
101
126
  .db;
102
127
  .pr;
@@ -106,11 +131,13 @@
106
131
  .db;
107
132
  }
108
133
  &:after {
109
- .size(52px);
134
+ .size(80px);
110
135
  .pa;
111
- .lt(-2px,-2px);
112
- background: url("@{url}qixue/bg.png") no-repeat 0 0;
136
+ .lt(-10px,-10px);
113
137
  .z(@icon-decorate + 1);
138
+ pointer-events: none;
139
+ transform: scale(1.06);
140
+ transform-origin: center;
114
141
  }
115
142
  }
116
143
  img {
@@ -119,6 +146,8 @@
119
146
  padding: 0;
120
147
  margin: 0;
121
148
  border: none;
149
+ border: 2px solid #485053;
150
+ box-sizing: border-box;
122
151
  }
123
152
  .u-title {
124
153
  .white;
@@ -156,19 +185,22 @@
156
185
  margin-right: 0;
157
186
  }
158
187
 
159
- /* &.w-qixue-isskill .u-pic{
160
- &:before{
161
- .pa;.lt(0);
162
- .full;
163
- border:2px solid @color-cyan;
164
- }
165
- } */
188
+ &.w-qixue-type-1-last,
189
+ &.w-qixue-type-2-last {
190
+ .mr(@big-space);
191
+ }
192
+
193
+ &[data-type="3"]:not(.w-qixue-type-3-center)::before {
194
+ opacity: 0;
195
+ }
166
196
 
167
197
  &:before {
198
+ .pr;
168
199
  content: "";
169
- .size(44px,11px);
200
+ .size(46px,12px);
170
201
  background: url("@{url}qixue/fold.png") no-repeat 0 0;
171
- margin: 0 2px;
202
+ bottom: 2px;
203
+ .z(@icon-decorate + 2);
172
204
 
173
205
  .none;
174
206
  }
@@ -187,20 +219,27 @@
187
219
  .none;
188
220
  }
189
221
  //全部扩展列表容器
222
+
190
223
  .w-qixue-obox {
191
224
  .pa;
192
225
  .lb(@lp,100%);
193
226
  white-space: nowrap;
194
227
  font-size: 0;
195
228
  &.on {
196
- .db;
229
+ display: flex;
230
+ flex-direction: row;
231
+ align-items: flex-end;
232
+ }
233
+ }
234
+ // 新版奇穴限制最大高度,旧版的最多五个无需限制
235
+ &:not(.w-qixue-v20250921) {
236
+ .w-qixue-olist {
237
+ max-height: unset;
197
238
  }
198
239
  }
199
- //单个扩展列表
200
240
  .w-qixue-olist {
201
241
  .pr;
202
242
  .z(1000);
203
- .dbi;
204
243
  .y(bottom);
205
244
  background-color: @color;
206
245
  padding: @space - @bo;
@@ -210,6 +249,22 @@
210
249
  border-bottom: none;
211
250
  box-shadow: 3px -3px 3px rgba(0, 0, 0, 0.4);
212
251
 
252
+ display: flex;
253
+ flex-direction: row;
254
+ flex-wrap: wrap;
255
+ width: min-content;
256
+ max-height: 304px;
257
+ gap: 8px 20px;
258
+
259
+ &.w-qixue-type-3 {
260
+ width: 184px;
261
+ }
262
+
263
+ &.w-qixue-type-1-last,
264
+ &.w-qixue-type-2-last {
265
+ .mr(30px);
266
+ }
267
+
213
268
  &:last-child {
214
269
  margin-right: 0;
215
270
  }
@@ -220,7 +275,6 @@
220
275
  }
221
276
  }
222
277
  .w-qixue-olist-item {
223
- margin-bottom: 8px;
224
278
  .pr;
225
279
 
226
280
  .u-pic {
@@ -234,7 +288,8 @@
234
288
  }
235
289
  }
236
290
 
237
- &:hover {
291
+ &:hover:not(.is-disabled),
292
+ &.is-active {
238
293
  .u-pic {
239
294
  &:before {
240
295
  .tm(0);
@@ -242,6 +297,10 @@
242
297
  }
243
298
  }
244
299
 
300
+ &.is-disabled {
301
+ cursor: not-allowed;
302
+ }
303
+
245
304
  &:last-child {
246
305
  margin-bottom: 0;
247
306
  }
@@ -254,9 +313,6 @@
254
313
  img {
255
314
  .r(0);
256
315
  }
257
- &:after {
258
- .none;
259
- }
260
316
  }
261
317
  }
262
318
 
@@ -270,7 +326,7 @@
270
326
  .r(3px);
271
327
  padding: 10px;
272
328
  width: 320px;
273
- max-width:none;
329
+ max-width: none;
274
330
 
275
331
  * {
276
332
  .db;
@@ -325,18 +381,24 @@
325
381
  .w-qixue-xf {
326
382
  .none;
327
383
  }
328
- .w-qixue-clist{
384
+ .w-qixue-clist {
329
385
  // .w(100%);
330
386
  // overflow-x: auto;
331
387
  .db;
332
388
  .clearfix;
333
- margin-top:0;
389
+ margin-top: 0;
390
+ .w-qixue-clist-item {
391
+ &.w-qixue-type-1-last,
392
+ &.w-qixue-type-2-last {
393
+ .mr(unset);
394
+ }
395
+ }
334
396
  }
335
397
  }
336
398
  }
337
399
 
338
400
  .w-qixue-editable {
339
- .w-qixue-xf{
401
+ .w-qixue-xf {
340
402
  margin-top: 5px;
341
403
  }
342
404
  li {
@@ -386,11 +448,13 @@
386
448
  .w-qixue-obox {
387
449
  left: 0;
388
450
  }
451
+
389
452
  .w-qixue-olist {
390
453
  .clearfix;
391
454
  .none;
392
455
  &.on {
393
456
  .db;
457
+ width: unset;
394
458
  }
395
459
 
396
460
  li {
@@ -411,14 +475,14 @@
411
475
  }
412
476
 
413
477
  // 打印样式
414
- @media print{
415
- .w-qixue-box{
478
+ @media print {
479
+ .w-qixue-box {
416
480
  page-break-inside: avoid !important;
417
- padding-right:40px;
418
- .w-qixue-clist-item{
419
- padding-left:5px;
420
- padding-right:0;
481
+ padding-right: 40px;
482
+ .w-qixue-clist-item {
483
+ padding-left: 5px;
484
+ padding-right: 0;
421
485
  transform: scale(0.85);
422
486
  }
423
487
  }
424
- }
488
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-editor",
3
- "version": "2.2.38",
3
+ "version": "2.2.40",
4
4
  "description": "JX3BOX Article & Editor",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -33,10 +33,10 @@
33
33
  ],
34
34
  "dependencies": {
35
35
  "@jx3box/jx3box-common": "^8.7.4",
36
- "@jx3box/jx3box-data": "^3.8.8",
36
+ "@jx3box/jx3box-data": "^3.8.9",
37
37
  "@jx3box/jx3box-emotion": "^1.2.14",
38
38
  "@jx3box/jx3box-macro": "^1.0.1",
39
- "@jx3box/jx3box-talent": "^1.3.6",
39
+ "@jx3box/jx3box-talent": "^1.3.9",
40
40
  "@jx3box/markdown": "^0.1.5",
41
41
  "@tinymce/tinymce-vue": "^3.2.2",
42
42
  "axios": "^0.19.2",
@@ -711,7 +711,8 @@
711
711
  }
712
712
  .w-qixue-box {
713
713
  zoom: 1;
714
- display: inline-flex;
714
+ display: inline-block;
715
+ *display: inline;
715
716
  background-color: #2e4946;
716
717
  border-radius: 5px;
717
718
  border: 2px solid #6f888a;
@@ -743,11 +744,15 @@
743
744
  user-select: none;
744
745
  }
745
746
  .w-qixue-box .w-qixue-xf {
747
+ display: inline-block;
748
+ *display: inline;
749
+ *zoom: 1;
746
750
  vertical-align: top;
747
751
  font-size: 14px;
748
752
  color: #fff;
749
753
  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
750
754
  text-align: center;
755
+ padding: 0 4px 0 0;
751
756
  box-sizing: border-box;
752
757
  writing-mode: tb-rl;
753
758
  writing-mode: vertical-rl;
@@ -762,12 +767,30 @@
762
767
  margin-top: 0;
763
768
  margin-bottom: 0;
764
769
  line-height: 1.1;
765
- padding-right: 5px;
766
- letter-spacing: 1px;
767
770
  }
768
771
  .w-qixue-box .w-qixue-clist {
769
772
  margin: 0;
770
773
  }
774
+ .w-qixue-box .w-qixue-clist-item[data-color="0"]:not([data-is_skill="1"]) .u-pic:after,
775
+ .w-qixue-box .w-qixue-olist-item[data-color="0"]:not([data-is_skill="1"]) .u-pic:after {
776
+ background: url("https://img.jx3box.com/img/qixue/newqixue1_9.png") no-repeat 0 0;
777
+ }
778
+ .w-qixue-box .w-qixue-clist-item[data-color="1"] .u-pic:after,
779
+ .w-qixue-box .w-qixue-olist-item[data-color="1"] .u-pic:after {
780
+ background: url("https://img.jx3box.com/img/qixue/newqixue1_1.png") no-repeat 0 0;
781
+ }
782
+ .w-qixue-box .w-qixue-clist-item[data-color="2"] .u-pic:after,
783
+ .w-qixue-box .w-qixue-olist-item[data-color="2"] .u-pic:after {
784
+ background: url("https://img.jx3box.com/img/qixue/newqixue1_2.png") no-repeat 0 0;
785
+ }
786
+ .w-qixue-box .w-qixue-clist-item[data-color="3"] .u-pic:after,
787
+ .w-qixue-box .w-qixue-olist-item[data-color="3"] .u-pic:after {
788
+ background: url("https://img.jx3box.com/img/qixue/newqixue1_4.png") no-repeat 0 0;
789
+ }
790
+ .w-qixue-box .w-qixue-clist-item[data-color="4"] .u-pic:after,
791
+ .w-qixue-box .w-qixue-olist-item[data-color="4"] .u-pic:after {
792
+ background: url("https://img.jx3box.com/img/qixue/newqixue1_5.png") no-repeat 0 0;
793
+ }
771
794
  .w-qixue-box .w-qixue-clist-item .u-pic,
772
795
  .w-qixue-box .w-qixue-olist-item .u-pic {
773
796
  display: block;
@@ -783,13 +806,15 @@
783
806
  }
784
807
  .w-qixue-box .w-qixue-clist-item .u-pic:after,
785
808
  .w-qixue-box .w-qixue-olist-item .u-pic:after {
786
- width: 52px;
787
- height: 52px;
809
+ width: 80px;
810
+ height: 80px;
788
811
  position: absolute;
789
- left: -2px;
790
- top: -2px;
791
- background: url("https://img.jx3box.com/img/qixue/bg.png") no-repeat 0 0;
812
+ left: -10px;
813
+ top: -10px;
792
814
  z-index: 6;
815
+ pointer-events: none;
816
+ transform: scale(1.06);
817
+ transform-origin: center;
793
818
  }
794
819
  .w-qixue-box .w-qixue-clist-item img,
795
820
  .w-qixue-box .w-qixue-olist-item img {
@@ -797,6 +822,8 @@
797
822
  padding: 0;
798
823
  margin: 0;
799
824
  border: none;
825
+ border: 2px solid #485053;
826
+ box-sizing: border-box;
800
827
  }
801
828
  .w-qixue-box .w-qixue-clist-item .u-title,
802
829
  .w-qixue-box .w-qixue-olist-item .u-title {
@@ -831,23 +858,26 @@
831
858
  padding-right: 10px;
832
859
  position: relative;
833
860
  *zoom: 1;
834
- /* &.w-qixue-isskill .u-pic{
835
- &:before{
836
- .pa;.lt(0);
837
- .full;
838
- border:2px solid @color-cyan;
839
- }
840
- } */
841
861
  }
842
862
  .w-qixue-box .w-qixue-clist-item:last-child {
843
863
  margin-right: 0;
844
864
  }
865
+ .w-qixue-box .w-qixue-clist-item.w-qixue-type-1-last,
866
+ .w-qixue-box .w-qixue-clist-item.w-qixue-type-2-last {
867
+ margin-right: 30px;
868
+ }
869
+ .w-qixue-box .w-qixue-clist-item[data-type="3"]:not(.w-qixue-type-3-center)::before {
870
+ opacity: 0;
871
+ }
845
872
  .w-qixue-box .w-qixue-clist-item:before {
873
+ position: relative;
874
+ *zoom: 1;
846
875
  content: "";
847
- width: 44px;
848
- height: 11px;
876
+ width: 46px;
877
+ height: 12px;
849
878
  background: url("https://img.jx3box.com/img/qixue/fold.png") no-repeat 0 0;
850
- margin: 0 2px;
879
+ bottom: 2px;
880
+ z-index: 7;
851
881
  display: none;
852
882
  }
853
883
  .w-qixue-box .w-qixue-clist-item.on:before {
@@ -866,14 +896,17 @@
866
896
  font-size: 0;
867
897
  }
868
898
  .w-qixue-box .w-qixue-obox.on {
869
- display: block;
899
+ display: flex;
900
+ flex-direction: row;
901
+ align-items: flex-end;
902
+ }
903
+ .w-qixue-box:not(.w-qixue-v20250921) .w-qixue-olist {
904
+ max-height: unset;
870
905
  }
871
906
  .w-qixue-box .w-qixue-olist {
872
907
  position: relative;
873
- z-index: 1000;
874
- display: inline-block;
875
- *display: inline;
876
908
  *zoom: 1;
909
+ z-index: 1000;
877
910
  vertical-align: bottom;
878
911
  background-color: #2e4946;
879
912
  padding: 8px;
@@ -882,8 +915,21 @@
882
915
  border: 2px solid #6f888a;
883
916
  border-bottom: none;
884
917
  box-shadow: 3px -3px 3px rgba(0, 0, 0, 0.4);
918
+ display: flex;
919
+ flex-direction: row;
920
+ flex-wrap: wrap;
921
+ width: min-content;
922
+ max-height: 304px;
923
+ gap: 8px 20px;
885
924
  transform: scale(0);
886
925
  }
926
+ .w-qixue-box .w-qixue-olist.w-qixue-type-3 {
927
+ width: 184px;
928
+ }
929
+ .w-qixue-box .w-qixue-olist.w-qixue-type-1-last,
930
+ .w-qixue-box .w-qixue-olist.w-qixue-type-2-last {
931
+ margin-right: 30px;
932
+ }
887
933
  .w-qixue-box .w-qixue-olist:last-child {
888
934
  margin-right: 0;
889
935
  }
@@ -891,7 +937,6 @@
891
937
  transform: scale(1);
892
938
  }
893
939
  .w-qixue-box .w-qixue-olist-item {
894
- margin-bottom: 8px;
895
940
  position: relative;
896
941
  *zoom: 1;
897
942
  }
@@ -905,10 +950,14 @@
905
950
  border-radius: 48px;
906
951
  z-index: 5;
907
952
  }
908
- .w-qixue-box .w-qixue-olist-item:hover .u-pic:before {
953
+ .w-qixue-box .w-qixue-olist-item:hover:not(.is-disabled) .u-pic:before,
954
+ .w-qixue-box .w-qixue-olist-item.is-active .u-pic:before {
909
955
  opacity: 0;
910
956
  filter: alpha(opacity=0);
911
957
  }
958
+ .w-qixue-box .w-qixue-olist-item.is-disabled {
959
+ cursor: not-allowed;
960
+ }
912
961
  .w-qixue-box .w-qixue-olist-item:last-child {
913
962
  margin-bottom: 0;
914
963
  }
@@ -916,9 +965,6 @@
916
965
  .w-qixue-box .w-qixue-is_skill .u-pic img {
917
966
  border-radius: 0;
918
967
  }
919
- .w-qixue-box .w-qixue-is_skill .u-pic:after {
920
- display: none;
921
- }
922
968
  .w-qixue-box .w-qixue-item-pop {
923
969
  position: absolute;
924
970
  left: 100%;
@@ -1000,6 +1046,10 @@
1000
1046
  display: table;
1001
1047
  clear: both;
1002
1048
  }
1049
+ .w-qixue-box .w-qixue-clist .w-qixue-clist-item.w-qixue-type-1-last,
1050
+ .w-qixue-box .w-qixue-clist .w-qixue-clist-item.w-qixue-type-2-last {
1051
+ margin-right: unset;
1052
+ }
1003
1053
  }
1004
1054
  .w-qixue-editable .w-qixue-xf {
1005
1055
  margin-top: 5px;
@@ -1055,6 +1105,7 @@
1055
1105
  }
1056
1106
  .w-qixue-editable .w-qixue-olist.on {
1057
1107
  display: block;
1108
+ width: unset;
1058
1109
  }
1059
1110
  .w-qixue-editable .w-qixue-olist li {
1060
1111
  margin-right: 10px;
@@ -1871,6 +1922,33 @@
1871
1922
  .c-item .c-item-wrapper .u-furniture-can span {
1872
1923
  padding-right: 10px;
1873
1924
  }
1925
+ .c-item .c-item-wrapper .u-get-source {
1926
+ margin-top: 1rem;
1927
+ }
1928
+ .c-item .c-item-wrapper .u-get-source-header {
1929
+ color: #ffa500;
1930
+ }
1931
+ .c-item .c-item-wrapper .u-get-source-list {
1932
+ padding-left: 0.9rem;
1933
+ }
1934
+ .c-item .c-item-wrapper .u-get-source-child {
1935
+ color: #00c848;
1936
+ position: relative;
1937
+ *zoom: 1;
1938
+ }
1939
+ .c-item .c-item-wrapper .u-get-source-child.is-link {
1940
+ cursor: pointer;
1941
+ }
1942
+ .c-item .c-item-wrapper .u-get-source-child::before {
1943
+ position: absolute;
1944
+ left: -0.9rem;
1945
+ content: "➻";
1946
+ margin-right: 0.2rem;
1947
+ color: #00c848;
1948
+ }
1949
+ .c-item .c-item-wrapper .u-get-source-type {
1950
+ color: #ffff00;
1951
+ }
1874
1952
  .w-npc {
1875
1953
  padding: 1px;
1876
1954
  border: 1px solid #0f2222;