@jx3box/jx3box-editor 0.7.5 → 0.7.9

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 (5) hide show
  1. package/assets/data/detach_type.json +29 -0
  2. package/package.json +4 -4
  3. package/src/Item.vue +40 -86
  4. package/src/Resource.vue +36 -38
  5. package/src/SkillSimple.vue +0 -10
package/assets/data/detach_type.json ADDED
@@ -0,0 +1,29 @@
1
+ {
2
+ "0":"",
3
+ "1":"外功气劲",
4
+ "2":"外功不利效果",
5
+ "3":"阳性气劲",
6
+ "4":"阳性不利效果",
7
+ "5":"混元气劲",
8
+ "6":"混元不利效果",
9
+ "7":"阴性气劲",
10
+ "8":"阴性不利效果",
11
+ "9":"点穴",
12
+ "10":"点穴不利效果",
13
+ "11":"毒性气劲",
14
+ "12":"毒性不利效果",
15
+ "13":"蛊",
16
+ "14":"蛊不利效果",
17
+ "15":"药石",
18
+ "16":"药石不利效果",
19
+ "17":"辅助类食品",
20
+ "18":"增强类食品",
21
+ "19":"辅助类药品",
22
+ "20":"增强类药品",
23
+ "21":"",
24
+ "22":"",
25
+ "23":"",
26
+ "24":"宴席",
27
+ "52":"",
28
+ "101":""
29
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jx3box/jx3box-editor",
3
- "version": "0.7.5",
3
+ "version": "0.7.9",
4
4
  "description": "JX3BOX Article & Editor",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -30,9 +30,9 @@
30
30
  "last 2 versions"
31
31
  ],
32
32
  "dependencies": {
33
- "@jx3box/jx3box-common": "^6.6.0",
34
- "@jx3box/jx3box-data": "^1.4.7",
35
- "@jx3box/jx3box-emotion": "^1.0.6",
33
+ "@jx3box/jx3box-common": "^6.6.5",
34
+ "@jx3box/jx3box-data": "^1.6.2",
35
+ "@jx3box/jx3box-emotion": "^1.0.8",
36
36
  "@jx3box/jx3box-macro": "^1.0.1",
37
37
  "@jx3box/jx3box-talent": "^1.1.0",
38
38
  "@tinymce/tinymce-vue": "^3.2.2",
package/src/Item.vue CHANGED
@@ -10,28 +10,14 @@
10
10
  <div class="c-item-wrapper">
11
11
  <!-- 精炼等级 -->
12
12
  <div v-if="source.MaxStrengthLevel" class="u-max-strength-level">
13
- <span
14
- v-text="`精炼等级：0 / ${source.MaxStrengthLevel}`"
15
- ></span>
13
+ <span v-text="`精炼等级：0 / ${source.MaxStrengthLevel}`"></span>
16
14
  </div>
17
15
  <!-- 物品名称 -->
18
- <h4
19
- class="u-title"
20
- :style="{ color: color(source.Quality) }"
21
- v-text="source.Name"
22
- ></h4>
16
+ <h4 class="u-title" :style="{ color: color(source.Quality) }" v-text="source.Name"></h4>
23
17
  <!-- 绑定状态 -->
24
- <div
25
- v-if="source.BindType > 1"
26
- class="u-bind"
27
- v-text="bind(source.BindType)"
28
- ></div>
18
+ <div v-if="source.BindType > 1" class="u-bind" v-text="bind(source.BindType)"></div>
29
19
  <!-- 唯一 -->
30
- <div
31
- v-if="parseInt(source.MaxExistAmount) === 1"
32
- class="unique"
33
- v-text="'唯一'"
34
- ></div>
20
+ <div v-if="parseInt(source.MaxExistAmount) === 1" class="unique" v-text="'唯一'"></div>
35
21
  <!-- 存在时间 -->
36
22
  <div
37
23
  v-if="parseInt(source.MaxExistTime) > 0"
@@ -45,23 +31,12 @@
45
31
  v-text="'最大拥有数：' + source.MaxExistAmount"
46
32
  ></div>
47
33
  <!-- 武器类别 -->
48
- <div v-if="source.AucGenre == 1" class="u-weapon-type-label">
49
- 近身武器
50
- </div>
51
- <div v-if="source.AucGenre == 2" class="u-weapon-type-label">
52
- 远程武器
53
- </div>
34
+ <div v-if="source.AucGenre == 1" class="u-weapon-type-label">近身武器</div>
35
+ <div v-if="source.AucGenre == 2" class="u-weapon-type-label">远程武器</div>
54
36
  <!-- 物品类型文案 -->
55
- <div
56
- v-if="source.TypeLabel"
57
- class="u-type-label"
58
- v-text="source.TypeLabel"
59
- ></div>
37
+ <div v-if="source.TypeLabel" class="u-type-label" v-text="source.TypeLabel"></div>
60
38
  <!-- 装备属性 -->
61
- <div
62
- class="u-attributes"
63
- v-if="source.attributes && source.attributes.length"
64
- >
39
+ <div class="u-attributes" v-if="source.attributes && source.attributes.length">
65
40
  <div
66
41
  v-for="(attribute, key) in source.attributes"
67
42
  :key="key"
@@ -85,14 +60,11 @@
85
60
  class="u-horse-icon"
86
61
  :src="icon_url(attribute.icon_id)"
87
62
  />
88
- <div
89
- class="u-horse-desc"
90
- v-html="attribute.label"
91
- ></div>
63
+ <div class="u-horse-desc" v-html="attribute.label"></div>
92
64
  </span>
93
65
  <span v-else class="u-value">
94
66
  <span v-text="attribute.label"></span>
95
- <span
67
+ <!-- <span
96
68
  class="u-yellow"
97
69
  v-text="
98
70
  attribute_percent(
@@ -100,36 +72,32 @@
100
72
  attribute.value
101
73
  )
102
74
  "
103
- ></span>
75
+ ></span> -->
104
76
  </span>
105
77
  </div>
106
78
  </div>
107
79
  <!-- 家具属性 -->
108
80
  <div class="u-furniture-attributes" v-if="source.furniture_attributes">
109
81
  <div class="u-field u-green" v-if="source.furniture_attributes.view">
110
- <span class="u-value" v-text="`观赏提高${source.furniture_attributes.view}`"></span>
82
+ <span class="u-value" v-text="`观赏提高${source.furniture_attributes.view}`"></span>
111
83
  </div>
112
84
  <div class="u-field u-green" v-if="source.furniture_attributes.practical">
113
- <span class="u-value" v-text="`实用提高${source.furniture_attributes.practical}`"></span>
85
+ <span class="u-value" v-text="`实用提高${source.furniture_attributes.practical}`"></span>
114
86
  </div>
115
87
  <div class="u-field u-green" v-if="source.furniture_attributes.hard">
116
- <span class="u-value" v-text="`坚固提高${source.furniture_attributes.hard}`"></span>
88
+ <span class="u-value" v-text="`坚固提高${source.furniture_attributes.hard}`"></span>
117
89
  </div>
118
90
  <div class="u-field u-green" v-if="source.furniture_attributes.geomantic">
119
- <span class="u-value" v-text="`风水提高${source.furniture_attributes.geomantic}`"></span>
91
+ <span class="u-value" v-text="`风水提高${source.furniture_attributes.geomantic}`"></span>
120
92
  </div>
121
93
  <div class="u-field u-green" v-if="source.furniture_attributes.interesting">
122
- <span class="u-value" v-text="`趣味提高${source.furniture_attributes.interesting}`"></span>
94
+ <span class="u-value" v-text="`趣味提高${source.furniture_attributes.interesting}`"></span>
123
95
  </div>
124
96
  </div>
125
97
  <!-- 镶嵌 -->
126
98
  <ul v-if="source.Diamonds" class="u-diamonds u-gray">
127
99
  <!-- 五行石 -->
128
- <li
129
- class="u-diamond"
130
- v-for="(label, key) in source.Diamonds"
131
- :key="key"
132
- >
100
+ <li class="u-diamond" v-for="(label, key) in source.Diamonds" :key="key">
133
101
  <span class="u-square"></span>
134
102
  <span class="u-text" v-text="`镶嵌孔：${label}`"></span>
135
103
  </li>
@@ -204,26 +172,18 @@
204
172
  </div>
205
173
  <!-- 图片 -->
206
174
  <div class="u-image-url" v-if="source.ImageUrl">
207
- <img :src="source.ImageUrl" @error.once="source.ImageUrl=null">
175
+ <img :src="source.ImageUrl" @error.once="source.ImageUrl=null" />
208
176
  </div>
209
177
  <!-- 描述 -->
210
178
  <p
211
179
  v-if="source.DescHtml"
212
180
  class="u-desc u-yellow"
213
- v-html="source.DescHtml"
181
+ v-html="formatDescHtml(source.DescHtml)"
214
182
  ></p>
215
183
  <!-- 五彩石属性 -->
216
- <p
217
- v-if="source.WuCaiHtml"
218
- class="u-desc"
219
- v-html="source.WuCaiHtml"
220
- ></p>
184
+ <p v-if="source.WuCaiHtml" class="u-desc" v-html="source.WuCaiHtml"></p>
221
185
  <!-- 品质等级 -->
222
- <div
223
- v-if="source.Level"
224
- class="u-level u-yellow"
225
- v-text="'品质等级' + source.Level"
226
- ></div>
186
+ <div v-if="source.Level" class="u-level u-yellow" v-text="'品质等级' + source.Level"></div>
227
187
  <!-- 装备分数 -->
228
188
  <div
229
189
  v-if="source.EquipmentRating"
@@ -243,11 +203,7 @@
243
203
  v-text="'使用间隔' + second_format(source.CoolDown)"
244
204
  ></div>
245
205
  <!-- 外观名称 -->
246
- <div
247
- v-if="source.Appearance"
248
- class="u-appearance"
249
- v-text="'外观名称：' + source.Appearance"
250
- ></div>
206
+ <div v-if="source.Appearance" class="u-appearance" v-text="'外观名称：' + source.Appearance"></div>
251
207
  <!-- 可收集门派 -->
252
208
  <div
253
209
  v-if="source.CanExterior"
@@ -261,9 +217,7 @@
261
217
  !(source.AucGenre >= 1 && source.AucGenre <= 4)
262
218
  "
263
219
  class="u-can-shared"
264
- >
265
- 该物品可以放入账号储物箱共享。
266
- </div>
220
+ >该物品可以放入账号储物箱共享。</div>
267
221
  <div
268
222
  v-if="
269
223
  source.CanShared &&
@@ -271,19 +225,17 @@
271
225
  source.AucGenre <= 4
272
226
  "
273
227
  class="u-can-shared"
274
- >
275
- 该装备未精炼、镶嵌、附魔、穿戴前可以放入账号储物箱共享。
276
- </div>
228
+ >该装备未精炼、镶嵌、附魔、穿戴前可以放入账号储物箱共享。</div>
277
229
  <!-- 家具可交互可缩放 -->
278
- <div v-if="source.furniture_attributes" class="u-furniture-can">
279
- <span v-if="source.furniture_attributes.interact">可交互</span>
280
- <span
281
- v-if="source.furniture_attributes.scale_range"
282
- v-text="`可缩放(${source.furniture_attributes.scale_range.replace(';',' - ')}倍)`"
283
- ></span>
230
+ <div v-if="source.furniture_attributes" class="u-furniture-can">
231
+ <span v-if="source.furniture_attributes.interact">可交互</span>
232
+ <span
233
+ v-if="source.furniture_attributes.scale_range"
234
+ v-text="`可缩放(${source.furniture_attributes.scale_range.replace(';',' - ')}倍)`"
235
+ ></span>
284
236
  </div>
285
237
  <!-- 物品来源 -->
286
- <div v-if="source.GetType" class="u-get-type" v-text="`物品来源：${source.GetType}`"></div>
238
+ <div v-if="source.GetType" class="u-get-type" v-text="`物品来源：${source.GetType}`"></div>
287
239
  </div>
288
240
  </div>
289
241
  </template>
@@ -298,10 +250,9 @@ import color from "../assets/js/item/color.js";
298
250
 
299
251
  export default {
300
252
  name: "Item",
301
- props: ["item", "item_id", "jx3ClientType"],
253
+ props: ["item", "item_id"],
302
254
  data() {
303
255
  return {
304
- jx3_client_type: this.jx3ClientType == 2 ? 2 : 1,
305
256
  source: null,
306
257
  };
307
258
  },
@@ -311,6 +262,9 @@ export default {
311
262
  attribute_percent,
312
263
  bind,
313
264
  color,
265
+ formatDescHtml : function (str){
266
+ return str.replace(/font=\d+\s>/g,'')
267
+ }
314
268
  },
315
269
  watch: {
316
270
  item: {
@@ -324,9 +278,9 @@ export default {
324
278
  handler() {
325
279
  if (this.item_id) {
326
280
  // 提取本地数据
327
- let cache = sessionStorage.getItem(`item-${this.jx3_client_type}-${this.item_id}`);
281
+ let cache = sessionStorage.getItem(`item-${this.item_id}`);
328
282
  let cache_created = sessionStorage.getItem(
329
- `item-${this.jx3_client_type}-${this.item_id}-created`
283
+ `item-${this.item_id}-created`
330
284
  );
331
285
  // 查看是否存在缓存
332
286
  if (
@@ -339,7 +293,7 @@ export default {
339
293
  }
340
294
 
341
295
  // 没有缓存则发起请求获取
342
- get_item(this.item_id, this.jx3_client_type).then((res) => {
296
+ get_item(this.item_id).then((res) => {
343
297
  let data = res.data;
344
298
  if (data.code === 200) {
345
299
  let item = data.data.item;
@@ -347,13 +301,13 @@ export default {
347
301
  JSON.stringify(item) !== "{}" ? item : null;
348
302
  // 记录本地数据
349
303
  sessionStorage.setItem(
350
- `item-${this.jx3_client_type}-${this.source.id}`,
304
+ `item-${this.source.id}`,
351
305
  this.source
352
306
  ? JSON.stringify(this.source)
353
307
  : false
354
308
  );
355
309
  sessionStorage.setItem(
356
- `item-${this.jx3_client_type}-${this.source.id}-created`,
310
+ `item-${this.source.id}-created`,
357
311
  Math.round(new Date() / 1000)
358
312
  );
359
313
  }
package/src/Resource.vue CHANGED
@@ -21,32 +21,35 @@
21
21
  >
22
22
  <template slot="prepend">ID ／名称</template>
23
23
  <template slot="append" v-if="isPC">
24
- <el-switch v-model="strict" active-text="精确匹配" @change="search"></el-switch>
24
+ <el-switch v-model="strict" active-text="精确匹配" @change="search" title="仅对Buff/Skill有效"></el-switch>
25
25
  </template>
26
26
  </el-input>
27
27
  </div>
28
28
 
29
29
  <el-tabs class="m-database-tabs" v-model="type" type="card" @tab-click="changeType">
30
- <el-tab-pane label="技能" name="skill">
30
+ <el-tab-pane label="Buff" name="buff">
31
31
  <span slot="label">
32
- <img class="u-icon" svg-inline src="../assets/img/skill.svg" />
33
- <b>技能</b>
34
- <em class="u-count">{{ stat.skill }}</em>
32
+ <img class="u-icon" svg-inline src="../assets/img/buff.svg" />
33
+ <b>Buff</b>
34
+ <em class="u-count">{{ stat.buff }}</em>
35
35
  </span>
36
- <p v-if="skill.length && done" class="m-resource-count">
36
+ <p v-if="buff.length && done" class="m-resource-count">
37
37
  <i class="el-icon-s-data"></i> 共找到
38
- <b>{{ skill.length }}</b> 条记录
38
+ <b>{{ buff.length }}</b> 条记录
39
39
  </p>
40
40
  <ul class="m-resource-list">
41
41
  <li
42
- v-for="(o, i) in skill"
42
+ v-for="(o, i) in buff"
43
43
  class="u-item"
44
44
  :key="i"
45
45
  :class="{ on: !!o.isSelected }"
46
- @click="selectCommon('skill', o, i)"
47
- ref="skill"
46
+ @click="selectCommon('buff', o, i)"
47
+ ref="buff"
48
48
  >
49
- <span class="u-id">ID:{{ o.SkillID }}</span>
49
+ <span class="u-id">
50
+ ID:{{ o.BuffID }}
51
+ <span class="u-detach">{{o.DetachType | showDetachType}}</span>
52
+ </span>
50
53
  <img
51
54
  class="u-pic"
52
55
  :title="'IconID:' + o.IconID"
@@ -55,46 +58,39 @@
55
58
  <span class="u-primary">
56
59
  <span class="u-name">
57
60
  {{ o.Name }}
58
- <em v-if="o.SkillName">({{ o.SkillName }})</em>
59
- </span>
60
- <span class="u-content">
61
- {{
62
- o.Desc | filterRaw
63
- }}
61
+ <em v-if="o.BuffName">({{ o.BuffName }})</em>
64
62
  </span>
63
+ <span class="u-content">{{ o.Desc }}</span>
65
64
  </span>
66
65
  </li>
67
66
  </ul>
68
67
  <el-alert
69
- v-if="!skill.length && done"
68
+ v-if="!buff.length && done"
70
69
  title="没有找到相关条目"
71
70
  type="info"
72
71
  show-icon
73
72
  ></el-alert>
74
73
  </el-tab-pane>
75
- <el-tab-pane label="Buff" name="buff">
74
+ <el-tab-pane label="技能" name="skill">
76
75
  <span slot="label">
77
- <img class="u-icon" svg-inline src="../assets/img/buff.svg" />
78
- <b>Buff</b>
79
- <em class="u-count">{{ stat.buff }}</em>
76
+ <img class="u-icon" svg-inline src="../assets/img/skill.svg" />
77
+ <b>技能</b>
78
+ <em class="u-count">{{ stat.skill }}</em>
80
79
  </span>
81
- <p v-if="buff.length && done" class="m-resource-count">
80
+ <p v-if="skill.length && done" class="m-resource-count">
82
81
  <i class="el-icon-s-data"></i> 共找到
83
- <b>{{ buff.length }}</b> 条记录
82
+ <b>{{ skill.length }}</b> 条记录
84
83
  </p>
85
84
  <ul class="m-resource-list">
86
85
  <li
87
- v-for="(o, i) in buff"
86
+ v-for="(o, i) in skill"
88
87
  class="u-item"
89
88
  :key="i"
90
89
  :class="{ on: !!o.isSelected }"
91
- @click="selectCommon('buff', o, i)"
92
- ref="buff"
90
+ @click="selectCommon('skill', o, i)"
91
+ ref="skill"
93
92
  >
94
- <span class="u-id">
95
- ID:{{ o.BuffID }}
96
- <span class="u-detach">{{o.DetachType | showDetachType}}</span>
97
- </span>
93
+ <span class="u-id">ID:{{ o.SkillID }}</span>
98
94
  <img
99
95
  class="u-pic"
100
96
  :title="'IconID:' + o.IconID"
@@ -103,14 +99,18 @@
103
99
  <span class="u-primary">
104
100
  <span class="u-name">
105
101
  {{ o.Name }}
106
- <em v-if="o.BuffName">({{ o.BuffName }})</em>
102
+ <em v-if="o.SkillName">({{ o.SkillName }})</em>
103
+ </span>
104
+ <span class="u-content">
105
+ {{
106
+ o.Desc | filterRaw
107
+ }}
107
108
  </span>
108
- <span class="u-content">{{ o.Desc }}</span>
109
109
  </span>
110
110
  </li>
111
111
  </ul>
112
112
  <el-alert
113
- v-if="!buff.length && done"
113
+ v-if="!skill.length && done"
114
114
  title="没有找到相关条目"
115
115
  type="info"
116
116
  show-icon
@@ -236,9 +236,8 @@
236
236
  import axios from "axios";
237
237
  import { loadResource, loadStat, getIcons } from "../service/database";
238
238
  import { __ossRoot, __iconPath } from "@jx3box/jx3box-common/data/jx3box.json";
239
- import detach_types from "@jx3box/jx3box-data/data/bps/detach_type.json";
239
+ import detach_types from "../assets/data/detach_type.json";
240
240
  import User from "@jx3box/jx3box-common/js/user";
241
- import { school } from "@jx3box/jx3box-data/data/xf/school.json";
242
241
  export default {
243
242
  name: "Resource",
244
243
  props: [],
@@ -246,7 +245,7 @@ export default {
246
245
  return {
247
246
  dialogVisible: false,
248
247
 
249
- type: "skill",
248
+ type: "buff",
250
249
  query: "",
251
250
  strict: false,
252
251
  client : location.hostname.includes('origin') ? 'origin' : 'std',
@@ -268,7 +267,6 @@ export default {
268
267
  loading: false,
269
268
 
270
269
  isSuper: false,
271
- schools: school,
272
270
 
273
271
  html: "",
274
272
  isPC: true,
package/src/SkillSimple.vue DELETED
@@ -1,10 +0,0 @@
1
- <!-- 技能浮窗 -->
2
- <template>
3
- <el-popover></el-popover>
4
- </template>
5
-
6
- <script>
7
- export default {
8
- name: 'SkillSimple',
9
- }
10
- </script>