@jx3box/jx3box-editor 1.4.10 → 1.5.0

package/assets/js/renderImgPreview.js

@@ -1,7 +1,11 @@
 import $ from 'jquery'
 
 function renderImgPreview(vm, selector='.c-article img'){
-    $(selector).each((i, ele) => {
+    // 获取src不为空的图片
+    let imgs = $(selector).filter(function(){
+        return $(this).attr('src') != ''
+    })
+    imgs.each((i, ele) => {
         // 加载全部src（lazyload）
         vm.images.push($(ele).attr('src'))
         // 绑定事件挂钩索引位置

package/package.json

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

package/src/ArticleMarkdown.vue

@@ -13,6 +13,10 @@
 <script>
 import markdownRender from '@jx3box/markdown/src/render.vue'
 
+import Vue from "vue";
+import hevueImgPreview from "hevue-img-preview";
+Vue.use(hevueImgPreview);
+
 // 基本文本
 import execLazyload from "../assets/js/img";
 import execFilterIframe from "../assets/js/iframe";
@@ -33,6 +37,7 @@ 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 {xssOptions} from '../assets/data/markdown_whitelist.json'
 
@@ -79,6 +84,7 @@ export default {
                 },
                 type: "",
             },
+            images: [],
 
             xssOptions
         };
@@ -106,6 +112,8 @@ export default {
             renderTalent2();
             // Tatex
             renderKatex();
+            // 画廊
+            renderImgPreview(this);
             // 语法高亮
             renderCode(`code[class=^'lang-']`)
             // 物品
@@ -156,4 +164,8 @@ export default {
 
 <style lang="less">
 @import "../assets/css/article_markdown.less";
+
+.v-note-img-wrapper {
+    display: none;
+}
 </style>

package/src/GameText.vue

@@ -2,7 +2,7 @@
  * @Author: X3ZvaWQ
  * @Date: 2022-08-20 20:23:57
  * @LastEditors: X3ZvaWQ
- * @LastEditTime: 2022-08-23 20:36:40
+ * @LastEditTime: 2022-08-24 22:32:56
  * @Description: 用于渲染游戏内Text标签的文本
 -->
 <template>
@@ -146,6 +146,7 @@ export default {
     },
     renderEnchantResource: function () {
       const matches = this.html.match(/<ENCHANT (\d+)>/gim);
+      if(!matches) return;
       for (let match of matches) {
         let enchant_id = match.match(/<ENCHANT (\d+)>/i)[1];
         getResource(`enchant.${enchant_id}`, this.client)

package/src/Item.vue

@@ -176,9 +176,9 @@
             </div>
             <!-- 描述 -->
             <p 
-                v-if="source.DescHtml"
+                v-if="source.Desc"
                 class="u-desc u-yellow">
-                <game-text :client="client" :text="source.DescHtml || source.Desc"></game-text>
+                <game-text :client="client" :text="source.Desc"></game-text>
             </p>
             <!-- 五彩石属性 -->
             <p v-if="source.WuCaiHtml" class="u-desc" v-html="source.WuCaiHtml"></p>

package/src/Resource.vue

@@ -102,7 +102,9 @@
                                     <span class="u-id">ID:{{ o.id }}</span>
                                     <img class="u-pic" :title="'IconID:' + o.IconID" :src="iconURL(o.IconID)" />
                                     <span class="u-name">{{ o.Name }}</span>
-                                    <span class="u-content" v-html="o.DescHtml"></span>
+                                    <span class="u-content">
+                                        <game-text :text="o.Desc"></game-text>
+                                    </span>
                                     <span class="u-remark">
                                         {{ o.Requirement }}
                                     </span>
@@ -202,6 +204,7 @@ import { loadEmotions } from "../service/cms";
 import { __ossRoot, __iconPath, __Root, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 import detach_types from "../assets/data/detach_type.json";
 import { iconLink, getLink, showAvatar } from "@jx3box/jx3box-common/js/utils";
+import GameText from "./GameText.vue";
 import User from "@jx3box/jx3box-common/js/user";
 import Item from './Item.vue';
 export default {
@@ -287,7 +290,7 @@ export default {
         },
         canInsertAuthor: function() {
             return User.getLevel(this.userInfo && this.userInfo.experience) >= 2;
-        },
+        }
     },
     watch: {
         html: function(newval) {
@@ -502,7 +505,8 @@ export default {
         this.checkUA();
     },
     components: {
-        'jx3-item': Item
+        'jx3-item': Item,
+        GameText
     },
 };
 </script>