@jx3box/jx3box-editor 2.2.6 → 2.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/assets/css/combo.less +15 -0
  2. package/assets/css/tinymce/combo.less +16 -0
  3. package/assets/js/combo.js +5 -3
  4. package/package.json +1 -1
  5. package/src/BoxResource.vue +7 -7
  6. package/src/components/Combo.vue +29 -16
package/assets/css/combo.less CHANGED
@@ -273,6 +273,9 @@
273
273
  background-color:#f00;
274
274
  }
275
275
  }
276
+ .u-remove-icon_small {
277
+ right: 0;
278
+ }
276
279
 
277
280
  .u-gcd-icon {
278
281
  .pa;
@@ -296,6 +299,13 @@
296
299
  .size(48px, 48px);
297
300
  }
298
301
 
302
+ .u-sill-icon_large {
303
+ .size(48px, 48px);
304
+ }
305
+ .u-skill-icon_small {
306
+ .size(42px, 42px);
307
+ }
308
+
299
309
  .u-name {
300
310
  display: block;
301
311
  font-size: 12px;
@@ -305,6 +315,11 @@
305
315
  width: 48px;
306
316
  }
307
317
 
318
+ .u-name_underline {
319
+ text-decoration: underline;
320
+ text-underline-offset: 2px;
321
+ }
322
+
308
323
  .u-note {
309
324
  .fz(12px);
310
325
  color: #aaa;
package/assets/css/tinymce/combo.less CHANGED
@@ -26,6 +26,17 @@
26
26
  padding: 0;
27
27
  margin: 0;
28
28
  }
29
+ .u-skill-icon {
30
+ .size(48px);
31
+ .x;
32
+ .flex;
33
+ align-items: center;
34
+ justify-content: center;
35
+ }
36
+
37
+ .u-skill-icon_small {
38
+ .size(42px);
39
+ }
29
40
 
30
41
  .u-gcd-icon {
31
42
  .pa;
@@ -57,6 +68,11 @@
57
68
  text-align: center;
58
69
  }
59
70
 
71
+ .u-skill-name_underline {
72
+ text-decoration: underline;
73
+ text-underline-offset: 3px;
74
+ }
75
+
60
76
  .u-skill-note {
61
77
  .fz(12px,1);
62
78
  width: 56px;
package/assets/js/combo.js CHANGED
@@ -16,13 +16,15 @@ function renderCombo(selector = ".e-skill-combo") {
16
16
  const [id, name, icon, extend] = url.split(/,(?![^{]*\})/);
17
17
 
18
18
  const _extend = extend ? JSON.parse(extend) : {};
19
- const { gcd, n = '', c, fz=12, fw='normal',client='std' } = _extend;
19
+ const { gcd, n = '', c, fz=12, fw='normal',client='std',iconSize='large', underline=0 } = _extend;
20
20
 
21
21
  // 渲染
22
22
  let code = `
23
23
  <span class="w-skill-combo-item">
24
- <img class="u-skill-icon w-jx3-element" src="${iconLink(icon)}" alt="${icon}" data-type="skill" data-id="${id}" data-client="${client}" />
25
- <span class="u-skill-name" title="${name}">${name}</span>
24
+ <span class="u-skill-icon w-jx3-element">
25
+ <img class="u-skill-icon_${iconSize}" src="${iconLink(icon)}" alt="${icon}" data-type="skill" data-id="${id}" data-client="${client}" />
26
+ </span>
27
+ <span class="u-skill-name ${underline ? 'u-skill-name_underline' : ''}" title="${name}">${name}</span>
26
28
  <span class="u-skill-note" title="${n}" style="color:${c};font-size:${fz}px;font-weight:${fw}">${n}</span>
27
29
  <i class="u-gcd-icon ${gcd == 0 ? 'is-show' : ''}" title="无GCD技能">
28
30
  <i class="el-icon-time"></i>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-editor",
3
- "version": "2.2.6",
3
+ "version": "2.2.8",
4
4
  "description": "JX3BOX Article & Editor",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/BoxResource.vue CHANGED
@@ -45,6 +45,13 @@
45
45
  </ul>
46
46
  <el-alert v-if="!authors.length && done" title="没有找到相关条目" type="info" show-icon></el-alert>
47
47
  </el-tab-pane>
48
+ <el-tab-pane label="连招" name="combo">
49
+ <span slot="label" class="u-tab-label">
50
+ <i class="el-icon-lollipop" style="margin-right: 5px"></i>
51
+ <b>连招</b>
52
+ </span>
53
+ <ComboVue :query="query" ref="combo" :client="comboClient" :strict="strict" :subtype="subtype"></ComboVue>
54
+ </el-tab-pane>
48
55
  <el-tab-pane label="剑三趣图" name="emotions">
49
56
  <span slot="label" class="u-tab-label">
50
57
  <i class="el-icon-sugar" style="margin-right: 5px"></i>
@@ -60,13 +67,6 @@
60
67
  </ul>
61
68
  <el-alert v-if="!emotions.length && done" title="没有找到相关条目" type="info" show-icon></el-alert>
62
69
  </el-tab-pane>
63
- <el-tab-pane label="连招" name="combo">
64
- <span slot="label" class="u-tab-label">
65
- <i class="el-icon-lollipop" style="margin-right: 5px"></i>
66
- <b>连招</b>
67
- </span>
68
- <ComboVue :query="query" ref="combo" :client="comboClient" :strict="strict" :subtype="subtype"></ComboVue>
69
- </el-tab-pane>
70
70
  <el-tab-pane label="信纸" name="letter">
71
71
  <span slot="label" class="u-tab-label">
72
72
  <i class="el-icon-coffee-cup" style="margin-right: 5px"></i>
package/src/components/Combo.vue CHANGED
@@ -71,14 +71,14 @@
71
71
  <ul class="m-skills-list">
72
72
  <li v-for="(skill, index) in selected" :key="skill.SkillID + '' + index" class="m-skill" @contextmenu.prevent="(event) => onContextmenu(event, skill)">
73
73
  <div class="u-skill" v-if="skill && skill.IconID">
74
- <img class="u-skill-icon" :src="iconURL(skill.IconID)" :alt="skill.IconID" />
74
+ <img class="u-skill-icon" :class="skill.iconSize ? `u-skill-icon_${skill.iconSize}` : ''" :src="iconURL(skill.IconID)" :alt="skill.IconID" />
75
75
  <i class="u-gcd-icon" v-show="skill.WithoutGcd">
76
76
  <i class="el-icon-time"></i>
77
77
  </i>
78
- <span class="u-name" :title="skill.Name">{{ skill.Name }}</span>
78
+ <span class="u-name" :class="{ 'u-name_underline': skill.underline }" :title="skill.Name">{{ skill.Name }}</span>
79
79
  <span class="u-note" :title="skill.n" :style="itemStyle(skill)">{{ skill.n }}</span>
80
80
  </div>
81
- <i class="u-remove-icon" title="移除" @click="removeSelected(index)"><i class="el-icon-close"></i></i>
81
+ <i class="u-remove-icon" :class="skill.iconSize ? `u-remove-icon_${skill.iconSize}` : ''" title="移除" @click="removeSelected(index)"><i class="el-icon-close"></i></i>
82
82
  </li>
83
83
  </ul>
84
84
  </div>
@@ -311,24 +311,34 @@ export default {
311
311
  },
312
312
  icon: !skill?.WithoutGcd ? "el-icon-check" : "el-icon-close",
313
313
  },
314
+ {
315
+ label: "图标大小",
316
+ children: [
317
+ {
318
+ label: "小",
319
+ onClick: () => {
320
+ this.$set(skill, "iconSize", "small");
321
+ },
322
+ },
323
+ {
324
+ label: "大",
325
+ onClick: () => {
326
+ this.$set(skill, "iconSize", "large");
327
+ },
328
+ },
329
+ ],
330
+ },
331
+ {
332
+ label: skill.underline ? "取消下划线" : "设置下划线",
333
+ onClick: () => {
334
+ this.$set(skill, "underline", !skill.underline);
335
+ },
336
+ },
314
337
  {
315
338
  label: "备注",
316
339
  onClick: () => {
317
340
  this.showRemark = true;
318
341
  this.currentSkill = skill
319
- // this.$prompt("请输入备注", "备注", {
320
- // confirmButtonText: "确定",
321
- // cancelButtonText: "取消",
322
- // inputValue: skill?.n || "",
323
- // // 最长4个字
324
- // inputValidator: (value) => {
325
- // return value.length <= 4;
326
- // },
327
- // })
328
- // .then(({ value }) => {
329
- // this.$set(skill, "n", value);
330
- // })
331
- // .catch(() => {});
332
342
  },
333
343
  }
334
344
  ],
@@ -345,11 +355,14 @@ export default {
345
355
  selected.forEach((item) => {
346
356
  const obj = {
347
357
  gcd: item.WithoutGcd ? 0 : 1,
358
+ underline: item.underline ? 1 : 0,
348
359
  };
349
360
  item.n && (obj.n = item.n);
350
361
  item.c && (obj.c = item.c);
351
362
  item.fz && (obj.fz = item.fz);
352
363
  item.fw && (obj.fw = item.fw);
364
+ item.iconSize && (obj.iconSize = item.iconSize);
365
+ item.underline && (obj.underline = item.underline);
353
366
 
354
367
  item.client = this.client;
355
368
  skills_html += `<li class="w-skill-combo-item">${item.SkillID},${item.Name},${item.IconID},${JSON.stringify(obj)}</li>`;