@jx3box/jx3box-editor 1.0.9 → 1.1.3

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 (40) hide show
  1. package/assets/css/article.less +32 -25
  2. package/assets/css/article_markdown.less +14 -12
  3. package/assets/css/markdown/_.less +0 -36
  4. package/assets/css/markdown.less +73 -13
  5. package/assets/css/module/buff.less +1 -0
  6. package/assets/css/module/item.less +0 -1
  7. package/assets/css/module/item_simple.less +43 -41
  8. package/assets/css/module/macro.less +72 -40
  9. package/assets/css/module/skill.less +1 -0
  10. package/assets/css/module/talent.less +424 -0
  11. package/assets/css/{module → tinymce}/_.less +1 -1
  12. package/assets/css/{module → tinymce}/a.less +1 -1
  13. package/assets/css/{module → tinymce}/code.less +1 -1
  14. package/assets/css/{module → tinymce}/fold.less +1 -1
  15. package/assets/css/{module → tinymce}/h.less +1 -1
  16. package/assets/css/{module → tinymce}/hr.less +1 -1
  17. package/assets/css/{module → tinymce}/img.less +1 -1
  18. package/assets/css/{module → tinymce}/imgpreview.less +0 -0
  19. package/assets/css/{module → tinymce}/latex.less +1 -1
  20. package/assets/css/{module → tinymce}/list.less +1 -1
  21. package/assets/css/tinymce/macro.less +40 -0
  22. package/assets/css/{module → tinymce}/nextpage.less +5 -0
  23. package/assets/css/{module → tinymce}/p.less +1 -1
  24. package/assets/css/{module → tinymce}/plugin.less +0 -0
  25. package/assets/css/{module → tinymce}/qixue.less +0 -0
  26. package/assets/css/{module → tinymce}/quote.less +1 -1
  27. package/assets/css/{module → tinymce}/table.less +2 -2
  28. package/assets/css/{module → tinymce}/video.less +1 -1
  29. package/assets/js/macro.js +0 -1
  30. package/assets/js/qixue.js +0 -1
  31. package/package.json +1 -1
  32. package/src/Markdown.vue +1 -4
  33. package/src/Tinymce.vue +2 -2
  34. package/src/components/markdown/katex.vue +0 -1
  35. package/src/components/markdown/macro.vue +0 -4
  36. package/src/components/markdown/pz.vue +0 -4
  37. package/src/components/markdown/talent.vue +0 -3
  38. package/src/components/markdown/talent2.vue +0 -4
  39. package/src/components/markdown/video.vue +0 -3
  40. package/assets/css/markdown/dialog.less +0 -26
@@ -1,28 +1,35 @@
1
1
  // @import 'node_modules/csslab/base.less';
2
2
  // @import 'node_modules/@jx3box/jx3box-common/css/var.less';
3
3
 
4
- @import 'module/_.less';
5
- @import 'module/a.less';
6
- @import 'module/list.less';
7
- @import 'module/quote.less';
8
- @import 'module/hr.less';
9
- @import 'module/table.less';
10
- @import 'module/img.less';
11
- @import 'module/item.less';
12
- @import 'module/p.less';
13
- @import 'module/h.less';
14
- @import 'module/code.less';
15
- @import 'module/fold.less';
16
- @import 'module/video.less';
17
- @import 'module/directory.less';
18
- @import 'module/macro.less';
19
- @import 'module/qixue.less';
20
- @import 'module/icon.less';
21
- @import 'module/resource.less';
22
- @import 'module/nextpage.less';
23
- @import 'module/plugin.less';
24
- @import 'module/latex.less';
25
- @import 'module/imgpreview.less';
26
- @import 'module/jx3_element.less';
27
- @import 'module/buff.less';
28
- @import 'module/skill.less';
4
+ @import "tinymce/_.less";
5
+ @import "tinymce/a.less";
6
+ @import "tinymce/list.less";
7
+ @import "tinymce/quote.less";
8
+ @import "tinymce/hr.less";
9
+ @import "tinymce/table.less";
10
+ @import "tinymce/img.less";
11
+ @import "tinymce/p.less";
12
+ @import "tinymce/h.less";
13
+ @import "tinymce/code.less";
14
+ @import "tinymce/fold.less";
15
+ @import "tinymce/plugin.less";
16
+ @import "tinymce/imgpreview.less";
17
+ @import "tinymce/latex.less";
18
+ @import "tinymce/nextpage.less";
19
+
20
+ @import "module/macro.less";
21
+ @import "module/talent.less";
22
+
23
+ @import "tinymce/video.less";
24
+ @import "tinymce/macro.less";
25
+ @import "tinymce/qixue.less";
26
+
27
+ @import "module/directory.less";
28
+ @import "module/icon.less";
29
+ @import "module/resource.less";
30
+ @import "module/jx3_element.less";
31
+
32
+ @import "module/buff.less";
33
+ @import "module/skill.less";
34
+ @import "module/item.less";
35
+ @import "module/npc.less";
@@ -1,14 +1,16 @@
1
+ @import "module/macro.less";
2
+ @import "module/talent.less";
1
3
 
2
- .c-article-markdown {
3
- @import 'module/jx3_element.less';
4
- @import 'module/buff.less';
5
- @import 'module/skill.less';
6
- @import 'module/item.less';
7
- @import 'module/npc.less';
8
- @import 'module/icon.less';
9
- @import 'module/resource.less';
10
- }
4
+ @import "markdown/video.less";
5
+ @import "markdown/macro.less";
6
+ @import "markdown/talent.less";
11
7
 
12
- @import 'markdown/macro.less';
13
- @import 'markdown/talent.less';
14
- @import "markdown/video.less";
8
+ @import 'module/directory.less';
9
+ @import 'module/icon.less';
10
+ @import 'module/resource.less';
11
+ @import 'module/jx3_element.less';
12
+
13
+ @import 'module/buff.less';
14
+ @import 'module/skill.less';
15
+ @import 'module/item.less';
16
+ @import 'module/npc.less';
@@ -1,38 +1,2 @@
1
- .c-editor-header {
2
- .mb(10px);
3
- .clearfix;
4
1
 
5
- .c-upload,
6
- .c-resource {
7
- .fl;
8
- }
9
- .c-upload {
10
- .mr(5px);
11
- }
12
- }
13
-
14
- .c-markdown{
15
- .h(780px);
16
- .v-note-wrapper{
17
- .h(780px);
18
- }
19
-
20
- a:hover {
21
- text-decoration: none;
22
- }
23
- }
24
-
25
- .c-markdown-toolbar-item {
26
- .mr(5px);
27
- .pointer;
28
- padding: 2px 5px 3px 5px;
29
-
30
- &:hover {
31
- background: #e9e9eb;
32
- .r(4px);
33
- }
34
- }
35
- .c-markdown-store-item {
36
- .none;
37
- }
38
2
 
@@ -1,16 +1,76 @@
1
1
  .c-editor-markdown {
2
- @import "markdown/_.less";
3
- @import "markdown/dialog.less";
4
-
5
- @import 'module/jx3_element.less';
6
- @import 'module/buff.less';
7
- @import 'module/skill.less';
8
- @import 'module/item.less';
9
- @import 'module/npc.less';
10
- @import 'module/icon.less';
11
- @import 'module/resource.less';
2
+ .c-editor-header {
3
+ .mb(10px);
4
+ .clearfix;
5
+
6
+ .c-upload,
7
+ .c-resource {
8
+ .fl;
9
+ }
10
+ .c-upload {
11
+ .mr(5px);
12
+ }
13
+ }
14
+
15
+ .c-markdown {
16
+ .h(780px);
17
+ .v-note-wrapper {
18
+ .h(780px);
19
+ }
20
+ a:hover {
21
+ text-decoration: none;
22
+ }
23
+ }
24
+
25
+ .c-markdown-toolbar-item {
26
+ .mr(5px);
27
+ .pointer;
28
+ padding: 2px 5px 3px 5px;
29
+
30
+ &:hover {
31
+ background: #e9e9eb;
32
+ .r(4px);
33
+ }
34
+ }
35
+ .c-markdown-store-item {
36
+ .none;
37
+ }
38
+ .c-editor-markdown-dialog {
39
+ display: inline-block;
40
+ .u-input {
41
+ .el-textarea__inner {
42
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
43
+ }
44
+ }
45
+ .el-dialog__body {
46
+ padding-top: 0;
47
+ }
48
+
49
+ .u-help {
50
+ margin-bottom: 10px;
51
+ display: inline-block;
52
+ color: #0366d6;
53
+ font-weight: bold;
54
+ cursor: pointer;
55
+ text-decoration: none;
56
+
57
+ &:hover {
58
+ text-decoration: none !important;
59
+ }
60
+ }
61
+ }
12
62
  }
13
63
 
14
- @import 'markdown/macro.less';
15
- @import 'markdown/talent.less';
16
- @import 'markdown/video.less';
64
+ @import "markdown/video.less";
65
+ @import "markdown/macro.less";
66
+ @import "markdown/talent.less";
67
+
68
+ @import 'module/directory.less';
69
+ @import 'module/icon.less';
70
+ @import 'module/resource.less';
71
+ @import 'module/jx3_element.less';
72
+
73
+ @import 'module/buff.less';
74
+ @import 'module/skill.less';
75
+ @import 'module/item.less';
76
+ @import 'module/npc.less';
@@ -21,6 +21,7 @@
21
21
  font-weight: normal;
22
22
  flex-grow: 1;
23
23
  text-shadow: 1px 1px 1px #0f2222;
24
+ line-height: 20px;
24
25
  }
25
26
 
26
27
  .w-buff-name {
@@ -224,4 +224,3 @@
224
224
  }
225
225
  }
226
226
  }
227
-
@@ -1,49 +1,51 @@
1
1
  .m-simple-item {
2
- .mb(2px);
3
- padding: 4px 10px 4px 4px;
4
- line-height: initial;
5
- font-size: 13px;
6
- background-color: #0F2222;
7
- text-shadow: 1px 1px 1px #000000;
8
- border-radius: 4px;
9
- overflow: hidden;
2
+ .mb(2px);
3
+ padding: 4px 10px 4px 4px;
4
+ line-height: initial;
5
+ font-size: 13px;
6
+ background-color: #0f2222;
7
+ text-shadow: 1px 1px 1px #000000;
8
+ border-radius: 4px;
9
+ overflow: hidden;
10
10
 
11
- .m-icon, .u-name {
12
- .dbi;
13
- vertical-align: middle;
14
- }
11
+ .m-icon,
12
+ .u-name {
13
+ .dbi;
14
+ vertical-align: middle;
15
+ }
15
16
 
16
- .m-icon {
17
- .pr;
18
- .mr(8px);
17
+ .m-icon {
18
+ .pr;
19
+ .mr(8px);
19
20
 
20
- .u-border, .u-border-quest {
21
- .pa;
22
- top: 0;
23
- left: 0;
24
- .w(100%);
25
- .h(100%);
26
- box-sizing: border-box;
27
- background-size: contain;
28
- .z(20);
29
- }
21
+ .u-border,
22
+ .u-border-quest {
23
+ .pa;
24
+ top: 0;
25
+ left: 0;
26
+ .w(100%);
27
+ .h(100%);
28
+ box-sizing: border-box;
29
+ background-size: contain;
30
+ .z(20);
31
+ }
30
32
 
31
- .u-border-quest {
32
- .z(30);
33
- }
33
+ .u-border-quest {
34
+ .z(30);
35
+ }
34
36
 
35
- .u-icon {
36
- .pr;
37
- .db;
38
- .w(24px);
39
- .h(auto);
40
- .z(10);
37
+ .u-icon {
38
+ .pr;
39
+ .db;
40
+ .w(24px);
41
+ .h(auto);
42
+ .z(10);
43
+ }
41
44
  }
42
- }
43
45
 
44
- .u-uiid {
45
- .mt(3px);
46
- font-size: 12px;
47
- color: lightgreen;
48
- }
49
- }
46
+ .u-uiid {
47
+ .mt(3px);
48
+ font-size: 12px;
49
+ color: lightgreen;
50
+ }
51
+ }
@@ -1,40 +1,72 @@
1
- // 编辑器外样式
2
- .c-article{
3
- .e-jx3macro-area{
4
- .pr;
5
- &:after{
6
- content : 'JX3BOX·MACRO';
7
- position: absolute;right:0;top:-30px;
8
- background-color:@bg-black;
9
- color:#fff;
10
- border-radius:3px;
11
- padding:0 8px;
12
- line-height:28px;
13
- height: 28px;
14
- box-sizing: border-box;
15
- font-size: 14px;
16
- }
17
- }
18
- }
19
- // tinymce编辑器
20
- .c-article-editor {
21
- .e-jx3macro-area{
22
- min-height:24px;
23
- border-radius:4px;
24
- padding:10px;
25
- font-size: 14px;
26
- white-space: pre-wrap;
27
- background-color: #f1f8ff;
28
- border: 1px solid #c8e1ff;
29
- color:darken(#c8e1ff,20%);
30
- .pr;
31
- &:after{
32
- content : 'JX3BOX·MACRO';
33
- position: absolute;right:10px;top:10px;
34
- background-color:darken(#c8e1ff,20%);
35
- color:#fff;
36
- border-radius:3px;
37
- padding:0 8px;
38
- }
39
- }
40
- }
1
+ // 文章输出样式
2
+ .w-jx3macro {
3
+ .fz(15px,24px);
4
+ font-family: Monaco, Consolas, "Lucida Console", "Courier New", serif;
5
+ ol {
6
+ padding: 0 0 0 40px;
7
+ border-radius: 4px;
8
+ background: #f6f8fa;
9
+ border: 1px solid #eee;
10
+ }
11
+ li {
12
+ margin: 0 !important;
13
+ background: #fafbfc;
14
+ border-bottom: 1px solid #e1e4e8;
15
+ border-left: 1px solid #e1e4e8;
16
+ &:last-child {
17
+ border-bottom: none;
18
+ }
19
+ list-style: decimal;
20
+ &:hover {
21
+ background-color: #fff;
22
+ }
23
+ }
24
+ pre {
25
+ background: none;
26
+ border: none;
27
+ padding: 6px 10px !important;
28
+ margin: 0;
29
+ .lh(24px);
30
+ border: none !important;
31
+ font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
32
+ white-space: normal;
33
+ }
34
+ }
35
+ @media print {
36
+ .w-jx3macro {
37
+ page-break-inside: avoid !important;
38
+ ol {
39
+ padding-left: 0;
40
+ }
41
+ li {
42
+ list-style: none;
43
+ border-left: none;
44
+ }
45
+ }
46
+ }
47
+
48
+ //注释
49
+ .jx3macro-comment {
50
+ color: #22863a;
51
+ }
52
+ //条件
53
+ .jx3macro-condition {
54
+ color: #6f42c1;
55
+ }
56
+ //符号
57
+ .jx3macro-key {
58
+ color: #d73a49;
59
+ }
60
+ //命令
61
+ .jx3macro-keyword-cast {
62
+ color: #005cc5;
63
+ }
64
+ .jx3macro-keyword-fcast {
65
+ color: #e6a11d;
66
+ }
67
+ .jx3macro-keyword-msg {
68
+ color: #666;
69
+ }
70
+ //技能
71
+ .jx3macro-skill-name {
72
+ }
@@ -21,6 +21,7 @@
21
21
  font-weight: normal;
22
22
  flex-grow: 1;
23
23
  text-shadow: 1px 1px 1px #0f2222;
24
+ line-height: 20px;
24
25
  }
25
26
 
26
27
  .w-skill-name {
@@ -0,0 +1,424 @@
1
+ // 输出样式
2
+ .w-qixue-box {
3
+ @url: "https://img.jx3box.com/img/";
4
+
5
+ zoom: 1;
6
+
7
+ @color: #2e4946;
8
+ @gray: #6f888a;
9
+ @xf-l: 10px;
10
+ @xf-r: 5px;
11
+ @xf: 23px;
12
+ @out-bo: 2px;
13
+ @lp:@xf-l + @xf-r + @xf + @out-bo;
14
+ @space: 10px;
15
+ @bo: 2px;
16
+
17
+ //局部z级别
18
+ @icon-decorate: 5; //装饰框
19
+ @item-description: 999; //描述
20
+
21
+ .white() {
22
+ color: #fff;
23
+ text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.9);
24
+ }
25
+ // .dbi;
26
+ display:inline-flex;
27
+
28
+ background-color: @color;
29
+ .r(5px);
30
+ border: @out-bo solid @gray;
31
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.4);
32
+ //padding-right:5px;
33
+ padding-top: 8px;
34
+ padding-bottom: 8px;
35
+ padding-right: 20px;
36
+ // padding-left: 10px;
37
+ white-space: nowrap;
38
+ font-size: 0;
39
+ // width:860px;
40
+ // overflow-x: auto;
41
+ // display: block;
42
+
43
+ &.isQQBrowser{
44
+ padding-right: 30px !important; //fix
45
+ }
46
+
47
+ //单项
48
+ li {
49
+ list-style: none;
50
+ }
51
+
52
+ //图片
53
+ img {
54
+ .db;
55
+ .size(48px);
56
+ .r(5px);
57
+ .auto(x);
58
+ box-sizing: border-box;
59
+ filter: saturate(110%) brightness(110%);
60
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.5);
61
+ user-select: none;
62
+ }
63
+
64
+ //心法label
65
+ .w-qixue-xf {
66
+ // .dbi;
67
+ .y(top);
68
+ .fz(14px);
69
+ .white;
70
+ .x;
71
+
72
+ box-sizing: border-box;
73
+ .retext(y);
74
+ background: url("@{url}qixue/label.png") no-repeat 0 0;
75
+ .size(@xf,86px);
76
+ .mr(@xf-r);
77
+ .ml(@xf-l);
78
+ user-select: none;
79
+ //针对正文覆写
80
+ border: none;
81
+ font-weight: normal;
82
+ margin-top: 0;
83
+ margin-bottom: 0;
84
+ 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
+ }
92
+
93
+ .w-qixue-clist {
94
+ margin: 0;
95
+ }
96
+
97
+ //公共单项
98
+ .w-qixue-clist-item,
99
+ .w-qixue-olist-item {
100
+ .u-pic {
101
+ .db;
102
+ .pr;
103
+ &:before,
104
+ &:after {
105
+ content: "";
106
+ .db;
107
+ }
108
+ &:after {
109
+ .size(52px);
110
+ .pa;
111
+ .lt(-2px,-2px);
112
+ background: url("@{url}qixue/bg.png") no-repeat 0 0;
113
+ .z(@icon-decorate + 1);
114
+ }
115
+ }
116
+ img {
117
+ .r(48px);
118
+ //针对正文覆写
119
+ padding: 0;
120
+ margin: 0;
121
+ border: none;
122
+ }
123
+ .u-title {
124
+ .white;
125
+ .fz(13px,14px);
126
+ .x;
127
+ .db;
128
+ .auto(x);
129
+ .mt(6px);
130
+ .w(48px);
131
+ }
132
+ }
133
+
134
+ //当前盒子
135
+ .w-qixue-clist {
136
+ .dbi;
137
+ .y(top);
138
+ font-size: 0;
139
+ white-space: nowrap;
140
+ margin-top: 8px;
141
+ .pr;
142
+ .z(2);
143
+
144
+ //针对正文覆写
145
+ padding-left: 0;
146
+ }
147
+ //当前单项
148
+ .w-qixue-clist-item {
149
+ .dbi;
150
+ .y;
151
+ padding-left: @space;
152
+ padding-right: @space;
153
+ .pr;
154
+
155
+ &:last-child {
156
+ margin-right: 0;
157
+ }
158
+
159
+ /* &.w-qixue-isskill .u-pic{
160
+ &:before{
161
+ .pa;.lt(0);
162
+ .full;
163
+ border:2px solid @color-cyan;
164
+ }
165
+ } */
166
+
167
+ &:before {
168
+ content: "";
169
+ .size(44px,11px);
170
+ background: url("@{url}qixue/fold.png") no-repeat 0 0;
171
+ margin: 0 2px;
172
+
173
+ .none;
174
+ }
175
+
176
+ &.on {
177
+ &:before {
178
+ background-image: url("@{url}qixue/unfold.png");
179
+ }
180
+ }
181
+ }
182
+
183
+ .pr;
184
+ .w-qixue-obox,
185
+ .w-qixue-olist,
186
+ .w-qixue-item-pop {
187
+ .none;
188
+ }
189
+ //全部扩展列表容器
190
+ .w-qixue-obox {
191
+ .pa;
192
+ .lb(@lp,100%);
193
+ white-space: nowrap;
194
+ font-size: 0;
195
+ &.on {
196
+ .db;
197
+ }
198
+ }
199
+ //单个扩展列表
200
+ .w-qixue-olist {
201
+ .pr;
202
+ .z(1000);
203
+ .dbi;
204
+ .y(bottom);
205
+ background-color: @color;
206
+ padding: @space - @bo;
207
+ border-top-left-radius: 5px;
208
+ border-top-right-radius: 5px;
209
+ border: @bo solid @gray;
210
+ border-bottom: none;
211
+ box-shadow: 3px -3px 3px rgba(0, 0, 0, 0.4);
212
+
213
+ &:last-child {
214
+ margin-right: 0;
215
+ }
216
+
217
+ transform: scale(0);
218
+ &.on {
219
+ transform: scale(1);
220
+ }
221
+ }
222
+ .w-qixue-olist-item {
223
+ margin-bottom: 8px;
224
+ .pr;
225
+
226
+ .u-pic {
227
+ &:before {
228
+ .full;
229
+ .pa;
230
+ .lt(0);
231
+ background-color: rgba(0, 0, 0, 0.6);
232
+ .r(48px);
233
+ .z(@icon-decorate);
234
+ }
235
+ }
236
+
237
+ &:hover {
238
+ .u-pic {
239
+ &:before {
240
+ .tm(0);
241
+ }
242
+ }
243
+ }
244
+
245
+ &:last-child {
246
+ margin-bottom: 0;
247
+ }
248
+ }
249
+
250
+ //特殊技能
251
+ .w-qixue-is_skill {
252
+ .u-pic {
253
+ &:before,
254
+ img {
255
+ .r(0);
256
+ }
257
+ &:after {
258
+ .none;
259
+ }
260
+ }
261
+ }
262
+
263
+ //单个浮层描述
264
+ .w-qixue-item-pop {
265
+ .pa;
266
+ .lt(100%,0);
267
+ .z(@item-description);
268
+ background-color: rgba(0, 0, 0, 0.8);
269
+ margin-left: 4px;
270
+ .r(3px);
271
+ padding: 10px;
272
+ width: 320px;
273
+ max-width:none;
274
+
275
+ * {
276
+ .db;
277
+ white-space: normal;
278
+ word-wrap: break-word;
279
+ word-break: break-all;
280
+ }
281
+ .u-name,
282
+ .u-desc {
283
+ color: #ffff00;
284
+ }
285
+ .u-name {
286
+ .fz(14px,2);
287
+ }
288
+ .u-desc {
289
+ .fz(12px,20px);
290
+ }
291
+ .u-skill {
292
+ color: #fff;
293
+ .fz(13px,20px);
294
+ }
295
+ .u-meta,
296
+ .u-extend {
297
+ color: #ff9600;
298
+ .fz(13px,2);
299
+ font-style: normal;
300
+ }
301
+ &.on {
302
+ .db;
303
+ }
304
+ }
305
+ //展示版奇穴的pop显示位置
306
+ .w-qixue-clist-item .w-qixue-item-pop {
307
+ left: 0;
308
+ top: auto;
309
+ bottom: 100%;
310
+ .mb(10px);
311
+ }
312
+ }
313
+ @media screen and (max-width: @ipad) {
314
+ .w-qixue-box {
315
+ // zoom: 0.8;
316
+ .clearfix;
317
+
318
+ .db;
319
+ .w(auto);
320
+ li,
321
+ .w-qixue-xf {
322
+ .fl;
323
+ margin-bottom: 10px;
324
+ }
325
+ .w-qixue-xf {
326
+ .none;
327
+ }
328
+ .w-qixue-clist{
329
+ // .w(100%);
330
+ // overflow-x: auto;
331
+ .db;
332
+ .clearfix;
333
+ margin-top:0;
334
+ }
335
+ }
336
+ }
337
+
338
+ .w-qixue-editable {
339
+ .w-qixue-xf{
340
+ margin-top: 5px;
341
+ }
342
+ li {
343
+ .pointer;
344
+ }
345
+ .w-qixue-clist-item {
346
+ user-select: none;
347
+ }
348
+ .w-qixue-clist-item:before {
349
+ .db;
350
+ }
351
+
352
+ &.disabled:after {
353
+ content: "";
354
+ .db;
355
+ .full;
356
+ .pa;
357
+ .lt(0);
358
+ .z(10);
359
+ background-color: rgba(0, 0, 0, 0.5);
360
+ }
361
+
362
+ &.active {
363
+ &:after {
364
+ .none;
365
+ }
366
+ }
367
+ //编辑模式下当前版不加载pop
368
+ .w-qixue-clist-item .w-qixue-item-pop {
369
+ .none !important;
370
+ }
371
+ }
372
+
373
+ @media screen and (max-width: @ipad) {
374
+ .w-qixue-editable {
375
+ // zoom: 0.8;
376
+
377
+ .db;
378
+ .w(auto);
379
+ //overflow-x:auto;
380
+ //overflow-y:visible;
381
+ li,
382
+ .w-qixue-xf {
383
+ .fl;
384
+ margin-bottom: 10px;
385
+ }
386
+ .w-qixue-obox {
387
+ left: 0;
388
+ }
389
+ .w-qixue-olist {
390
+ .clearfix;
391
+ .none;
392
+ &.on {
393
+ .db;
394
+ }
395
+
396
+ li {
397
+ .mr(10px);
398
+ &:last-child {
399
+ .mr(0);
400
+ }
401
+ transform: scale(1);
402
+ }
403
+ }
404
+
405
+ .w-qixue-item-pop {
406
+ left: 0;
407
+ top: auto;
408
+ bottom: 100%;
409
+ }
410
+ }
411
+ }
412
+
413
+ // 打印样式
414
+ @media print{
415
+ .w-qixue-box{
416
+ page-break-inside: avoid !important;
417
+ padding-right:40px;
418
+ .w-qixue-clist-item{
419
+ padding-left:5px;
420
+ padding-right:0;
421
+ transform: scale(0.85);
422
+ }
423
+ }
424
+ }
@@ -1,4 +1,4 @@
1
- .c-article{
1
+ .c-article-tinymce{
2
2
  font-size: 1em;
3
3
  line-height: 1.8;
4
4
  color: #3d454d;
@@ -1,5 +1,5 @@
1
1
  /* 链接 */
2
- .c-article {
2
+ .c-article-tinymce .c-article{
3
3
  a {
4
4
  color: #0366d6;
5
5
  text-decoration: none;
@@ -1,4 +1,4 @@
1
- .c-article {
1
+ .c-article-tinymce .c-article {
2
2
  //兼容旧代码
3
3
  code {
4
4
  font-family: Consolas, monospace, serif;
@@ -1,5 +1,5 @@
1
1
  // 折叠文本
2
- .c-article {
2
+ .c-article-tinymce .c-article {
3
3
  .e-details,
4
4
  .e-summary {
5
5
  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica,
@@ -1,5 +1,5 @@
1
1
  //标题
2
- .c-article {
2
+ .c-article-tinymce .c-article {
3
3
  h1,
4
4
  h2,
5
5
  h3,
@@ -1,5 +1,5 @@
1
1
  /* 水平线 */
2
- .c-article {
2
+ .c-article-tinymce .c-article{
3
3
  hr {
4
4
  margin-top: 22px;
5
5
  margin-bottom: 22px;
@@ -1,5 +1,5 @@
1
1
  //图片
2
- .c-article {
2
+ .c-article-tinymce .c-article {
3
3
  img {
4
4
  height: auto;
5
5
  padding: 5px;
File without changes
@@ -1,5 +1,5 @@
1
1
  // 编辑器内样式
2
- .c-article{
2
+ .c-article-tinymce .c-article{
3
3
  .w-latex{
4
4
  .pr;
5
5
  font-family: Georgia, 'Times New Roman', Times, serif;
@@ -1,5 +1,5 @@
1
1
  /* 列表 */
2
- .c-article {
2
+ .c-article-tinymce{
3
3
  ul,
4
4
  ol {
5
5
  margin: 20px 0;
@@ -0,0 +1,40 @@
1
+ // 编辑器外样式
2
+ .c-article-tinymce .c-article{
3
+ .e-jx3macro-area{
4
+ .pr;
5
+ &:after{
6
+ content : 'JX3BOX·MACRO';
7
+ position: absolute;right:0;top:-30px;
8
+ background-color:@bg-black;
9
+ color:#fff;
10
+ border-radius:3px;
11
+ padding:0 8px;
12
+ line-height:28px;
13
+ height: 28px;
14
+ box-sizing: border-box;
15
+ font-size: 14px;
16
+ }
17
+ }
18
+ }
19
+ // tinymce编辑器
20
+ .c-article-editor {
21
+ .e-jx3macro-area{
22
+ min-height:24px;
23
+ border-radius:4px;
24
+ padding:10px;
25
+ font-size: 14px;
26
+ white-space: pre-wrap;
27
+ background-color: #f1f8ff;
28
+ border: 1px solid #c8e1ff;
29
+ color:darken(#c8e1ff,20%);
30
+ .pr;
31
+ &:after{
32
+ content : 'JX3BOX·MACRO';
33
+ position: absolute;right:10px;top:10px;
34
+ background-color:darken(#c8e1ff,20%);
35
+ color:#fff;
36
+ border-radius:3px;
37
+ padding:0 8px;
38
+ }
39
+ }
40
+ }
@@ -24,6 +24,11 @@
24
24
  max-width: 100%;
25
25
  overflow-x: auto;
26
26
  text-align: center;
27
+
28
+ .el-pager{
29
+ margin:0;
30
+ padding:0;
31
+ }
27
32
  }
28
33
 
29
34
  // 打印分页
@@ -1,5 +1,5 @@
1
1
  // 段落
2
- .c-article {
2
+ .c-article-tinymce {
3
3
  p,
4
4
  div {
5
5
  margin: 0;
File without changes
File without changes
@@ -1,5 +1,5 @@
1
1
  /* 引用 */
2
- .c-article {
2
+ .c-article-tinymce .c-article{
3
3
  blockquote {
4
4
  border: 1px dashed #e1e4e8;
5
5
  border-radius: 4px;
@@ -1,5 +1,5 @@
1
1
  /* 表格 */
2
- .c-article {
2
+ .c-article-tinymce .c-article{
3
3
  table {
4
4
  border-collapse: collapse;
5
5
  width: 100%;
@@ -39,7 +39,7 @@
39
39
  }
40
40
 
41
41
  @media screen and (max-width: @phone) {
42
- .c-article{
42
+ .c-article-tinymce .c-article{
43
43
  table {
44
44
  display: block;
45
45
  width: 100% !important;
@@ -1,4 +1,4 @@
1
- .c-article {
1
+ .c-article-tinymce .c-article {
2
2
  video {
3
3
  background-color: #333;
4
4
  width: 100%;
@@ -1,6 +1,5 @@
1
1
  import JX3_MACRO from '@jx3box/jx3box-macro'
2
2
  import $ from 'jquery'
3
- import "@jx3box/jx3box-macro/macro.css";
4
3
 
5
4
  function macro(selector=".e-jx3macro-area"){
6
5
  try {
@@ -1,6 +1,5 @@
1
1
  import JX3_QIXUE from '@jx3box/jx3box-talent'
2
2
  import $ from 'jquery'
3
- import "@jx3box/jx3box-talent/talent.css";
4
3
 
5
4
  function qixue(selector=".e-jx3qixue-area"){
6
5
  try {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-editor",
3
- "version": "1.0.9",
3
+ "version": "1.1.3",
4
4
  "description": "JX3BOX Article & Editor",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/Markdown.vue CHANGED
@@ -64,10 +64,6 @@ export default {
64
64
  type: Boolean,
65
65
  default: true,
66
66
  },
67
- readOnly : {
68
- type : Boolean,
69
- default : false,
70
- }
71
67
  },
72
68
  components: {
73
69
  markdownEditor,
@@ -195,6 +191,7 @@ export default {
195
191
  data,
196
192
  render,
197
193
  });
194
+ this.data = data
198
195
  },
199
196
  // 插入附件
200
197
  insertAttachments: function(data) {
package/src/Tinymce.vue CHANGED
@@ -73,10 +73,10 @@ export default {
73
73
  "link autolink",
74
74
  "hr lists advlist table codeinline codesample checklist foldtext latex",
75
75
  "image emoticons media videox macro qixue talent2",
76
- "autosave code fullscreen wordcount powerpaste pagebreak printpage pz", // template anchor jx3icon
76
+ "code fullscreen wordcount powerpaste pagebreak printpage pz", // template anchor jx3icon autosave
77
77
  ],
78
78
  toolbar: [
79
- "undo | formatselect | fontsizeselect | forecolor backcolor | bold italic underline strikethrough superscript subscript | link unlink | restoredraft fullscreen code",
79
+ "undo | formatselect | fontsizeselect | forecolor backcolor | bold italic underline strikethrough superscript subscript | link unlink | fullscreen code", //restoredraft
80
80
  "removeformat | hr alignleft aligncenter alignright alignjustify indent outdent | bullist numlist checklist table blockquote foldtext codeinline codesample latex | emoticons image media videox | macro pz qixue talent2 pagebreak printpage", // template anchor jx3icon
81
81
  ],
82
82
  mobile: {
@@ -48,7 +48,6 @@ export default {
48
48
  </script>
49
49
 
50
50
  <style lang="less">
51
- @import "../../../assets/css/markdown/dialog.less";
52
51
  .c-markdown-toolbar-item.u-katex {
53
52
  display: inline-flex;
54
53
  justify-content: center;
@@ -42,7 +42,3 @@ export default {
42
42
  }
43
43
  }
44
44
  </script>
45
-
46
- <style lang="less">
47
- @import '../../../assets/css/markdown/dialog.less';
48
- </style>
@@ -45,7 +45,3 @@ export default {
45
45
  }
46
46
  }
47
47
  </script>
48
-
49
- <style lang="less">
50
- @import '../../../assets/css/markdown/dialog.less';
51
- </style>
@@ -47,6 +47,3 @@ export default {
47
47
  };
48
48
  </script>
49
49
 
50
- <style lang="less">
51
- @import "../../../assets/css/markdown/dialog.less";
52
- </style>
@@ -46,7 +46,3 @@ export default {
46
46
  },
47
47
  };
48
48
  </script>
49
-
50
- <style lang="less">
51
- @import "../../../assets/css/markdown/dialog.less";
52
- </style>
@@ -47,6 +47,3 @@ export default {
47
47
  };
48
48
  </script>
49
49
 
50
- <style lang="less">
51
- @import "../../../assets/css/markdown/dialog.less";
52
- </style>
@@ -1,26 +0,0 @@
1
-
2
- .c-editor-markdown-dialog {
3
- display: inline-block;
4
- .u-input {
5
- .el-textarea__inner {
6
-
7
- font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
8
- }
9
- }
10
- .el-dialog__body {
11
- padding-top: 0;
12
- }
13
-
14
- .u-help {
15
- margin-bottom: 10px;
16
- display: inline-block;
17
- color: #0366D6;
18
- font-weight: bold;
19
- cursor: pointer;
20
- text-decoration: none;
21
-
22
- &:hover {
23
- text-decoration: none !important;
24
- }
25
- }
26
- }