@jx3box/jx3box-editor 0.8.0 → 0.8.4

package/assets/js/item.js

@@ -2,11 +2,11 @@ import $ from "jquery";
 
 function renderItem(vm, selector = ".e-jx3-item") {
     let outer, inner;
-
     $(selector).on("mouseenter", function(e) {
         clearTimeout(outer);
 
         vm.item_id = $(e.target).attr("data-id");
+        vm.item_client = $(e.target).attr("data-client") == 'origin' ? 2 : 1;
         $(".c-item-pop").fadeIn();
 
         let self_height = $(".c-item-pop").height();

package/components/BuffItem.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { get_buff } from '../service/buff.js'
+import { getBuff } from '../service/database.js'
 export default {
     name: 'BuffItem',
     props: ['buff', 'buff_id'],
@@ -40,7 +40,7 @@ export default {
                     }
 
                     // 没有缓存则发起请求获取数据
-                    get_buff(val).then(res => {
+                    getBuff(val).then(res => {
                         const data = res.data
                         const [buff] = data.list
                         // console.log(data)

package/package.json

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

package/service/database.js

@@ -1,16 +1,16 @@
 import axios from "axios";
 import { __node, __helperUrl, __iconPath } from "@jx3box/jx3box-common/data/jx3box.json";
-const API = __node;
+import { $node } from "@jx3box/jx3box-common/js/https";
 
 function loadResource(type, query, params) {
     switch (type) {
-        case 'item':
+        case "item":
             return axios
                 .get(`${__helperUrl}api/item/search`, {
-                    params: {keyword: query, page: params.page, limit: params.per},
+                    params: { keyword: query, page: params.page, limit: params.per },
                     headers: {
                         Accept: "application/prs.helper.v2+json",
-                        'JX3-Client-Type': params.client == 'origin' ? 2 : 1,
+                        "JX3-Client-Type": params.client == "origin" ? 2 : 1,
                     },
                     withCredentials: true,
                 })
@@ -24,7 +24,7 @@ function loadResource(type, query, params) {
         default:
             let condition = isNaN(query) ? "name" : "id";
             return axios
-                .get(API + `${type}/${condition}/${query}`, {
+                .get(__node + `${type}/${condition}/${query}`, {
                     params: params,
                 })
                 .then((res) => {
@@ -56,19 +56,19 @@ function getIcons(query, params) {
             let data = res.data;
             let list = [...data.skill, ...data.buff, ...data.item];
             // 去重
-            let _set = new Set()
+            let _set = new Set();
             list.forEach((item) => {
-                _set.add(item.iconID)
-            })
+                _set.add(item.iconID);
+            });
             // 重组
-            let _list = []
+            let _list = [];
             _set.forEach((item) => {
                 _list.push({
                     iconID: item,
                     isSelected: false,
-                })
-            })
-            list = Array.from(_list)
+                });
+            });
+            list = Array.from(_list);
             return list;
         })
         .catch((err) => {
@@ -76,4 +76,22 @@ function getIcons(query, params) {
         });
 }
 
-export { loadResource, loadStat,getIcons };
+function getBuff(id, client = "std", level) {
+    return $node().get("/buff/id" + id, {
+        params: {
+            client: client,
+            level: level,
+        },
+    });
+}
+
+function getSkill(id, client = "origin", level) {
+    return $node().get("/skill/id" + id, {
+        params: {
+            client: client,
+            level: level,
+        },
+    });
+}
+
+export { loadResource, loadStat, getIcons, getBuff, getSkill };

package/service/item.js

@@ -1,26 +1,28 @@
 import $http from "axios";
 import {__helperUrl} from "@jx3box/jx3box-common/data/jx3box.json";
+import {jx3ClientType} from "@jx3box/jx3box-common/js/utils";
 
 // 获取物品
-function get_item(item_id, jx3_client_type = 1) {
+function get_item(item_id, jx3_client_type = null) {
     if (!item_id) return;
+
     return $http({
         url: `${__helperUrl}api/item/${item_id}`,
         headers: {
             Accept: "application/prs.helper.v2+json",
-            'JX3-Client-Type': jx3_client_type,
+            "JX3-Client-Type": jx3_client_type === null ? jx3ClientType() : jx3_client_type,
         },
         withCredentials: true,
-    })
+    });
 }
 
 // 获取清单
-function get_plan(plan_id){
+function get_plan(plan_id) {
     return $http({
         url: `${__helperUrl}api/item_plan/${plan_id}`,
         headers: {Accept: "application/prs.helper.v2+json"},
         withCredentials: true,
-    })
+    });
 }
 
-export { get_item ,get_plan};
+export {get_item, get_plan};

package/src/Article.vue

@@ -36,7 +36,7 @@
             :total="total"
         ></el-pagination>
         <div class="c-item-pop" :style="item_popover_style">
-            <jx3-item :item_id="item_id" />
+            <jx3-item :item_id="item_id" :jx3ClientType="item_client" />
         </div>
         <!-- <gallery :images="images" :index="gallery_index" @close="index = null"></gallery> -->
     </div>
@@ -100,6 +100,7 @@ export default {
                 left: 0,
                 top: 0,
             },
+            item_client : 1,
             // 画廊
             gallery_index: null,
             images: [],

package/src/BuffSimple.vue

@@ -33,7 +33,7 @@
             </span>
             <span class="u-uiid fr" v-text="`ID: ${buff.BuffID}`"></span>
         </div>
-        <buff-item :buff_id="buff_id"></buff-item>
+        <buff-item :buff_id="buff_id" :jx3-client-type="jx3ClientType"></buff-item>
     </el-popover>
 </template>
 

package/src/Item.vue

@@ -250,7 +250,7 @@ import color from "../assets/js/item/color.js";
 
 export default {
     name: "Item",
-    props: ["item", "item_id"],
+    props: ["item", "item_id","jx3ClientType"],
     data() {
         return {
             source: null,
@@ -278,38 +278,28 @@ export default {
             handler() {
                 if (this.item_id) {
                     // 提取本地数据
-                    let cache = sessionStorage.getItem(`item-${this.item_id}`);
-                    let cache_created = sessionStorage.getItem(
-                        `item-${this.item_id}-created`
-                    );
+                    let cacheName = `item-${this.jx3ClientType}-${this.item_id}`;
+                    let cache = sessionStorage.getItem(cacheName);
+                    let createdCacheName = `${cacheName}-created`;
+                    let createdCache = sessionStorage.getItem(createdCacheName);
                     // 查看是否存在缓存
                     if (
                         (cache === false || cache) &&
-                        Math.round(new Date() / 1000) - cache_created <= 3600
+                        Math.round(new Date() / 1000) - createdCache <= 3600
                     ) {
-                        this.source =
-                            cache === false ? null : JSON.parse(cache);
+                        this.source = cache === false ? null : JSON.parse(cache);
                         return;
                     }
 
                     // 没有缓存则发起请求获取
-                    get_item(this.item_id).then((res) => {
+                    get_item(this.item_id, this.jx3ClientType).then((res) => {
                         let data = res.data;
                         if (data.code === 200) {
                             let item = data.data.item;
-                            this.source =
-                                JSON.stringify(item) !== "{}" ? item : null;
+                            this.source = JSON.stringify(item) !== "{}" ? item : null;
                             // 记录本地数据
-                            sessionStorage.setItem(
-                                `item-${this.source.id}`,
-                                this.source
-                                    ? JSON.stringify(this.source)
-                                    : false
-                            );
-                            sessionStorage.setItem(
-                                `item-${this.source.id}-created`,
-                                Math.round(new Date() / 1000)
-                            );
+                            sessionStorage.setItem(cacheName, this.source ? JSON.stringify(this.source) : false);
+                            sessionStorage.setItem(createdCacheName, Math.round(new Date() / 1000));
                         }
                     });
                 } else if (typeof this.item_id !== "undefined") {

package/src/Resource.vue

@@ -400,13 +400,13 @@ export default {
         selectItem: function (o, i) {
             this.resetItems();
             o.isSelected = true;
-            this.html = `<a class="e-jx3-item e-jx3-item-q${o.Quality}" data-id="${o.id}" data-quality="${o.Quality}" target="_blank" href="${o.Link}">[${o.Name}]</a>`;
+            this.html = `<a class="e-jx3-item e-jx3-item-q${o.Quality}" data-mode="" data-id="${o.id}" data-quality="${o.Quality}" data-client="${this.client}" data-name="" data-desc="" data-level="${o.Level}" target="_blank" href="${o.Link}">[${o.Name}]</a>`;
         },
         selectIcon: function (o) {
             this.resetItems();
             o.isSelected = true;
             this.html = `<img class="e-jx3-icon" src="${__iconPath}${this.iconDir}/${o.iconID}.png" alt="${o.iconID}"/>`;
-            console.log(this.html);
+            // console.log(this.html);
         },
         resetItems: function () {
             let data = this[this.type];

package/service/buff.js

@@ -1,18 +0,0 @@
-import $http from 'axios'
-import {__node} from "@jx3box/jx3box-common/data/jx3box.json"
-
-// 获取 buff 信息
-const get_buff = (buff_id) => {
-  if (!buff_id) return
-  return $http({
-    method: 'GET',
-    // https://node.jx3box.com/buff/id/103?strict=0&per=10&page=1
-    url: `${__node}buff/id/${buff_id}`,
-    headers: {Accept: "application/prs.helper.v2+json"},
-    withCredentials: true,
-  })
-}
-
-export {
-  get_buff
-}

package/service/skill.js

@@ -1,18 +0,0 @@
-import $http from 'axios'
-import {__node} from "@jx3box/jx3box-common/data/jx3box.json"
-
-// 获取 skill 信息
-const get_skill = (skill_id) => {
-  if (!skill_id) return
-  return $http({
-    method: 'GET',
-    // https://node.jx3box.com/skill/id/103?strict=0&per=10&page=1
-    url: `${__node}skill/id/${skill_id}`,
-    headers: {Accept: "application/prs.helper.v2+json"},
-    withCredentials: true,
-  })
-}
-
-export {
-  get_skill
-}