@jx3box/jx3box-editor 1.1.7 → 1.2.1

package/assets/css/module/buff.less

@@ -14,7 +14,9 @@
 
     .w-buff-icon {
         .size(48px);
-        .mr(10px);
+        border:none;
+        padding:0;
+        margin:0 10px 0 0;
     }
 
     .w-buff-content {

package/assets/css/module/item.less

@@ -85,10 +85,13 @@
         background-color: rgba(15, 34, 34, 0.88);
         // background-color: #0f2222;
         color: #ffffff;
-        text-shadow: 1px 1px 1px #0f2222;
-        font-weight: normal;
-        font-size: 13.6px;
-        line-height: 1.5em;
+        
+        *{
+            font-weight: normal;
+            font-size: 13.6px;
+            line-height: 1.5em;
+            text-shadow: 1px 1px 1px #0f2222;
+        }
 
         &:before {
             content: "";

package/assets/css/module/npc.less

@@ -4,23 +4,19 @@
     .w-npc-wrapper {
         @min-width: 200px;
         min-width: @min-width;
-        padding: 9px 10px 10px;
         background-color: rgba(15, 34, 34, 0.88);
         box-sizing: border-box;
         display: flex;
 
-        div {
-            margin: 2px 0;
-        }
 
         .w-npc-content {
             box-shadow: 0 0 3px rgba(0, 0, 0, 0.2);
-            margin-bottom: 10px;
-            padding: 10px;
             .r(4px);
             .clearfix;
             .fz(13px);
             color: #e7e7e7;
+            margin:0;
+            padding:5px 15px 10px 15px;
         }
 
         .u-icon {
@@ -45,7 +41,7 @@
 
         .u-id {
             .pa;
-            .rt(22px,28px);
+            .rt(15px,10px);
             .pointer;
             color: #5df9eb;
         }

package/assets/css/module/skill.less

@@ -14,7 +14,9 @@
 
     .w-skill-icon{
         .size(48px);
-        .mr(10px);
+        border:none;
+        padding:0;
+        margin:0 10px 0 0;
     }
 
     .w-skill-content{

package/assets/js/item/hljs_languages.js

@@ -0,0 +1,177 @@
+/**
+ * highlight.js 默认支持（不需要额外装库）的语法
+ * https://github.com/highlightjs/highlight.js/blob/main/SUPPORTED_LANGUAGES.md
+ */
+
+export default [
+    // 不加参数时默认的
+    { text: "JSON", value: "json" },
+    { text: "Lua", value: "lua" },
+    { text: "HTML, XML", value: "xml" },
+    { text: "Bash", value: "bash" },
+    { text: "JavaScript", value: "javascript" },
+    { text: "Python", value: "python" },
+    { text: "Java", value: "java" },
+    { text: "C", value: "c" },
+    { text: "C#", value: "csharp" },
+    { text: "C++", value: "cpp" },
+
+    // 其他支持的
+    { text: "1C", value: "1c" },
+    { text: "ABNF", value: "abnf" },
+    { text: "Access logs", value: "accesslog" },
+    { text: "Ada", value: "ada" },
+    { text: "Arduino (C++ w/Arduino libs)", value: "arduino" },
+    { text: "ARM assembler", value: "armasm" },
+    { text: "AVR assembler", value: "avrasm" },
+    { text: "ActionScript", value: "actionscript" },
+    { text: "AngelScript", value: "angelscript" },
+    { text: "Apache", value: "apache" },
+    { text: "AppleScript", value: "applescript" },
+    { text: "Arcade", value: "arcade" },
+    { text: "AsciiDoc", value: "asciidoc" },
+    { text: "AspectJ", value: "aspectj" },
+    { text: "AutoHotkey", value: "autohotkey" },
+    { text: "AutoIt", value: "autoit" },
+    { text: "Awk", value: "awk" },
+    { text: "Basic", value: "basic" },
+    { text: "BNF", value: "bnf" },
+    { text: "Brainfuck", value: "brainfuck" },
+    { text: "C/AL", value: "cal" },
+    { text: "Cache Object Script", value: "cos" },
+    { text: "CMake", value: "cmake" },
+    { text: "Coq", value: "coq" },
+    { text: "CSP", value: "csp" },
+    { text: "CSS", value: "css" },
+    { text: "Cap’n Proto", value: "capnproto" },
+    { text: "Clojure", value: "clojure" },
+    { text: "CoffeeScript", value: "coffeescript" },
+    { text: "Crmsh", value: "crmsh" },
+    { text: "Crystal", value: "crystal" },
+    { text: "D", value: "d" },
+    { text: "Dart", value: "dart" },
+    { text: "Delphi", value: "dpr" },
+    { text: "Diff", value: "diff" },
+    { text: "Django", value: "django" },
+    { text: "DNS Zone file", value: "dns" },
+    { text: "Dockerfile", value: "dockerfile" },
+    { text: "DOS", value: "dos" },
+    { text: "dsconfig", value: "dsconfig" },
+    { text: "DTS (Device Tree)", value: "dts" },
+    { text: "Dust", value: "dust" },
+    { text: "EBNF", value: "ebnf" },
+    { text: "Elixir", value: "elixir" },
+    { text: "Elm", value: "elm" },
+    { text: "Erlang", value: "erlang" },
+    { text: "Excel", value: "excel" },
+    { text: "F#", value: "fsharp" },
+    { text: "FIX", value: "fix" },
+    { text: "Fortran", value: "fortran" },
+    { text: "G-Code", value: "gcode" },
+    { text: "Gams", value: "gams" },
+    { text: "GAUSS", value: "gauss" },
+    { text: "Gherkin", value: "gherkin" },
+    { text: "Go", value: "go" },
+    { text: "Golo", value: "golo" },
+    { text: "Gradle", value: "gradle" },
+    { text: "Groovy", value: "groovy" },
+    { text: "HTTP", value: "http" },
+    { text: "Haml", value: "haml" },
+    { text: "Handlebars", value: "handlebars" },
+    { text: "Haskell", value: "haskell" },
+    { text: "Haxe", value: "haxe" },
+    { text: "Hy", value: "hy" },
+    { text: "Ini, TOML", value: "ini" },
+    { text: "Inform7", value: "inform7" },
+    { text: "IRPF90", value: "irpf90" },
+    { text: "Julia", value: "julia" },
+    { text: "Kotlin", value: "kotlin" },
+    { text: "LaTeX", value: "tex" },
+    { text: "Leaf", value: "leaf" },
+    { text: "Lasso", value: "lasso" },
+    { text: "Less", value: "less" },
+    { text: "LDIF", value: "ldif" },
+    { text: "Lisp", value: "lisp" },
+    { text: "LiveCode Server", value: "livecodeserver" },
+    { text: "LiveScript", value: "livescript" },
+    { text: "Makefile", value: "makefile" },
+    { text: "Markdown", value: "markdown" },
+    { text: "Mathematica", value: "mathematica" },
+    { text: "Matlab", value: "matlab" },
+    { text: "Maxima", value: "maxima" },
+    { text: "Maya Embedded Language", value: "mel" },
+    { text: "Mercury", value: "mercury" },
+    { text: "Mizar", value: "mizar" },
+    { text: "Mojolicious", value: "mojolicious" },
+    { text: "Monkey", value: "monkey" },
+    { text: "Moonscript", value: "moonscript" },
+    { text: "N1QL", value: "n1ql" },
+    { text: "NSIS", value: "nsis" },
+    { text: "Nginx", value: "nginx" },
+    { text: "Nim", value: "nim" },
+    { text: "Nix", value: "nix" },
+    { text: "OCaml", value: "ocaml" },
+    { text: "Objective C", value: "objectivec" },
+    { text: "OpenGL Shading Language", value: "glsl" },
+    { text: "OpenSCAD", value: "openscad" },
+    { text: "Oracle Rules Language", value: "ruleslanguage" },
+    { text: "Oxygene", value: "oxygene" },
+    { text: "PF", value: "pf" },
+    { text: "PHP", value: "php" },
+    { text: "Parser3", value: "parser3" },
+    { text: "Perl", value: "perl" },
+    { text: "Plaintext", value: "plaintext" },
+    { text: "Pony", value: "pony" },
+    { text: "PostgreSQL & PL/pgSQL", value: "pgsql" },
+    { text: "PowerShell", value: "powershell" },
+    { text: "Processing", value: "processing" },
+    { text: "Prolog", value: "prolog" },
+    { text: "Properties", value: "properties" },
+    { text: "Protocol Buffers", value: "protobuf" },
+    { text: "Puppet", value: "puppet" },
+    { text: "Python profiler results", value: "profile" },
+    { text: "Python REPL", value: "python-repl" },
+    { text: "Q", value: "k" },
+    { text: "QML", value: "qml" },
+    { text: "R", value: "r" },
+    { text: "ReasonML", value: "reasonml" },
+    { text: "RenderMan RIB", value: "rib" },
+    { text: "RenderMan RSL", value: "rsl" },
+    { text: "Roboconf", value: "graph" },
+    { text: "Ruby", value: "ruby" },
+    { text: "Rust", value: "rust" },
+    { text: "SAS", value: "SAS" },
+    { text: "SCSS", value: "scss" },
+    { text: "SQL", value: "sql" },
+    { text: "STEP Part 21", value: "p21" },
+    { text: "Scala", value: "scala" },
+    { text: "Scheme", value: "scheme" },
+    { text: "Scilab", value: "scilab" },
+    { text: "Shell", value: "shell" },
+    { text: "Smali", value: "smali" },
+    { text: "Smalltalk", value: "smalltalk" },
+    { text: "SML", value: "sml" },
+    { text: "Stan", value: "stan" },
+    { text: "Stata", value: "stata" },
+    { text: "Stylus", value: "stylus" },
+    { text: "SubUnit", value: "subunit" },
+    { text: "Swift", value: "swift" },
+    { text: "Tcl", value: "tcl" },
+    { text: "Test Anything Protocol", value: "tap" },
+    { text: "Thrift", value: "thrift" },
+    { text: "TP", value: "tp" },
+    { text: "Twig", value: "twig" },
+    { text: "TypeScript", value: "typescript" },
+    { text: "VB.Net", value: "vbnet" },
+    { text: "VBScript", value: "vbscript" },
+    { text: "VHDL", value: "vhdl" },
+    { text: "Vala", value: "vala" },
+    { text: "Verilog", value: "verilog" },
+    { text: "Vim Script", value: "vim" },
+    { text: "X++", value: "axapta" },
+    { text: "x86 Assembly", value: "x86asm" },
+    { text: "XL", value: "xl" },
+    { text: "XQuery", value: "xquery" },
+    { text: "YAML", value: "yml" },
+    { text: "Zephir", value: "zephir" },    
+];

package/package.json

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

package/src/Article.vue

@@ -53,6 +53,7 @@
                 :level="skill.level"
                 v-show="jx3_element.type == 'skill'"
             />
+            <jx3-npc :client="npc.client" :id="npc.id" v-show="jx3_element.type === 'npc'" />
         </div>
         <!-- <gallery :images="images" :index="gallery_index" @close="index = null"></gallery> -->
     </div>
@@ -96,6 +97,7 @@ import renderPzIframe from '../assets/js/pz_iframe'
 import Item from "./Item";
 import Buff from "./Buff";
 import Skill from "./Skill";
+import Npc from "./Npc";
 import renderJx3Element from "../assets/js/jx3_element";
 
 export default {
@@ -137,6 +139,12 @@ export default {
                 id: "",
                 level: "",
             },
+            // NPC
+            npc : {
+                client : 'std',
+                id : '',
+            },
+            // COMMON
             jx3_element: {
                 style: {
                     top: 0,
@@ -265,6 +273,7 @@ export default {
         "jx3-item": Item,
         "jx3-buff": Buff,
         "jx3-skill": Skill,
+        "jx3-npc": Npc,
         // "gallery":gallery,
         // VueViewer
     },

package/src/Buff.vue

@@ -76,6 +76,6 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 @import "../assets/css/module/buff.less";
 </style>

package/src/Item.vue

@@ -13,7 +13,7 @@
                 <span v-text="`精炼等级：0 / ${source.MaxStrengthLevel}`"></span>
             </div>
             <!-- 物品名称 -->
-            <h4 class="u-title" :style="{ color: color(source.Quality) }" v-text="source.Name"></h4>
+            <div class="u-title" :style="{ color: color(source.Quality) }" v-text="source.Name"></div>
             <!-- 绑定状态 -->
             <div v-if="source.BindType > 1" class="u-bind" v-text="bind(source.BindType)"></div>
             <!-- 唯一 -->
@@ -324,6 +324,6 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
 @import "../assets/css/module/item.less";
 </style>

package/src/Npc.vue

@@ -209,6 +209,6 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 @import "../assets/css/module/npc.less";
 </style>

package/src/Resource.vue

@@ -198,7 +198,7 @@ import { loadResource, loadStat, getIcons } from "../service/database";
 import { __ossRoot, __iconPath, __Root, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 import detach_types from "../assets/data/detach_type.json";
 import User from "@jx3box/jx3box-common/js/user";
-import { iconLink } from "@jx3box/jx3box-common/js/utils";
+import { iconLink,getLink } from "@jx3box/jx3box-common/js/utils";
 export default {
     name: "Resource",
     props: {
@@ -369,7 +369,7 @@ export default {
                 // <img src="${this.iconURL(
                 //     o.IconID
                 // )}">
-                this.html = `<a data-type="buff" class="e-jx3-buff w-jx3-element ${o.CanCancel == 1 ? "isBuff" : "isDebuff"}" href="${this.getLink(
+                this.html = `<a data-type="buff" class="e-jx3-buff w-jx3-element ${o.CanCancel == 1 ? "isBuff" : "isDebuff"}" href="${this.getDbLink(
                     "buff",
                     this.client,
                     o.BuffID,
@@ -383,7 +383,7 @@ export default {
             this.resetItems();
             o.isSelected = true;
             if (this.skill_mode == "simple") {
-                this.html = `<a data-type="skill" class="e-jx3-skill w-jx3-element" href="${this.getLink("skill", this.client, o.SkillID, o.Level)}" data-client="${this.client}" data-id="${
+                this.html = `<a data-type="skill" class="e-jx3-skill w-jx3-element" href="${this.getDbLink("skill", this.client, o.SkillID, o.Level)}" data-client="${this.client}" data-id="${
                     o.SkillID
                 }" data-level="${o.Level}">[${o.Name}]</a>`;
             } else {
@@ -393,7 +393,7 @@ export default {
         selectItem: function(o, i) {
             this.resetItems();
             o.isSelected = true;
-            this.html = `<a data-type="item" class="e-jx3-item e-jx3-item-q${o.Quality} w-jx3-element" data-mode="" data-id="${o.id}" data-quality="${o.Quality}" data-client="${this.client}" target="_blank" href="${o.Link}">[${o.Name}]</a>`;
+            this.html = `<a data-type="item" class="e-jx3-item e-jx3-item-q${o.Quality} w-jx3-element" data-mode="" data-id="${o.id}" data-quality="${o.Quality}" data-client="${this.client}" target="_blank" href="${this.getLink('item', o.id)}">[${o.Name}]</a>`;
         },
         selectIcon: function(o) {
             this.resetItems();
@@ -403,7 +403,7 @@ export default {
         selectNpc: function (o, i){
             this.resetItems()
             o.isSelected = true
-            this.html = `<a data-type="npc" class="e-jx3-npc w-jx3-element" data-mode="" data-id="${o.ID}"  data-client="${this.client}" target="_blank" href="${this.getLink("npc", this.client, o.ID, '')}">[${o.Name}]</a>`
+            this.html = `<a data-type="npc" class="e-jx3-npc w-jx3-element" data-mode="" data-id="${o.ID}"  data-client="${this.client}" target="_blank" href="${this.getDbLink("npc", this.client, o.ID, '')}">[${o.Name}]</a>`
         },
         resetItems: function() {
             let data = this[this.type];
@@ -418,10 +418,14 @@ export default {
         iconURL: function(id) {
             return iconLink(id, this.client);
         },
-        getLink: function(type, client, id, level) {
+        getDbLink: function(type, client, id, level) {
             let domain = client == "origin" ? __OriginRoot : __Root;
             return domain + "app/database/?type=" + type + `&query=${id}&level=${level}`;
         },
+        getLink : function (type,id){
+            let domain = this.client == "origin" ? __OriginRoot : __Root;
+            return domain + getLink(type,id).slice(1)
+        },
 
         // 杂项
         // ==============================

package/src/Skill.vue

@@ -65,6 +65,6 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style lang="less">
 @import "../assets/css/module/skill.less";
 </style>

package/src/Tinymce.vue

@@ -39,6 +39,7 @@ import Resource from "./Resource";
 import { __cms } from "@jx3box/jx3box-common/data/jx3box.json";
 import { __ossRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 import Emotion from "@jx3box/jx3box-emotion/src/Emotion.vue"
+import hljs_languages from "../assets/js/item/hljs_languages.js"
 const API_Root = process.env.NODE_ENV === "production" ? __cms : "/";
 const API = API_Root + "api/cms/upload/tinymce";
 
@@ -143,6 +144,8 @@ export default {
                     "黑色",
                 ],
 
+                codesample_languages: hljs_languages,
+
                 // Image
                 image_advtab: true,
                 // paste_data_images: true,