@jx3box/jx3box-editor 3.0.11 → 3.0.13

package/config/global.less

@@ -2,7 +2,6 @@
 // 旧主题色
 // @primary:#0366d6;
 @primary:#4f46e5;
-@v4yellow: #f5bd1e;
 
 // 文字颜色（黑底、白底）
 @color: #3d454d;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-editor",
-    "version": "3.0.11",
+    "version": "3.0.13",
     "description": "JX3BOX Article & Editor",
     "main": "index.js",
     "scripts": {
@@ -15,11 +15,11 @@
     "dependencies": {
         "@element-plus/icons-vue": "^2.0.10",
         "@imengyu/vue3-context-menu": "^1.5.4",
-        "@jx3box/jx3box-common": "^9.1.8",
+        "@jx3box/jx3box-common": "^9.1.3",
         "@jx3box/jx3box-data": "^3.9.4",
         "@jx3box/jx3box-emotion": "^1.3.0",
         "@jx3box/jx3box-macro": "^1.0.3",
-        "@jx3box/jx3box-talent": "^1.3.12",
+        "@jx3box/jx3box-talent": "^1.3.13",
         "@tinymce/tinymce-vue": "^5.0.0",
         "axios": "^0.19.2",
         "cheerio": "^1.1.2",

package/src/Article.vue

@@ -59,38 +59,38 @@ import Vditor from "vditor";
 import "github-markdown-css/github-markdown-light.css";
 
 // XSS
-import execFilterXSS from "./assets/js/xss";
+import execFilterXSS from "./assets/js/xss.js";
 
 // 基本文本
-import execLazyload from "./assets/js/img";
-import execFilterIframe from "./assets/js/iframe";
-import execFilterLink from "./assets/js/a";
-import execSplitPages from "./assets/js/nextpage";
-import normalizeMarkdownForVditor from "./assets/js/normalizeMarkdownForVditor";
+import execLazyload from "./assets/js/img.js";
+import execFilterIframe from "./assets/js/iframe.js";
+import execFilterLink from "./assets/js/a.js";
+import execSplitPages from "./assets/js/nextpage.js";
+import normalizeMarkdownForVditor from "./assets/js/normalizeMarkdownForVditor.js";
 
 // 扩展文本
-import renderFoldBlock from "./assets/js/fold";
-import renderDirectory from "./assets/js/directory";
-import renderKatex from "./assets/js/katex";
-import renderCode from "./assets/js/code";
-import renderImgPreview from "./assets/js/renderImgPreview";
+import renderFoldBlock from "./assets/js/fold.js";
+import renderDirectory from "./assets/js/directory.js";
+import renderKatex from "./assets/js/katex.js";
+import renderCode from "./assets/js/code.js";
+import renderImgPreview from "./assets/js/renderImgPreview.js";
 
 // 魔盒
-import renderMacro from "./assets/js/macro";
-import renderTalent from "./assets/js/qixue";
-import renderTalent2 from "./assets/js/talent2";
-import renderPzIframe from "./assets/js/pz_iframe";
-import renderCombo from "./assets/js/combo";
-import renderAudio from "./assets/js/audio";
-import Author from "./components/Author";
+import renderMacro from "./assets/js/macro.js";
+import renderTalent from "./assets/js/qixue.js";
+import renderTalent2 from "./assets/js/talent2.js";
+import renderPzIframe from "./assets/js/pz_iframe.js";
+import renderCombo from "./assets/js/combo.js";
+import renderAudio from "./assets/js/audio.js";
+import Author from "./components/Author.vue";
 import PostAuthor from "./components/PostAuthor.vue";
 
 // 剑三
-import Item from "./Item";
-import Buff from "./Buff";
-import Skill from "./Skill";
-import Npc from "./Npc";
-import renderJx3Element from "./assets/js/jx3_element";
+import Item from "./Item.vue";
+import Buff from "./Buff.vue";
+import Skill from "./Skill.vue";
+import Npc from "./Npc.vue";
+import renderJx3Element from "./assets/js/jx3_element.js";
 
 export default {
     name: "Article",

package/src/ArticleMarkdown.vue

@@ -27,27 +27,27 @@
 import markdownRender from "@jx3box/markdown/src/render.vue";
 
 // 基本文本
-import execLazyload from "./assets/js/img";
-import execFilterIframe from "./assets/js/iframe";
-import execFilterLink from "./assets/js/a";
-import execFilterXSS from "./assets/js/script";
+import execLazyload from "./assets/js/img.js";
+import execFilterIframe from "./assets/js/iframe.js";
+import execFilterLink from "./assets/js/a.js";
+import execFilterXSS from "./assets/js/script.js";
 
 // 扩展文本
-import renderDirectory from "./assets/js/directory";
-import renderMacro from "./assets/js/macro";
-import renderTalent from "./assets/js/qixue";
-import renderTalent2 from "./assets/js/talent2";
-import { renderKatexAll } from "./assets/js/katex";
-import renderCode from "./assets/js/code";
+import renderDirectory from "./assets/js/directory.js";
+import renderMacro from "./assets/js/macro.js";
+import renderTalent from "./assets/js/qixue.js";
+import renderTalent2 from "./assets/js/talent2.js";
+import renderKatexAll from "./assets/js/katex.js";
+import renderCode from "./assets/js/code.js";
 
 // 剑三
-import Item from "./Item";
-import Buff from "./Buff";
-import Skill from "./Skill";
-import Npc from "./Npc";
-import renderJx3Element from "./assets/js/jx3_element";
-import renderImgPreview from "./assets/js/renderImgPreview";
-import renderAudio from "./assets/js/audio";
+import Item from "./Item.vue";
+import Buff from "./Buff.vue";
+import Skill from "./Skill.vue";
+import Npc from "./Npc.vue";
+import renderJx3Element from "./assets/js/jx3_element.js";
+import renderImgPreview from "./assets/js/renderImgPreview.js";
+import renderAudio from "./assets/js/audio.js";
 
 import { xssOptions } from "./assets/data/markdown_whitelist.json";
 

package/src/BoxResource.vue

@@ -190,9 +190,9 @@
 </template>
 
 <script>
-import { loadStat } from "./service/database";
-import { loadAuthors, loadEmotions, getLetterPaper } from "./service/cms";
-import { getUserInfo } from "./service/author";
+import { loadStat } from "./service/database.js";
+import { loadAuthors, loadEmotions, getLetterPaper } from "./service/cms.js";
+import { getUserInfo } from "./service/author.js";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import { getLink, showAvatar, resolveImagePath } from "@jx3box/jx3box-common/js/utils";
 import User from "@jx3box/jx3box-common/js/user";

package/src/GameText.vue

@@ -11,7 +11,7 @@
 
 <script>
 import { extractTextContent, getLink, iconLink } from "@jx3box/jx3box-common/js/utils";
-import { getResource as getResourceFromNode } from "./service/resource";
+import { getResource as getResourceFromNode } from "./service/resource.js";
 import { escape } from "lodash";
 import gameFonts from "./assets/data/game_font.json";
 

package/src/ItemSimple.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import Item from "./Item";
+import Item from "./Item.vue";
 import icon_url from "./assets/js/item/icon_url.js";
 import item_color from "./assets/js/item/color.js";
 import item_border from "./assets/js/item/border.js";

package/src/Markdown.vue

@@ -35,7 +35,7 @@ import {
 import Vditor from "vditor";
 import "vditor/dist/index.css";
 import "github-markdown-css/github-markdown-light.css";
-import normalizeMarkdownForVditor from "./assets/js/normalizeMarkdownForVditor";
+import normalizeMarkdownForVditor from "./assets/js/normalizeMarkdownForVditor.js";
 
 const { __cms } = JX3BOX;
 const UPLOAD_API = `${__cms}api/cms/upload`;

package/src/Resource.vue

@@ -286,7 +286,7 @@
 
 <script>
 import { ArrowDown, Histogram } from "@element-plus/icons-vue";
-import { loadResource, loadStat, getIcons } from "./service/database";
+import { loadResource, loadStat, getIcons } from "./service/database.js";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import detach_types from "./assets/data/detach_type.json";
 import { iconLink, getLink as resolveLink } from "@jx3box/jx3box-common/js/utils";

package/src/Tinymce.vue

@@ -42,9 +42,9 @@ const { __cdn, __imgPath, __cms } = JX3BOX;
 // 开发环境走 devServer proxy，避免跨域导致粘贴图片上传“看起来没反应”
 const apiUrl = process.env.NODE_ENV === "development" ? "/api/cms/upload/tinymce" : __cms + "api/cms/upload/tinymce";
 
-import Upload from "./Upload";
-import Resource from "./Resource";
-import BoxResource from "./BoxResource";
+import Upload from "./Upload.vue";
+import Resource from "./Resource.vue";
+import BoxResource from "./BoxResource.vue";
 import Emotion from "@jx3box/jx3box-emotion/src/Emotion.vue";
 
 import axios from "axios";

package/src/Upload.vue

@@ -88,7 +88,7 @@ import axios from "axios";
 import { Delete, Plus, UploadFilled, ZoomIn } from "@element-plus/icons-vue";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import allow_types from "@jx3box/jx3box-common/data/conf";
-import { showImgPreview } from "./assets/js/renderImgPreview";
+import { showImgPreview } from "./assets/js/renderImgPreview.js";
 const { __cms } = JX3BOX;
 const API = __cms + "api/cms/upload";
 const imgtypes = ["jpg", "png", "gif", "bmp", "webp", "jpeg", "svg"];

package/src/assets/css/tinymce/h.less

@@ -32,11 +32,12 @@
 
     h4 {
         font-size: 15px;
-        padding: 8px 10px 8px 20px;
+        padding: 8px 10px;
 
         background-color: #fafbfc;
         border-radius: 6px;
-        // border-left:4px solid @primary;
+        border-left:4px solid @primary;
+
 
         position: relative;
         overflow: hidden;
@@ -44,39 +45,17 @@
         // border: 1px solid @primary;
         &::before {
             content: "";
+            font-size: 20px;
             display: block;
             position: absolute;
-            width: 5px;
-            height: 60%;
-            top: 50%;
-            transform: translateY(-50%);
-            left: 10px;
-            background-color: @primary;
-            border-radius: 10px;
-            transition: all 0.2s ease;
+            width: 80px;
+            height: 3px;
+            top: 0;
+            left: 15px;
+            // background-color: @primary;
             // border-bottom-right-radius: 20px;
             // border-bottom-left-radius: 20px;
         }
-        // &::after {
-        //     content: "";
-        //     display: block;
-        //     position: absolute;
-        //     width: 5px;
-        //     height: 60%;
-        //     top: 50%;
-        //     transform: translateY(-50%);
-        //     left: 10px;
-        //     background-color: @v4yellow;
-        //     border-radius: 10px;
-        //     z-index: 2;
-        //     display: none;
-        // }
-
-        &:hover {
-            &::before {
-                background-color: @v4yellow;
-            }
-        }
     }
 
     h5 {
@@ -95,11 +74,6 @@
             bottom: -1px;
             left: 0;
         }
-        &:hover{
-            &::after {
-                background-color: @v4yellow;
-            }
-        }
     }
 
     h6 {

package/src/assets/css/tinymce/pz.less

@@ -37,3 +37,8 @@
         display: block;
     }
 }
+
+.w-pz-iframe-wrap {
+    width: 100%;
+    overflow: auto;
+}

package/src/assets/js/pz_iframe.js

@@ -1,23 +1,23 @@
 import $ from "jquery";
-function buildIframe(str){
+function buildIframe(str) {
     let _str = new URLSearchParams(str);
-    let mode = _str.get('mode')
+    let mode = _str.get("mode");
 
-    if(mode == 'vertical'){
-        return `<iframe class="w-pz-iframe" src="${str}" scrolling="no" width="750" height="3468" style="border:none;background:none;max-width:100%;overflow:hidden;"></iframe>`
-    }else{
-        return `<iframe class="w-pz-iframe" src="${str}" scrolling="no" width="1280" height="720" style="border:none;background:none;max-width:100%;overflow:hidden;"></iframe>`
+    if (mode == "vertical") {
+        return `<div class="w-pz-iframe-wrap"><iframe class="w-pz-iframe" src="${str}" scrolling="no" width="750" height="3468" style="border:none;background:none;max-width:100%;overflow:hidden;"></iframe></div>`;
+    } else {
+        return `<div class="w-pz-iframe-wrap"><iframe class="w-pz-iframe" src="${str}" scrolling="no" width="1280" height="720" style="border:none;background:none;max-width:100%;overflow:hidden;"></iframe></div>`;
     }
 }
 
-function renderPzIframe(selector = ".e-pz-iframe"){
+function renderPzIframe(selector = ".e-pz-iframe") {
     try {
-        $(selector).each(function(i, ele) {
+        $(selector).each(function (i, ele) {
             // 获取嵌入源地址
-            let url =  $(this).text();
+            let url = $(this).text();
 
             // 构建嵌入源码
-            let code = buildIframe(url)
+            let code = buildIframe(url);
 
             // 挂载点
             $(this).after(code);
@@ -27,4 +27,4 @@ function renderPzIframe(selector = ".e-pz-iframe"){
     }
 }
 
-export default renderPzIframe
+export default renderPzIframe;

package/src/components/Author.vue

@@ -70,8 +70,8 @@
 
 <script>
 import { authorLink, getLink, getMedalLink, getThumbnail } from "@jx3box/jx3box-common/js/utils";
-import { getUserInfo, getUserMedals, getUserPublicTeams } from "../service/author";
-import { getDecoration, getDecorationJson } from "../service/cms";
+import { getUserInfo, getUserMedals, getUserPublicTeams } from "../service/author.js";
+import { getDecoration, getDecorationJson } from "../service/cms.js";
 import User from "@jx3box/jx3box-common/js/user";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import Avatar from "./Avatar.vue";

package/src/components/Combo.vue

@@ -154,7 +154,7 @@ import { h } from "vue";
 import { ElIcon } from "element-plus";
 import { Check, Close } from "@element-plus/icons-vue";
 import { iconLink } from "@jx3box/jx3box-common/js/utils";
-import { getSkill } from "../service/resource";
+import { getSkill } from "../service/resource.js";
 import SkillMartial from "./SkillMartial.vue";
 
 import Sortable from "sortablejs";

package/src/components/PostAuthor.vue

@@ -27,7 +27,7 @@
 
 <script>
 import { authorLink } from "@jx3box/jx3box-common/js/utils";
-import { getEmotion } from "../service/author";
+import { getEmotion } from "../service/author.js";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import dayjs from "dayjs";
 import Avatar from "./Avatar.vue";

package/src/components/SkillMartial.vue

@@ -178,7 +178,7 @@ import {
     getSkills,
     getTalents,
     getMobileForceSkillList,
-} from "../service/node";
+} from "../service/node.js";
 import kungfumap_std from "@jx3box/jx3box-data/data/martial/kungfu_std.json";
 import kungfumap_origin from "@jx3box/jx3box-data/data/martial/kungfu_origin.json";
 import { flattenDeep, uniqBy } from "lodash";