@jx3box/jx3box-editor 2.2.2 → 2.2.4

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}" title="${name}" 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.2",
+  "version": "2.2.4",
   "description": "JX3BOX Article & Editor",
   "main": "index.js",
   "scripts": {
@@ -58,6 +58,7 @@
     "vue-gallery-slideshow": "^1.5.2",
     "vue-photoswipe.js": "^2.0.23",
     "vue-plugin-load-script": "^1.3.6",
+    "vuedraggable": "^2.24.3",
     "xss": "^1.0.8"
   },
   "devDependencies": {

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

@@ -64,10 +64,12 @@
 
             <div class="c-combo-content__right">
                 <!-- 已选技能 -->
-                <el-divider>已选技能</el-divider>
+                <el-divider>已选技能
+                    <!-- <el-checkbox v-model="sort" border size="small">开启排序</el-checkbox> -->
+                </el-divider>
                 <div class="m-selected-skills">
                     <ul class="m-skills-list">
-                        <li v-for="(skill, index) in selected" :key="index" class="m-skill" @contextmenu.prevent="(event) => onContextmenu(event, skill)">
+                        <li v-for="(skill, index) in selected" :key="skill.SkillID + '' + index" class="m-skill" @contextmenu.prevent="(event) => onContextmenu(event, skill)">
                             <div class="u-skill" v-if="skill && skill.IconID">
                                 <img class="u-skill-icon" :src="iconURL(skill.IconID)" :alt="skill.IconID" />
                                 <i class="u-gcd-icon" v-show="skill.WithoutGcd">
@@ -100,7 +102,7 @@ Vue.use(LoadScript);
 import contextmenu from "vue-contextmenujs";
 Vue.use(contextmenu);
 export default {
-    name: "skillDialog",
+    name: "ComboSkill",
     components: {
         SkillMartial,
     },
@@ -141,8 +143,19 @@ export default {
 
             activeName: "special",
             selected: [],
+
+            sort: false,
         };
     },
+    // watch: {
+    //     sort: function (val) {
+    //         if (val) {
+    //             this.$nextTick(() => {
+    //                 this.initSkillSort();
+    //             });
+    //         }
+    //     },
+    // },
     computed: {
         hasNextPage: function () {
             return this.total > 1 && this.page < this.pages;
@@ -229,6 +242,7 @@ export default {
             const _this = this;
             const sortSkills = Sortable.create(el, {
                 animation: 200,
+                forceFallback: true,
                 onEnd({ newIndex, oldIndex }) {
                     const newSkills = cloneDeep(_this.selected);
                     const [removed] = newSkills.splice(oldIndex, 1);
@@ -254,6 +268,10 @@ export default {
                                 confirmButtonText: "确定",
                                 cancelButtonText: "取消",
                                 inputValue: skill?.n || "",
+                                // 最长4个字
+                                inputValidator: (value) => {
+                                    return value.length <= 4;
+                                },
                             })
                                 .then(({ value }) => {
                                     this.$set(skill, "n", value);
@@ -277,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>`;