@jx3box/jx3box-editor 1.0.7 → 1.1.1

package/assets/css/{module → tinymce}/latex.less

@@ -1,5 +1,5 @@
 // 编辑器内样式
-.c-article{
+.c-article-tinymce .c-article{
 	.w-latex{
 		.pr;
         font-family: Georgia, 'Times New Roman', Times, serif;

package/assets/css/{module → tinymce}/list.less

@@ -1,5 +1,5 @@
 /* 列表 */
-.c-article {
+.c-article-tinymce{
     ul,
     ol {
         margin: 20px 0;

package/assets/css/tinymce/macro.less

@@ -0,0 +1,40 @@
+// 编辑器外样式
+.c-article-tinymce .c-article{
+	.e-jx3macro-area{
+		.pr;
+		&:after{
+			content : 'JX3BOX·MACRO';
+			position: absolute;right:0;top:-30px;
+			background-color:@bg-black;
+			color:#fff;
+			border-radius:3px;
+			padding:0 8px;
+			line-height:28px;
+			height: 28px;
+			box-sizing: border-box;
+			font-size: 14px;
+		}
+	}
+}
+// tinymce编辑器
+.c-article-editor {
+	.e-jx3macro-area{
+		min-height:24px;
+		border-radius:4px;
+		padding:10px;
+		font-size: 14px;
+		white-space: pre-wrap;
+		background-color: #f1f8ff;
+		border: 1px solid #c8e1ff;
+		color:darken(#c8e1ff,20%);
+		.pr;
+		&:after{
+			content : 'JX3BOX·MACRO';
+			position: absolute;right:10px;top:10px;
+			background-color:darken(#c8e1ff,20%);
+			color:#fff;
+			border-radius:3px;
+			padding:0 8px;
+		}
+	}
+}

package/assets/css/{module → tinymce}/nextpage.less

@@ -24,6 +24,11 @@
     max-width: 100%;
     overflow-x: auto;
     text-align: center;
+
+    .el-pager{
+        margin:0;
+        padding:0;
+    }
 }
 
 // 打印分页

package/assets/css/{module → tinymce}/p.less

@@ -1,5 +1,5 @@
 // 段落
-.c-article {
+.c-article-tinymce {
     p,
     div {
         margin: 0;

package/assets/css/{module → tinymce}/qixue.less

@@ -25,14 +25,15 @@
         line-height: 21px;
     }
 }
+// 渲染模式隐藏
 .c-article{
     .e-jx3qixue-area,.e-jx3talent2-area{
         display: none;
     }
 }
+// tinymce编辑器内展示
 .c-article-editor{
     .e-jx3qixue-area,.e-jx3talent2-area{
         display: block;
     }
 }
-

package/assets/css/{module → tinymce}/quote.less

@@ -1,5 +1,5 @@
 /* 引用 */
-.c-article {
+.c-article-tinymce .c-article{
     blockquote {
         border: 1px dashed #e1e4e8;
         border-radius: 4px;

package/assets/css/{module → tinymce}/table.less

@@ -1,5 +1,5 @@
 /* 表格 */
-.c-article {
+.c-article-tinymce .c-article{
     table {
         border-collapse: collapse;
         width: 100%;
@@ -39,7 +39,7 @@
 }
 
 @media screen and (max-width: @phone) {
-    .c-article{
+    .c-article-tinymce .c-article{
         table {
             display: block;
             width: 100% !important;

package/assets/css/{module → tinymce}/video.less

@@ -1,4 +1,4 @@
-.c-article {
+.c-article-tinymce .c-article {
     video {
         background-color: #333;
         width: 100%;
@@ -8,7 +8,7 @@
     }
 }
 .c-article-videox{
-    iframe {
+    iframe,iframe[allowfullscreen='allowfullscreen']{
         width: 100%;
         height: 800px;
         border: 1px solid #eee;

package/assets/data/markdown_whitelist.json

@@ -6,9 +6,13 @@
             "video": ["controls", "width", "height", "style", "src"],
             "audio": ["controls", "src"],
             "source": ["src", "type", "style"],
-            "iframe": ["src", "frameborder", "scrolling", "allowfullscreen"],
+            "iframe": ["src", "frameborder", "scrolling", "allowfullscreen", "style", "width", "height"],
             "details":[],
-            "summary":[]
+            "summary":[],
+            "p": [],
+            "img": ["src", "class", "alt", "title"],
+            "a": ["data-type", "class", "data-mode", "data-quality", "data-client", "data-id", "target", "href"],
+            "span": ["class"]
         }
     }
 }

package/assets/img/npc/attack.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
+<path style="fill:#F4A32C;" d="M465.692,508.926L276.09,368.829l-50.87,111.532c-3.085,6.762-10.312,10.382-17.577,8.806
+	c-7.264-1.578-12.337-7.873-12.337-15.306V355.571L74.623,434.266c-6.349,4.14-14.48,3.241-19.773-2.187
+	c-5.291-5.43-5.983-13.582-1.679-19.823l83.405-121.023l-66.166,1.664c-7.625,0.172-14.235-5.088-15.746-12.552
+	c-1.511-7.466,2.538-14.904,9.627-17.688l59.93-23.535l-95.556-59.936c-6.339-3.973-8.986-11.926-6.29-18.908
+	c2.693-6.982,10.004-11.097,17.363-9.78l110.552,19.699l-22.642-44.136c-3.379-6.593-1.754-14.494,3.948-19.215
+	c5.704-4.721,13.767-4.843,19.611-0.296l39.204,30.528l-4.707-120.802c-0.294-7.59,4.876-14.28,12.293-15.907
+	c7.414-1.631,14.912,2.28,17.825,9.293l49.906,120.28L297.15,87.65c4.501-6.058,12.414-8.046,19.242-4.833
+	c6.829,3.214,10.342,10.577,8.543,17.908l-11.14,45.373l130.67-71.476c6.628-3.625,14.9-2.003,19.668,3.859
+	c4.767,5.862,4.671,14.289-0.228,20.041l-96.676,113.523l87.821,4.185c16.539,0.789,20.659,23.465,5.463,30.026l-104.376,45.033
+	l131.866,196.306c4.26,6.342,3.345,14.776-2.177,20.057C480.334,512.899,471.869,513.49,465.692,508.926z"/>
+<path style="fill:#E89528;" d="M197.999,0.368c-7.418,1.628-12.587,8.317-12.293,15.908l4.707,120.802l-39.204-30.528
+	c-5.844-4.547-13.905-4.426-19.611,0.297c-5.703,4.72-7.326,12.621-3.948,19.214l22.642,44.136L39.738,150.498
+	c-7.36-1.317-14.67,2.799-17.363,9.78c-2.695,6.983-0.048,14.936,6.29,18.908l95.556,59.936l-59.93,23.535
+	c-7.088,2.784-11.138,10.222-9.627,17.687c1.511,7.464,8.121,12.725,15.745,12.552l66.167-1.664L53.171,412.256
+	c-4.302,6.242-3.612,14.393,1.679,19.824c5.293,5.429,13.424,6.326,19.773,2.186l120.682-78.695v0.23l37.238-51.58l40.697-140.803
+	c-0.775-19.885-7.512-33.476-7.512-33.476L215.824,9.663C212.911,2.649,205.412-1.262,197.999,0.368z"/>
+<path style="fill:#F7E7A1;" d="M281.136,339.751L431.58,450.915L327.041,295.291c-5.46-8.12-2.211-19.225,6.792-23.115
+	l73.699-31.797l-63.366-3.02c-12.991-0.622-19.614-15.901-11.176-25.804l73.148-85.896l-101.045,55.271
+	c-5.445,2.978-12.143,2.458-17.064-1.325c-4.921-3.782-7.145-10.123-5.665-16.151l4.278-17.422l-11.003,14.809
+	c-7.238,9.74-22.384,7.882-27.039-3.336l-34.202-82.428l3.274,84.019c0.236,6.064-3.099,11.773-8.5,14.544
+	c-5.401,2.771-11.985,2.154-16.774-1.575l-19.146-14.908l10.382,20.237c5.91,11.518-3.931,24.84-16.68,22.571L89.423,186.15
+	l66.823,41.913c5.037,3.157,7.825,8.799,7.272,14.723c-0.551,5.923-4.335,10.953-9.871,13.126l-23.123,9.081l26.43-0.665
+	c5.895-0.136,11.348,2.995,14.167,8.203c2.819,5.207,2.482,11.471-0.879,16.346l-64.508,93.605l91.737-59.821
+	c4.823-3.141,10.959-3.391,16.018-0.651c5.059,2.741,8.201,8.019,8.201,13.772v88.74l35.884-78.675
+	c1.971-4.319,5.735-7.476,10.329-8.664C272.477,335.999,277.304,336.919,281.136,339.751z"/>
+<path style="fill:#F4D44E;" d="M105.733,382.481l91.737-59.821c4.823-3.141,10.959-3.391,16.018-0.651
+	c1.687,0.915,3.155,2.116,4.371,3.518l14.684-21.307c2.957-4.289,3.253-9.8,0.774-14.382c-2.48-4.583-7.279-7.337-12.466-7.217
+	l-23.255,0.585l20.344-7.99c4.872-1.913,8.2-6.339,8.685-11.549c0.486-5.212-1.967-10.176-6.399-12.954l-58.796-36.879
+	l68.221,12.156c11.218,1.997,19.876-9.725,14.676-19.859l-9.135-17.806l16.846,13.118c4.214,3.281,10.008,3.825,14.759,1.387
+	c4.751-2.439,7.687-7.463,7.479-12.797l-1.037-26.613c-7.773,6.691-20.45,4.18-24.64-5.912l-34.199-82.429l3.274,84.019
+	c0.236,6.064-3.099,11.773-8.5,14.544c-5.401,2.771-11.985,2.154-16.774-1.575l-19.146-14.908l10.382,20.237
+	c5.91,11.519-3.931,24.84-16.68,22.571L89.423,186.15l66.823,41.913c5.037,3.157,7.824,8.799,7.272,14.723
+	c-0.552,5.922-4.335,10.952-9.871,13.126l-23.123,9.081l26.43-0.665c5.895-0.136,11.348,2.995,14.167,8.203
+	c2.82,5.207,2.482,11.471-0.879,16.345L105.733,382.481z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

package/assets/img/npc/buff.svg

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Capa_1" x="0px" y="0px" viewBox="0 0 511.625 511.625" style="enable-background:new 0 0 511.625 511.625;" xml:space="preserve" width="512" height="512">
+<path d="M403.506,255.813l73.847-127.906H329.659L255.813,0l-73.847,127.906H34.272l73.847,127.906L34.272,383.719h147.694  l73.847,127.906l73.847-127.906h147.694L403.506,255.813z M425.391,157.906l-39.206,67.906l-39.206-67.906H425.391z   M368.865,255.813l-56.526,97.906H199.286l-56.526-97.906l56.526-97.906h113.052L368.865,255.813z M255.813,60l39.206,67.906  h-78.411L255.813,60z M86.234,157.906h78.411l-39.206,67.906L86.234,157.906z M86.234,353.719l39.206-67.906l39.206,67.906H86.234z   M255.813,451.625l-39.206-67.906h78.411L255.813,451.625z M386.186,285.813l39.206,67.906H346.98L386.186,285.813z"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</svg>

package/assets/img/npc/energy.svg

@@ -0,0 +1 @@
+<svg id="bold" enable-background="new 0 0 24 24" height="512" viewBox="0 0 24 24" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m22.241 7h-.241v-.25c0-1.517-1.234-2.75-2.75-2.75h-16.5c-1.516 0-2.75 1.233-2.75 2.75v9.5c0 1.517 1.234 2.75 2.75 2.75h16.5c1.516 0 2.75-1.233 2.75-2.75v-.25h.241c.965 0 1.75-.785 1.75-1.75v-5.5c0-.965-.785-1.75-1.75-1.75zm-8.324 3.77-3.496 5.499c-.093.147-.254.231-.421.231-.057 0-.114-.01-.169-.029-.22-.08-.356-.301-.327-.533l.43-3.438-1.438-.002c-.188 0-.359-.105-.444-.271-.085-.167-.071-.367.038-.52l3.576-4.999c.135-.188.384-.258.598-.171.215.089.34.314.303.543l-.479 2.92 1.408.002c.183 0 .35.1.438.26.087.159.081.354-.017.508z"/></svg>

package/assets/img/npc/miss.svg

@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 407.654 407.654" height="512" viewBox="0 0 407.654 407.654" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m407.654 87.36h-145.588l52.209 52.209-110.444 110.455-162.657-162.671-41.174 41.174 183.243 183.258c5.46 5.46 12.867 8.516 20.587 8.516s15.128-3.057 20.587-8.516l131.031-131.042 52.205 52.205c.001 0 .001-145.588.001-145.588z"/></svg>

package/assets/img/npc/npc.svg

@@ -0,0 +1 @@
+<svg height="388pt" viewBox="0 -38 388.139 388" width="388pt" xmlns="http://www.w3.org/2000/svg"><path d="m277 61.679688c-.003906-3.90625-1.574219-7.648438-4.355469-10.390626-2.855469-2.777343-6.683593-4.324218-10.667969-4.3125-8.171874-.011718-14.839843 6.535157-14.976562 14.703126v11.390624h30zm0 0"/><path d="m89 61.679688c.046875-3.890626-1.46875-7.632813-4.210938-10.390626-2.6875-2.765624-6.382812-4.324218-10.242187-4.3125-3.882813.011719-7.597656 1.566407-10.328125 4.328126-2.730469 2.757812-4.25 6.492187-4.21875 10.375v11.390624h29zm0 0"/><path d="m168.339844 147.429688c9.390625.03125 18.40625-3.695313 25.03125-10.351563 5.15625-5.175781 8.601562-11.8125 9.867187-19.007813h-69.796875c2.832032 17.035157 17.628906 29.480469 34.898438 29.359376zm0 0"/><path d="m122.664062 207.574219c1.042969-.96875 2.414063-1.507813 3.835938-1.503907h185.121094c13.902344-.003906 25.214844-11.183593 25.378906-25.082031v-155.820312c-.164062-13.898438-11.472656-25.0859378-25.378906-25.0976565h-286.566406c-13.839844.0351565-25.0429692 11.2578125-25.054688 25.0976565v155.820312c.0117188 13.839844 11.21875 25.054688 25.054688 25.082031h18.632812c3.371094-.035156 6.164062 2.605469 6.3125 5.972657v60.339843zm112.335938-145.894531c.121094-10.84375 6.714844-20.5625 16.746094-24.675782 10.03125-4.117187 21.550781-1.835937 29.253906 5.792969 5.078125 4.976563 7.957031 11.773437 8 18.882813v17.246093c-.035156 3.359375-2.738281 6.082031-6.101562 6.144531h-41.40625c-3.3125 0-6.492188-2.832031-6.492188-6.144531zm-108.066406 44.390624h82.808594c1.589843-.011718 3.113281.609376 4.238281 1.730469 1.128906 1.117188 1.761719 2.636719 1.761719 4.222657-.117188 26.097656-21.308594 47.1875-47.402344 47.1875-26.097656 0-47.285156-21.089844-47.40625-47.1875.003906-1.585938.636718-3.105469 1.761718-4.222657 1.128907-1.117187 2.652344-1.742187 4.238282-1.730469zm-78.933594-27.144531v-17.246093c-.035156-14.71875 11.875-26.675782 26.59375-26.703126.445312 0 .835938.011719 1.277344.035157.167968.007812.3125.023437.480468.035156.269532.019531.53125.035156.800782.0625.269531.023437.527344.0625.792968.097656.167969.023438.335938.039063.5.0625.328126.050781.652344.109375.976563.167969.101563.019531.210937.035156.3125.054688.417969.082031.828125.175781 1.242187.277343l.03125.007813c.339844.085937.671876.179687 1.007813.277344.082031.027343.167969.046874.25.070312.800781.242188 1.585937.523438 2.355469.839844l.089844.035156c.355468.148438.707031.304688 1.058593.46875.042969.019531.085938.035156.125.058594.347657.164062.691407.335937 1.03125.515625.042969.023437.085938.042969.128907.066406.320312.171875.636718.355469.949218.539063.058594.035156.125.066406.183594.101562.261719.15625.515625.320312.773438.488281.109374.070313.222656.136719.328124.210938.226563.148437.445313.308593.664063.46875.136719.097656.273437.1875.40625.285156.226563.167969.441406.34375.660156.515625.125.097656.253907.195312.375.296875.203125.167969.402344.34375.601563.519531.132812.117188.273437.226563.398437.347656.175781.160157.34375.328126.515625.492188.148438.140625.300782.277344.445313.421875h-.085938c5.003907 5.003906 7.789063 11.804687 7.730469 18.882813v17.246093c.046875 1.585938-.539062 3.125-1.632812 4.277344-1.089844 1.152344-2.59375 1.824219-4.179688 1.867187h-41.410156c-1.582032-.042968-3.082032-.714843-4.167969-1.871093-1.085937-1.152344-1.664063-2.691407-1.609375-4.273438zm0 0"/><path d="m216.773438 311.890625c19.140624.109375 35.441406-13.886719 38.226562-32.820313h50.199219c40.152343.074219 72.753906-32.429687 72.800781-72.578124v-74.960938c6.414062-8.109375 9.976562-18.109375 10.140625-28.449219-.023437-22.707031-16.671875-41.976562-39.140625-45.292969v90.582032c6.035156-.890625 11.824219-3.011719 17-6.242188v64.359375c-.019531 16.101563-6.4375 31.53125-17.839844 42.894531-11.40625 11.363282-26.859375 17.726563-42.960937 17.6875h-50.199219c-3.253906-20.316406-21.839844-34.535156-42.300781-32.363281-20.460938 2.171875-35.644531 19.976563-34.558594 40.523438 1.085937 20.550781 18.0625 36.65625 38.636719 36.660156zm0 0"/></svg>

package/assets/img/npc/radar.svg

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M256,0C114.848,0,0,114.848,0,256s114.848,256,256,256s256-114.848,256-256S397.152,0,256,0z M256,320
+			c11.84,0,22.784-3.456,32.288-9.088l45.76,45.76C312.416,373.568,285.536,384,256,384c-70.592,0-128-57.408-128-128
+			s57.408-128,128-128c29.536,0,56.384,10.464,78.08,27.296l-45.792,45.76C278.784,195.456,267.84,192,256,192
+			c-35.296,0-64,28.704-64,64C192,291.296,220.704,320,256,320z M256,96c-88.224,0-160,71.776-160,160s71.776,160,160,160
+			c38.336,0,73.088-14.112,100.672-36.672l45.76,45.76C363.136,459.2,312,480,256,480C132.48,480,32,379.488,32,256
+			C32,132.48,132.48,32,256,32c56,0,107.136,20.8,146.464,54.912l-45.792,45.76C329.088,110.112,294.336,96,256,96z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

package/assets/img/npc/shield.svg

@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m121.472 166.116c2.024 24.213 6.672 57.38 17.189 92.205 22.336 73.956 61.794 126.543 117.339 156.427 55.545-29.884 95.003-82.471 117.338-156.427 10.517-34.822 15.164-67.99 17.19-92.205l-134.528-67.264z"/><path d="m481.854 119.657c-.28-5.394-3.44-10.221-8.271-12.636l-210.875-105.438c-4.223-2.111-9.193-2.111-13.416 0l-210.875 105.438c-4.831 2.415-7.991 7.242-8.271 12.636-.16 3.07-3.628 76.168 21.273 161.035 14.734 50.214 36.406 94.071 64.414 130.354 35.295 45.722 80.659 79.357 134.832 99.973 1.719.653 3.526.98 5.335.98s3.616-.327 5.335-.98c54.173-20.615 99.537-54.251 134.832-99.973 28.008-36.283 49.68-80.141 64.414-130.354 24.901-84.867 21.433-157.965 21.273-161.035zm-219.206 325.414c-2.095 1.036-4.372 1.554-6.648 1.554s-4.554-.518-6.648-1.554c-66.792-33.024-113.696-92.938-139.408-178.076-12.86-42.583-17.503-82.709-19.133-108.871-.375-6.008 2.879-11.657 8.263-14.349l150.219-75.109c4.223-2.11 9.193-2.111 13.416 0l150.22 75.109c5.384 2.691 8.638 8.342 8.263 14.35-1.631 26.164-6.274 66.291-19.134 108.87-25.714 85.137-72.618 145.051-139.41 178.076z"/></g></svg>

package/assets/img/npc/sight.svg

@@ -0,0 +1 @@
+<svg id="Capa_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m256 303.221c24.951 0 45.25-20.299 45.25-45.25s-20.299-45.25-45.25-45.25-45.25 20.299-45.25 45.25 20.299 45.25 45.25 45.25zm0-60.25c8.409 0 14.636 6.873 15 15 .363 8.101-7.154 15-15 15-8.409 0-14.636-6.873-15-15-.363-8.101 7.154-15 15-15z"/><path d="m508.175 247.964c-1.15-1.284-28.674-31.804-73.237-62.585-59.58-41.155-121.456-62.908-178.938-62.908s-119.357 21.753-178.938 62.908c-44.563 30.782-72.087 61.301-73.237 62.585-5.1 5.696-5.1 14.316 0 20.013 1.15 1.284 28.674 31.804 73.237 62.585 59.581 41.155 121.457 62.908 178.938 62.908s119.357-21.753 178.938-62.908c44.563-30.782 72.087-61.301 73.237-62.585 5.1-5.696 5.1-14.316 0-20.013zm-252.175-65.243c41.493 0 75.25 33.757 75.25 75.25s-33.757 75.25-75.25 75.25-75.25-33.757-75.25-75.25 33.757-75.25 75.25-75.25z"/><path d="m256 100.221c8.284 0 15-6.716 15-15v-50.25c0-8.284-6.716-15-15-15s-15 6.716-15 15v50.25c0 8.284 6.716 15 15 15z"/><path d="m151.813 106.585c2.894 4.318 7.64 6.651 12.474 6.651 2.871 0 5.773-.823 8.337-2.541 6.882-4.612 8.722-13.929 4.11-20.811l-28.774-42.935c-4.611-6.881-13.93-8.722-20.811-4.11-6.882 4.612-8.722 13.929-4.11 20.811z"/><path d="m339.376 110.695c2.564 1.719 5.466 2.541 8.337 2.541 4.834 0 9.581-2.333 12.475-6.651l28.773-42.935c4.611-6.882 2.771-16.199-4.11-20.811-6.882-4.613-16.199-2.772-20.812 4.11l-28.773 42.935c-4.612 6.882-2.772 16.199 4.11 20.811z"/><path d="m256 411.779c-8.284 0-15 6.716-15 15v50.25c0 8.284 6.716 15 15 15s15-6.716 15-15v-50.25c0-8.284-6.716-15-15-15z"/><path d="m360.187 405.415c-4.612-6.882-13.931-8.722-20.812-4.11-6.882 4.612-8.722 13.929-4.11 20.811l28.773 42.935c2.894 4.318 7.64 6.651 12.475 6.651 2.871 0 5.773-.823 8.337-2.541 6.882-4.612 8.722-13.929 4.11-20.811z"/><path d="m172.624 401.305c-6.881-4.612-16.198-2.772-20.811 4.11l-28.774 42.935c-4.612 6.882-2.772 16.199 4.11 20.811 2.564 1.719 5.466 2.541 8.337 2.541 4.834 0 9.581-2.333 12.474-6.651l28.774-42.935c4.613-6.882 2.772-16.199-4.11-20.811z"/></g></svg>

package/assets/img/npc/skull.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 833.7 833.7" style="enable-background:new 0 0 833.7 833.7;" xml:space="preserve">
+<g>
+	<path d="M415.5,88.8C252.9,88.8,121,220.7,121,383.4v138.8c0,7.3,3.4,14.2,9.3,18.7L256.9,637v79.2c0,13,10.5,23.4,23.4,23.4h18.8
+		c13,0,23.4-10.5,23.4-23.4v-32.2c0-8.2,6.6-14.8,14.8-14.8l0,0c8.2,0,14.8,6.6,14.8,14.8v32.2c0,13,10.5,23.4,23.4,23.4h0.8
+		c13,0,23.4-10.5,23.4-23.4v-32.2c0-8.2,6.6-14.8,14.8-14.8h1.6c8.2,0,14.8,6.6,14.8,14.8v32.2c0,13,10.5,23.4,23.4,23.4h0.8
+		c13,0,23.4-10.5,23.4-23.4v-32.2c0-8.2,6.6-14.8,14.8-14.8l0,0c8.2,0,14.8,6.6,14.8,14.8v32.2c0,13,10.5,23.4,23.4,23.4h18.9
+		c13,0,23.4-10.5,23.4-23.4v-79.3l126.6-96.1c5.9-4.5,9.3-11.3,9.3-18.7V383.4C710,220.7,578.1,88.8,415.5,88.8z M292.4,524.5
+		c-44.8,0-81.2-36.4-81.2-81.2c0-44.8,36.4-81.2,81.2-81.2s81.2,36.4,81.2,81.2C373.6,488.2,337.2,524.5,292.4,524.5z M438.6,584.2
+		h-46.1c-10.7,0-17.5-11.5-12.3-20.8l23.1-41.9c5.3-9.7,19.3-9.7,24.6,0l23.1,41.9C456,572.8,449.2,584.2,438.6,584.2z M538.6,524.5
+		c-44.8,0-81.2-36.4-81.2-81.2c0-44.8,36.4-81.2,81.2-81.2c44.8,0,81.2,36.4,81.2,81.2C619.8,488.2,583.5,524.5,538.6,524.5z"/>
+</g>
+</svg>

package/assets/img/npc/target.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="953px" height="953px" viewBox="0 0 953 953" style="enable-background:new 0 0 953 953;" xml:space="preserve">
+<g>
+	<g>
+		<path d="M430.589,953c236.6,0,428.401-191.801,428.401-428.4c0-72.799-18.102-141.299-50.102-201.299c-3.5,0.5-7.1,0.7-10.6,0.7
+			c-2,0-4.1-0.1-6.199-0.2l-54.5-4.2l-39.201,39.2c29.9,48.2,47.201,105,47.201,165.799c0,173.9-141,314.9-314.901,314.9
+			c-173.899,0-315-141-315-314.9c0-173.899,141-314.899,314.9-314.899c60.901,0,117.7,17.3,165.799,47.2l35.5-35.5l-4.799-62.5
+			c-0.4-5-0.301-10,0.199-14.9c-58.9-30.5-125.799-47.8-196.799-47.8c-236.5,0-428.3,191.8-428.3,428.399S193.989,953,430.589,953z"
+			/>
+		<path d="M430.589,413.9c2.8,0,5.6,0.101,8.4,0.3l79.1-79.1l1.699-1.7c-27.1-12.7-57.299-19.8-89.2-19.8
+			c-116.5,0-210.9,94.4-210.9,210.9c0,116.5,94.4,211,210.9,211c116.5,0,210.901-94.4,210.901-210.9
+			c0-31.9-7.102-62.099-19.801-89.2l-1.699,1.7l-79.102,79.099c0.201,2.801,0.301,5.602,0.301,8.4
+			c0,61.1-49.5,110.701-110.7,110.701c-61.2,0-110.601-49.602-110.601-110.701C319.889,463.5,369.489,413.9,430.589,413.9z"/>
+		<path d="M872.089,142.6l25.4-25.4c11.6-11.6,11.6-30.3,0-41.9l-17.602-17.7c-5.799-5.8-13.398-8.7-20.898-8.7
+			s-15.201,2.9-20.9,8.7l-29.1,29.1l-6-77.5c-0.4-5.7-5.102-9.2-10-9.2c-2.5,0-5,0.9-7,2.9l-114.5,114.5
+			c-10.301,10.3-15.602,24.6-14.5,39.2l0.299,4.5l5.5,71.7l-41.4,41.4l-74.5,74.5l-1.699,1.7l-72.1,72.101l-32,32
+			c-4.2,4.199-6.8,9.8-7.2,15.699l-2,25.101c-1.2,14.6,10.4,27,24.9,27c0.399,0,0.8,0,1.3,0l26.5-1.301
+			c6.199-0.301,12.1-2.9,16.4-7.301L532.689,482l72.1-72.1l1.701-1.7l74.5-74.5l45-45l65.398,5l2.9,0.2c1.301,0.1,2.6,0.1,3.801,0.1
+			c13.199,0,25.9-5.2,35.4-14.6L947.888,165c6-6,2.201-16.4-6.299-17L872.089,142.6z"/>
+	</g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>

package/assets/js/macro.js

@@ -1,6 +1,5 @@
 import JX3_MACRO from '@jx3box/jx3box-macro'
 import $ from 'jquery'
-import "@jx3box/jx3box-macro/macro.css";
 
 function macro(selector=".e-jx3macro-area"){
     try {

package/assets/js/qixue.js

@@ -1,6 +1,5 @@
 import JX3_QIXUE from '@jx3box/jx3box-talent'
 import $ from 'jquery'
-import "@jx3box/jx3box-talent/talent.css";
 
 function qixue(selector=".e-jx3qixue-area"){
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-editor",
-  "version": "1.0.7",
+  "version": "1.1.1",
   "description": "JX3BOX Article & Editor",
   "main": "index.js",
   "scripts": {

package/service/database.js

@@ -94,4 +94,15 @@ function getSkill(client = "std", id, level) {
     });
 }
 
-export { loadResource, loadStat, getIcons, getBuff, getSkill };
+function getNpc(client = 'std', id) {
+    return $node().get('/npc/id/' + id, {
+        params: {
+            client,
+            strict: 0,
+            per: 10,
+            page: 1
+        }
+    })
+}
+
+export { loadResource, loadStat, getIcons, getBuff, getSkill, getNpc };

package/src/Article.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="c-article-box">
+    <div class="c-article-tinymce c-article-box">
         <!-- <div id="c-article-origin" class="c-article-origin" ref="origin"><slot></slot></div> -->
         <div id="c-article" class="c-article" ref="article" v-if="pageable">
             <div
@@ -202,7 +202,7 @@ export default {
                 target = "#c-article";
             }
             let dir = renderDirectory(target, this.directorybox);
-            if (dir) this.$emit("directoryRendered");
+            this.$emit("directoryRendered",dir);
         },
         changePage: function (i) {
             this.page = i;

package/src/ArticleMarkdown.vue

@@ -1,10 +1,11 @@
 <template>
     <div class="c-article-markdown">
-        <markdown-render id="c-article" class="c-markdown" ref="article" v-model="origin" @change="updateOrigin" :preRender="doReg"></markdown-render>
+        <markdown-render id="c-article" class="c-markdown c-article" ref="article" v-model="origin" @change="updateOrigin" :preRender="doReg" :xssOptions="xssOptions"></markdown-render>
         <div class="w-jx3-element-pop" :style="jx3_element.style">
             <jx3-item :item_id="item.id" :jx3ClientType="item.client" v-show="jx3_element.type == 'item'" />
             <jx3-buff :client="buff.client" :id="buff.id" :level="buff.level" v-show="jx3_element.type == 'buff'" />
             <jx3-skill :client="skill.client" :id="skill.id" :level="skill.level" v-show="jx3_element.type == 'skill'" />
+            <jx3-npc :client="npc.client" :id="npc.id" v-show="jx3_element.type === 'npc'"></jx3-npc>
         </div>
     </div>
 </template>
@@ -30,6 +31,7 @@ import renderCode from "../assets/js/code";
 import Item from "./Item";
 import Buff from "./Buff";
 import Skill from "./Skill";
+import Npc from "./Npc";
 import renderJx3Element from "../assets/js/jx3_element";
 
 import {xssOptions} from '../assets/data/markdown_whitelist.json'
@@ -64,6 +66,11 @@ export default {
                 id: "",
                 level: "",
             },
+            // NPC
+            npc: {
+                client: 'std',
+                id: ""
+            },
             jx3_element: {
                 style: {
                     top: 0,
@@ -107,7 +114,7 @@ export default {
         doDir: function() {
             let target = "#c-article";
             let dir = renderDirectory(target, this.directorybox);
-            if (dir) this.$emit("directoryRendered");
+            this.$emit("directoryRendered",dir);
         },
         updateOrigin : function (md,html){
             this.html = html
@@ -141,6 +148,7 @@ export default {
         "jx3-item": Item,
         "jx3-buff": Buff,
         "jx3-skill": Skill,
+        "jx3-npc": Npc,
         markdownRender,
     },
 };

package/src/Markdown.vue

@@ -5,17 +5,21 @@
 
         <div class="c-editor-header">
             <Upload v-if="attachmentEnable" @insert="insertAttachments" :enable="true" />
-            <Resource v-if="resourceEnable" @insert="insertResource" :enable="false" />
+            <Resource v-if="resourceEnable" @insert="insertResource" :enable="true" />
         </div>
 
         <slot></slot>
 
-        <markdown-editor class="c-markdown" ref="md" v-model="data" @change="updateData" :subfield="false">
+        <markdown-editor class="c-markdown c-article" ref="md" v-model="data" @change="updateData" :subfield="false" :xssOptions="xssOptions">
             <template slot="left-toolbar-after">
+                <markdown-katex @insert="insertKatex" />
                 <span class="c-markdown-toolbar-image c-markdown-toolbar-item" title="上传图片" @click="selectImages"><i class="el-icon-picture-outline-round"></i></span>
                 <span class="c-markdown-toolbar-file c-markdown-toolbar-item" title="上传附件" @click="selectFiles"><i class="el-icon-paperclip"></i></span>
-                <!-- <macro @insert="insertMacro" /> -->
-                <!-- <pz @insert="insertPz" /> -->
+                <markdown-video @insert="insertVideo" />
+                <markdown-macro @insert="insertMacro" />
+                <markdown-pz @insert="insertPz" />
+                <markdown-talent @insert="insertTalent" />
+                <markdown-talent2 @insert="insertTalent2" />
             </template>
         </markdown-editor>
         <input class="c-markdown-store-item" id="c-markdown-store-images" type="file" @change="uploadImages" ref="markdownImages" multiple :accept="allow_image_types" />
@@ -35,9 +39,12 @@ import Upload from "./Upload";
 import Resource from "./Resource";
 
 // jx3
-// import macro from './components/markdown/macro.vue'
-// import pz from './components/markdown/pz.vue'
-
+import markdownMacro from './components/markdown/macro.vue'
+import markdownPz from './components/markdown/pz.vue'
+import markdownKatex from './components/markdown/katex.vue'
+import markdownTalent from './components/markdown/talent.vue'
+import markdownTalent2 from './components/markdown/talent2.vue'
+import markdownVideo from './components/markdown/video.vue'
 
 export default {
     name: "Markdown",
@@ -67,8 +74,12 @@ export default {
         Upload,
         Resource,
         
-        // macro,
-        // pz,
+        markdownMacro,
+        markdownPz,
+        markdownKatex,
+        markdownTalent,
+        markdownTalent2,
+        markdownVideo,
     },
     data: function() {
         return {
@@ -207,8 +218,12 @@ export default {
             }
         },
         insertResource: function(data) {
-            // TODO:
-            // tinyMCE.editors["tinymce"].insertContent(data);
+            console.log(data)
+            this.$md.insertText(this.$md.getTextareaDom(), {
+                prefix: data,
+                subfix: "",
+                str: "",
+            });
         },
         insertMacro(data) {
             this.$md.insertText(this.$md.getTextareaDom(), {
@@ -223,6 +238,34 @@ export default {
                 subfix: "",
                 str: "",
             });
+        },
+        insertKatex(data) {
+            this.$md.insertText(this.$md.getTextareaDom(), {
+                prefix: data,
+                subfix: "",
+                str: "",
+            });
+        },
+        insertTalent(data) {
+            this.$md.insertText(this.$md.getTextareaDom(), {
+                prefix: data,
+                subfix: "",
+                str: "",
+            });
+        },
+        insertTalent2(data) {
+            this.$md.insertText(this.$md.getTextareaDom(), {
+                prefix: data,
+                subfix: "",
+                str: "",
+            });
+        },
+        insertVideo(data) {
+            this.$md.insertText(this.$md.getTextareaDom(), {
+                prefix: data,
+                subfix: "",
+                str: "",
+            });
         }
     },
     filters: {},