@jx3box/jx3box-editor 2.2.38 → 2.2.39

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,6 @@
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;
91
88
  }
92
89
 
93
90
  .w-qixue-clist {
@@ -97,6 +94,32 @@
97
94
  //公共单项
98
95
  .w-qixue-clist-item,
99
96
  .w-qixue-olist-item {
97
+ &[data-color="0"]:not([data-is_skill="1"]) .u-pic {
98
+ &:after {
99
+ background: url("@{color-0-border}") no-repeat 0 0;
100
+ }
101
+ }
102
+ &[data-color="1"] .u-pic {
103
+ &:after {
104
+ background: url("@{color-1-border}") no-repeat 0 0;
105
+ }
106
+ }
107
+ &[data-color="2"] .u-pic {
108
+ &:after {
109
+ background: url("@{color-2-border}") no-repeat 0 0;
110
+ }
111
+ }
112
+ &[data-color="3"] .u-pic {
113
+ &:after {
114
+ background: url("@{color-3-border}") no-repeat 0 0;
115
+ }
116
+ }
117
+ &[data-color="4"] .u-pic {
118
+ &:after {
119
+ background: url("@{color-4-border}") no-repeat 0 0;
120
+ }
121
+ }
122
+
100
123
  .u-pic {
101
124
  .db;
102
125
  .pr;
@@ -106,11 +129,13 @@
106
129
  .db;
107
130
  }
108
131
  &:after {
109
- .size(52px);
132
+ .size(80px);
110
133
  .pa;
111
- .lt(-2px,-2px);
112
- background: url("@{url}qixue/bg.png") no-repeat 0 0;
134
+ .lt(-10px,-10px);
113
135
  .z(@icon-decorate + 1);
136
+ pointer-events: none;
137
+ transform: scale(1.06);
138
+ transform-origin: center;
114
139
  }
115
140
  }
116
141
  img {
@@ -119,6 +144,8 @@
119
144
  padding: 0;
120
145
  margin: 0;
121
146
  border: none;
147
+ border: 2px solid #485053;
148
+ box-sizing: border-box;
122
149
  }
123
150
  .u-title {
124
151
  .white;
@@ -156,19 +183,22 @@
156
183
  margin-right: 0;
157
184
  }
158
185
 
159
- /* &.w-qixue-isskill .u-pic{
160
- &:before{
161
- .pa;.lt(0);
162
- .full;
163
- border:2px solid @color-cyan;
164
- }
165
- } */
186
+ &.w-qixue-type-1-last,
187
+ &.w-qixue-type-2-last {
188
+ .mr(@big-space);
189
+ }
190
+
191
+ &[data-type="3"]:not(.w-qixue-type-3-center)::before {
192
+ opacity: 0;
193
+ }
166
194
 
167
195
  &:before {
196
+ .pr;
168
197
  content: "";
169
- .size(44px,11px);
198
+ .size(46px,12px);
170
199
  background: url("@{url}qixue/fold.png") no-repeat 0 0;
171
- margin: 0 2px;
200
+ bottom: 2px;
201
+ .z(@icon-decorate + 2);
172
202
 
173
203
  .none;
174
204
  }
@@ -187,20 +217,27 @@
187
217
  .none;
188
218
  }
189
219
  //全部扩展列表容器
220
+
190
221
  .w-qixue-obox {
191
222
  .pa;
192
223
  .lb(@lp,100%);
193
224
  white-space: nowrap;
194
225
  font-size: 0;
195
226
  &.on {
196
- .db;
227
+ display: flex;
228
+ flex-direction: row;
229
+ align-items: flex-end;
230
+ }
231
+ }
232
+ // 新版奇穴限制最大高度,旧版的最多五个无需限制
233
+ &:not(.w-qixue-v20250921) {
234
+ .w-qixue-olist {
235
+ max-height: unset;
197
236
  }
198
237
  }
199
- //单个扩展列表
200
238
  .w-qixue-olist {
201
239
  .pr;
202
240
  .z(1000);
203
- .dbi;
204
241
  .y(bottom);
205
242
  background-color: @color;
206
243
  padding: @space - @bo;
@@ -210,6 +247,22 @@
210
247
  border-bottom: none;
211
248
  box-shadow: 3px -3px 3px rgba(0, 0, 0, 0.4);
212
249
 
250
+ display: flex;
251
+ flex-direction: row;
252
+ flex-wrap: wrap;
253
+ width: min-content;
254
+ max-height: 304px;
255
+ gap: 8px 20px;
256
+
257
+ &.w-qixue-type-3 {
258
+ width: 184px;
259
+ }
260
+
261
+ &.w-qixue-type-1-last,
262
+ &.w-qixue-type-2-last {
263
+ .mr(30px);
264
+ }
265
+
213
266
  &:last-child {
214
267
  margin-right: 0;
215
268
  }
@@ -220,7 +273,6 @@
220
273
  }
221
274
  }
222
275
  .w-qixue-olist-item {
223
- margin-bottom: 8px;
224
276
  .pr;
225
277
 
226
278
  .u-pic {
@@ -234,7 +286,8 @@
234
286
  }
235
287
  }
236
288
 
237
- &:hover {
289
+ &:hover:not(.is-disabled),
290
+ &.is-active {
238
291
  .u-pic {
239
292
  &:before {
240
293
  .tm(0);
@@ -242,6 +295,10 @@
242
295
  }
243
296
  }
244
297
 
298
+ &.is-disabled {
299
+ cursor: not-allowed;
300
+ }
301
+
245
302
  &:last-child {
246
303
  margin-bottom: 0;
247
304
  }
@@ -254,9 +311,6 @@
254
311
  img {
255
312
  .r(0);
256
313
  }
257
- &:after {
258
- .none;
259
- }
260
314
  }
261
315
  }
262
316
 
@@ -270,7 +324,7 @@
270
324
  .r(3px);
271
325
  padding: 10px;
272
326
  width: 320px;
273
- max-width:none;
327
+ max-width: none;
274
328
 
275
329
  * {
276
330
  .db;
@@ -325,18 +379,24 @@
325
379
  .w-qixue-xf {
326
380
  .none;
327
381
  }
328
- .w-qixue-clist{
382
+ .w-qixue-clist {
329
383
  // .w(100%);
330
384
  // overflow-x: auto;
331
385
  .db;
332
386
  .clearfix;
333
- margin-top:0;
387
+ margin-top: 0;
388
+ .w-qixue-clist-item {
389
+ &.w-qixue-type-1-last,
390
+ &.w-qixue-type-2-last {
391
+ .mr(unset);
392
+ }
393
+ }
334
394
  }
335
395
  }
336
396
  }
337
397
 
338
398
  .w-qixue-editable {
339
- .w-qixue-xf{
399
+ .w-qixue-xf {
340
400
  margin-top: 5px;
341
401
  }
342
402
  li {
@@ -386,11 +446,13 @@
386
446
  .w-qixue-obox {
387
447
  left: 0;
388
448
  }
449
+
389
450
  .w-qixue-olist {
390
451
  .clearfix;
391
452
  .none;
392
453
  &.on {
393
454
  .db;
455
+ width: unset;
394
456
  }
395
457
 
396
458
  li {
@@ -411,14 +473,14 @@
411
473
  }
412
474
 
413
475
  // 打印样式
414
- @media print{
415
- .w-qixue-box{
476
+ @media print {
477
+ .w-qixue-box {
416
478
  page-break-inside: avoid !important;
417
- padding-right:40px;
418
- .w-qixue-clist-item{
419
- padding-left:5px;
420
- padding-right:0;
479
+ padding-right: 40px;
480
+ .w-qixue-clist-item {
481
+ padding-left: 5px;
482
+ padding-right: 0;
421
483
  transform: scale(0.85);
422
484
  }
423
485
  }
424
- }
486
+ }
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.39",
4
4
  "description": "JX3BOX Article & Editor",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -36,7 +36,7 @@
36
36
  "@jx3box/jx3box-data": "^3.8.8",
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.8",
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;