@jx3box/jx3box-editor 1.9.1 → 1.9.3

package/assets/css/tinymce/combo.less

@@ -36,6 +36,11 @@
             .size(12px);
             .r(50%);
             .db;
+            .none;
+
+            &.is-show {
+                display: inline-block;
+            }
 
             i {
                 color: #fff;

package/assets/js/combo.js

@@ -8,14 +8,20 @@ function renderCombo(selector = ".e-skill-combo .w-skill-combo-item") {
             // 获取嵌入源地址
             let url = $(this).text();
 
+            // extend = {gcd: 0}
             const [id, name, icon, extend] = url.split(",");
+            // 去除左右花括号
+
+            
+            const _extend = extend ? JSON.parse(extend) : null;
+            console.log(_extend.gcd)
 
             // 渲染
             let code = `
                 <span class="w-skill-combo-item">
                     <img class="u-skill-icon" src="${iconLink(icon)}" alt="${icon}" title="${name}" />
                     <span class="u-skill-name" title="${name}">${name}</span>
-                    <i class="u-gcd-icon ${extend && extend.gcd ? 'is-show' : ''}" title="无GCD技能">
+                    <i class="u-gcd-icon ${_extend && _extend.gcd == 0 ? 'is-show' : ''}" title="无GCD技能">
                         <i class="el-icon-time"></i>
                     </i>
                 </span>
@@ -23,6 +29,8 @@ function renderCombo(selector = ".e-skill-combo .w-skill-combo-item") {
             html += code;
         });
 
+        // console.log(html)
+
         // 挂载点
         $(selector).parent().html(html);
     } catch(e) {

package/package.json

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

package/src/BoxResource.vue

@@ -124,13 +124,13 @@
                             show-icon
                         ></el-alert>
                     </el-tab-pane>
-                    <el-tab-pane label="技能连招" name="combo">
+                    <el-tab-pane label="连招" name="combo">
                         <span slot="label" class="u-tab-label">
                             <i
-                                class="el-icon-tickets"
+                                class="el-icon-lollipop"
                                 style="margin-right: 5px"
                             ></i>
-                            <b>技能连招</b>
+                            <b>连招</b>
                         </span>
                         <ComboVue :query="query" ref="combo" :client="comboClient"></ComboVue>
                     </el-tab-pane>

package/src/components/Combo.vue

@@ -145,7 +145,6 @@ export default {
     mounted() {
         this.$nextTick(() => {
             this.initSkillSort();
-
         });
     },
     methods: {
@@ -179,14 +178,6 @@ export default {
                     this.loading = false;
                 });
         },
-        submit() {
-            this.$emit("submit", this.selected);
-            this.close();
-            this.selected = [];
-        },
-        close() {
-            this.$emit("update:modelValue", false);
-        },
         iconURL: function (id) {
             return iconLink(id, this.client);
         },
@@ -224,7 +215,6 @@ export default {
             });
         },
         onContextmenu(event, skill) {
-            // console.log(skill)
             this.$contextmenu({
                 items: [
                     {
@@ -245,9 +235,15 @@ export default {
 
         renderVal() {
             const {selected} = this;
-            return `<ul class="e-skill-combo w-skill-combo">${selected.map(item => {
-                return `<li class="w-skill-combo-item">${item.SkillID},${item.Name},${item.IconID},{gcd:${item.WithoutGcd ? 1: 0}}</li>`
-            })}</ul>`
+            let skills_html = ''
+            selected.forEach(item => {
+                const obj = {
+                    gcd: item.WithoutGcd ? 0: 1
+                }
+                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>`
+            return html;
         },
     },
 };