@jx3box/jx3box-editor 2.2.10 → 2.2.12

package/assets/css/combo.less

@@ -441,7 +441,14 @@
 
             .u-skill-icon {
                 box-sizing: border-box;
-                border: 2px solid #1a2b22;
+                // border: 2px solid #000;
+            }
+
+            .u-skill.is-wujie .u-skill-icon{
+                border: 2px solid #2a9998;
+                border-radius: 50%;
+                width: 52px;
+                height: 52px;
             }
 
             .u-skill.active {
@@ -452,4 +459,4 @@
             }
         }
     }
-}
+}

package/package.json

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

package/src/Resource.vue

@@ -304,6 +304,10 @@ export default {
         },
     },
     methods: {
+        nl2br: function(str) {
+            // 替换\n \\\n 为 <br>
+            return str.replace(/\\n/g, "<br>").replace(/\n/g, "<br>");
+        },
         getData: function(page = 1, append = false) {
             if (!this.query) return;
 
@@ -424,7 +428,7 @@ export default {
                     o.Level
                 )}" data-client="${this.client}" data-id="${o.BuffID}" data-level="${o.Level}">[${o.Name}]</a>`;
             } else {
-                this.html = `<pre data-type="buff" data-id="${o.BuffID}" class="e-jx3-resource">${this.$refs[this.type][i]["innerHTML"]}</pre>`;
+                this.html = `<pre data-type="buff" data-id="${o.BuffID}" class="e-jx3-resource">${this.nl2br(this.$refs[this.type][i]["innerHTML"])}</pre>`;
             }
         },
         selectSkill: function(o, i) {
@@ -435,7 +439,7 @@ export default {
                     o.SkillID
                 }" data-level="${o.Level}">[${o.Name}]</a>`;
             } else {
-                this.html = `<pre data-type="skill" data-id="${o.SkillID}" class="e-jx3-resource">${this.$refs[this.type][i]["innerHTML"]}</pre>`;
+                this.html = `<pre data-type="skill" data-id="${o.SkillID}" class="e-jx3-resource">${this.nl2br(this.$refs[this.type][i]["innerHTML"])}</pre>`;
             }
         },
         selectItem: function(o, i) {

package/src/components/SkillMartial.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="m-pvp-martial">
+    <div class="m-pvp-martial" >
         <div class="u-platform-select" v-if="client == 'std'">
             <div
                 class="u-platform-option"
@@ -126,7 +126,7 @@
                             )"
                             :key="index"
                             @click="selectSkill(skill)">
-                            <div class="u-skill" v-if="skill && skill.IconID">
+                            <div class="u-skill is-wujie" v-if="skill && skill.IconID">
                                 <img
                                     class="u-skill-icon"
                                     :src="iconLink(skill.IconID)"