@jx3box/jx3box-editor 2.2.3 → 2.2.5

package/assets/css/tinymce/combo.less

@@ -60,7 +60,6 @@
         .u-skill-note {
             .fz(12px,1);
             width: 56px;
-            overflow: hidden;
             text-overflow: clip;
             white-space: pre-wrap;
             text-align: center;

package/assets/js/combo.js

@@ -15,17 +15,16 @@ function renderCombo(selector = ".e-skill-combo") {
                 // extend = {gcd: 0, note: "炖鸡"}
                 const [id, name, icon, extend] = url.split(/,(?![^{]*\})/);
                 
-                // 去除左右花括号
-
-                const _extend = extend ? JSON.parse(extend) : null;
+                const _extend = extend ? JSON.parse(extend) : {};
+                const { gcd, n = '', c, fz=12, fw='normal',client='std' } = _extend;
 
                 // 渲染
                 let code = `
                 <span class="w-skill-combo-item">
-                    <img class="u-skill-icon" src="${iconLink(icon)}" alt="${icon}" title="${name}" />
+                    <img class="u-skill-icon w-jx3-element" src="${iconLink(icon)}" alt="${icon}" data-type="skill" data-id="${id}" data-client="${client}" />
                     <span class="u-skill-name" title="${name}">${name}</span>
-                    <span class="u-skill-note" title="${_extend && _extend.n}" style="color:${_extend&&_extend.c}">${_extend && _extend.n || ''}</span>
-                    <i class="u-gcd-icon ${_extend && _extend.gcd == 0 ? 'is-show' : ''}" title="无GCD技能">
+                    <span class="u-skill-note" title="${n}" style="color:${c};font-size:${fz}px;font-weight:${fw}">${n}</span>
+                    <i class="u-gcd-icon ${gcd == 0 ? 'is-show' : ''}" title="无GCD技能">
                         <i class="el-icon-time"></i>
                     </i>
                 </span>

package/package.json

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

package/src/Article.vue

@@ -180,12 +180,12 @@ export default {
             // 奇穴
             renderTalent();
             renderTalent2();
-            // 物品
-            renderJx3Element(this);
             // 配装
             renderPzIframe();
             // 连招
             renderCombo();
+            // 物品
+            renderJx3Element(this);
         },
         doDir: function () {
             // 显示局部

package/src/components/Combo.vue

@@ -295,6 +295,7 @@ export default {
                     gcd: item.WithoutGcd ? 0 : 1,
                 };
                 item.n && (obj.n = item.n);
+                item.client = this.client;
                 skills_html += `<li class="w-skill-combo-item">${item.SkillID},${item.Name},${item.IconID},${JSON.stringify(obj)}</li>`;
             });
             const html = `<ul class="e-skill-combo w-skill-combo">${skills_html}</ul>`;