@jx3box/jx3box-common-ui 6.1.5 → 6.1.8

package/index.js

@@ -31,8 +31,6 @@ import zlpBy from "./src/filters/zlpBy.vue";
 import Thx from './src/single/Thx.vue'
 import WikiPanel from './src/wiki/WikiPanel.vue'
 
-import GameText from './src/GameText.vue'
-
 const components = {
     Header,
     Breadcrumb,
@@ -66,9 +64,7 @@ const components = {
     clientBy,
     zlpBy,
 
-    WikiPanel,
-
-    GameText
+    WikiPanel
 }
 
 const install = function (Vue, Option) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "6.1.5",
+  "version": "6.1.8",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -33,7 +33,7 @@
     "@jx3box/jx3box-comment-ui": "^1.7.1",
     "@jx3box/jx3box-common": "^7.4.2",
     "@jx3box/jx3box-data": "^1.11.1",
-    "@jx3box/jx3box-editor": "^1.4.8",
+    "@jx3box/jx3box-editor": "^1.5.0",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",
     "element-ui": "^2.13.2",

package/src/App.vue

@@ -110,11 +110,6 @@
                         <Avatar :id="8" url="" :size="avatar_size" frame="" />
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="游戏描述" name="GameText">
-                    <div>
-                        <game-text :text="text"></game-text>
-                    </div>
-                </el-tab-pane>
             </el-tabs>
 
             <RightSidebar>
@@ -178,8 +173,6 @@ import WikiPanel from "./wiki/WikiPanel.vue";
 import WikiRevisions from "./wiki/WikiRevisions.vue";
 import WikiComments from "./wiki/WikiComments.vue";
 
-import GameText from "./GameText.vue";
-
 import axios from "axios";
 import { __server } from "@jx3box/jx3box-common/data/jx3box.json";
 import { wiki } from "@jx3box/jx3box-common/js/wiki";
@@ -233,8 +226,7 @@ export default {
         WikiRevisions,
         WikiComments,
 
-        UserPop,
-        GameText,
+        UserPop
     },
     data: function () {
         return {

package/src/author/AuthorFollow.vue

@@ -14,13 +14,19 @@
             {{ btnText }}
             <!-- <span class="u-follow-count">{{ formatFansNum(fansNum) }} </span> -->
         </el-button>
-        <el-popover v-else placement="bottom" trigger="hover" popper-class="u-follow-popover" :visible-arrow="false">
+        <el-popover
+            v-else
+            placement="bottom"
+            trigger="hover"
+            popper-class="c-author-follow-popover"
+            :visible-arrow="false"
+        >
             <div class="u-action-list">
                 <div class="u-action-item" v-for="item in actions" :key="item.label" @click.stop="item.action">
                     {{ item.label }}
                 </div>
             </div>
-            <el-button class="u-unfollow-btn" size="mini" :type="btnType" slot="reference"
+            <el-button class="u-btn" size="mini" :type="btnType" slot="reference"
                 >{{ btnText }}
                 <!-- TODO:后续在粉丝榜中展示粉丝数 -->
                 <!-- <span class="u-follow-count">{{ formatFansNum(fansNum) }}</span> -->
@@ -146,39 +152,33 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
-.c-author-follow{
-    // .u-btn{
-    //     background-color: #31dee6;
-    //     border-color:lighten(#31dee6,5%);
-    //     color: #fff;
-    // }
-}
-
-.u-unfollow-btn {
-    &.el-button {
-        margin-right: 10px;
-    }
-}
-.u-follow-popover {
-    &.el-popover {
-        min-width: 100px;
-        padding: 0;
-        margin: 0;
-        .u-action-list {
-            .u-action-item {
-                text-align: center;
-                cursor: pointer;
-                padding: 8px 10px;
-                &:hover {
-                    background: rgb(248, 248, 251);
+<style lang="less">
+.c-author-follow-popover {
+    .u-follow-popover {
+        &.el-popover {
+            min-width: 100px;
+            padding: 0;
+            margin: 0;
+            .u-action-list {
+                .u-action-item {
+                    text-align: center;
+                    cursor: pointer;
+                    padding: 8px 10px;
+                    &:hover {
+                        background: rgb(248, 248, 251);
+                    }
                 }
             }
         }
     }
-}
-.u-follow-count {
-    margin-left: 5px;
+    .u-follow-count {
+        margin-left: 5px;
+    }
 }
 
+@media screen and (max-width: @phone) {
+    .el-message-box {
+        max-width: 60%;
+    }
+}
 </style>

package/src/single/Thx.vue

@@ -129,10 +129,7 @@ export default {
                     } else if (this.client == "std") {
                         this.user_left = res.data.data.asUserBoxCoinRemainStd + res.data.data.asUserBoxCoinRemainAll;
                     } else {
-                        this.user_left =
-                            res.data.data.asUserBoxCoinRemainAll +
-                            res.data.data.asUserBoxCoinRemainStd +
-                            res.data.data.asUserBoxCoinRemainOrigin;
+                        this.user_left = res.data.data.asUserBoxCoinRemainAll
                     }
                 });
             getBoxcoinStatus().then((res) => {

package/yarn-error.log

@@ -0,0 +1,95 @@
+Arguments: 
+  C:\Program Files\nodejs\node.exe C:\Program Files\nodejs\node_modules\yarn\bin\yarn.js add @jx3box/jx3box-editor@latest
+
+PATH: 
+  C:\Program Files (x86)\PowerShell\7;C:\Python310\Scripts\;C:\Python310\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\ProgramData\chocolatey\bin;C:\Program Files\Git\cmd;D:\Program Files (x86)\Xftp\;D:\Program Files (x86)\Xshell\;C:\Program Files (x86)\PowerShell\7\;D:\Program Files (x86)\Bandizip;d:\Program Files (x86)\Tencent\微信web开发者工具\dll;%NVM_HOME%;%NVM_SYMLINK%;C:\Program Files (x86)\oh-my-posh\bin;;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Users\ljw\AppData\Local\pnpm;C:\Users\ljw\.cargo\bin;C:\Users\ljw\AppData\Local\Microsoft\WindowsApps;D:\Microsoft VS Code\bin;d:\Program Files\JetBrains\WebStorm 2022.2\bin;;C:\Users\ljw\AppData\Roaming\nvm;C:\Program Files\nodejs
+
+Yarn version: 
+  1.22.19
+
+Node version: 
+  14.18.2
+
+Platform: 
+  win32 x64
+
+Trace: 
+  Error: ENOENT: no such file or directory, copyfile 'C:\Users\ljw\AppData\Local\Yarn\Cache\v6\npm-yallist-2.1.2-1c11f9218f076089a47dd512f93c6699a6a81d52-integrity\node_modules\yallist\LICENSE' -> 'D:\Projects\Personal\JX3BOX\jx3box-common-ui\node_modules\@vue\component-compiler-utils\node_modules\yallist\LICENSE'
+
+npm manifest: 
+  {
+    "name": "@jx3box/jx3box-common-ui",
+    "version": "6.1.7",
+    "description": "JX3BOX UI",
+    "main": "index.js",
+    "scripts": {
+      "dev": "cross-env DEV_SERVER=true vue-cli-service serve",
+      "serve": "vue-cli-service serve",
+      "build": "vue-cli-service build",
+      "lint": "vue-cli-service lint",
+      "inspect": "vue inspect > output.js",
+      "update": "npm --registry https://registry.npmjs.org install @jx3box/jx3box-common@latest @jx3box/jx3box-data@latest @jx3box/jx3box-editor@latest @jx3box/jx3box-comment-ui@latest",
+      "header": "vue-cli-service build --target lib --name newheader src/Header.vue && cp public/index.html dist/newheader.html"
+    },
+    "eslintConfig": {
+      "root": true,
+      "env": {
+        "node": true
+      },
+      "extends": [
+        "plugin:vue/essential"
+      ],
+      "rules": {},
+      "parserOptions": {
+        "parser": "babel-eslint"
+      }
+    },
+    "browserslist": [
+      "> 1%",
+      "last 2 versions"
+    ],
+    "dependencies": {
+      "@jx3box/jx3box-comment-ui": "^1.7.1",
+      "@jx3box/jx3box-common": "^7.4.2",
+      "@jx3box/jx3box-data": "^1.11.1",
+      "@jx3box/jx3box-editor": "^1.4.12",
+      "axios": "^0.26.1",
+      "dayjs": "^1.11.0",
+      "element-ui": "^2.13.2",
+      "jquery": "^3.5.1",
+      "lodash": "^4.17.15",
+      "qrcode.vue": "^1.7.0",
+      "url": "^0.11.0",
+      "vue": "^2.6.11"
+    },
+    "devDependencies": {
+      "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+      "@vue/cli-plugin-babel": "~4.3.0",
+      "@vue/cli-plugin-eslint": "~4.3.0",
+      "@vue/cli-plugin-vuex": "^4.0.0",
+      "@vue/cli-service": "~4.3.0",
+      "babel-eslint": "^10.1.0",
+      "core-js": "^3.6.5",
+      "cross-env": "^7.0.3",
+      "csslab": "^4.0.3",
+      "eslint": "^6.7.2",
+      "eslint-plugin-vue": "^6.2.2",
+      "less": "^3.0.4",
+      "less-loader": "^5.0.0",
+      "style-resources-loader": "^1.3.3",
+      "vue-cli-plugin-element": "~1.0.1",
+      "vue-svg-inline-loader": "^1.4.6",
+      "vue-template-compiler": "^2.6.11",
+      "weixin-js-sdk": "^1.6.0"
+    },
+    "repository": {
+      "type": "git",
+      "url": "git+https://github.com/JX3BOX/jx3box-common-ui.git"
+    }
+  }
+
+yarn manifest: 
+  No manifest
+
+Lockfile: 
+  No lockfile

package/service/resource.js

@@ -1,20 +0,0 @@
-/*
- * @Author: X3ZvaWQ
- * @Date: 2022-08-20 22:17:27
- * @LastEditors: X3ZvaWQ
- * @LastEditTime: 2022-08-20 23:13:38
- * @Description:
- */
-import { $node } from "@jx3box/jx3box-common/js/https";
-const $ = $node();
-
-/* import axios from 'axios'
-const $ = axios.create({
-    baseURL: 'http://localhost:7002/',
-}) */
-
-function getResource(id, client = 'std') {
-    return $.get(`/resource/${client}/${id}`);
-}
-
-export { getResource };

package/src/GameText.vue

@@ -1,144 +0,0 @@
-<!--
- * @Author: X3ZvaWQ
- * @Date: 2022-08-20 20:23:57
- * @LastEditors: X3ZvaWQ
- * @LastEditTime: 2022-08-20 23:12:34
- * @Description: 用于渲染游戏内Text标签的文本
--->
-<template>
-    <span v-html="html"></span>
-</template>
-
-<script>
-import { extractTextContent, getLink } from "@jx3box/jx3box-common/js/utils";
-import { getResource } from "../service/resource";
-
-export default {
-    name: "GameText",
-    props: {
-        text: {
-            type: String,
-            default: "",
-        },
-        client: {
-            type: String,
-            default: "std",
-        },
-    },
-    data: function () {
-        return {
-            html: "",
-        };
-    },
-    methods: {
-        /**
-         * 渲染某一个单独的Text标签成Span或链接
-         * @param {*} school_id
-         * @returns
-         */
-        renderItemHtml: function (item) {
-            let content = item.text;
-            let style = ``;
-            let link = null;
-            content = content.replace(/\n/g, "<br />").replace(/\\/g, "");
-            if ([item.r, item.g, item.b].every((v) => v != undefined && v > 0)) {
-                style = `color: rgb(${item.r}, ${item.g}, ${item.b});`;
-            } else if (item.font != undefined) {
-                const fonts = require("../assets/data/game_font.json");
-                for (let color in fonts) {
-                    if (fonts[color].includes(item.font)) {
-                        style = `color: ${color};`;
-                        break;
-                    }
-                }
-            }
-            if (item.name == "iteminfolink" && item.script) {
-                let item_type = item.script?.match(/this\.dwTabType=(\d+)/i)?.[1];
-                let item_index = item.script?.match(/this\.dwIndex=(\d+)/i)?.[1];
-                if (item_type && item_index) {
-                    let item_id = `${item_type}_${item_index}`;
-                    link = getLink("item", item_id);
-                }
-            }
-            if (link) {
-                return `<a style="${style} text-decoration: none;" target="_blank" href="${link}">${content}</a>`;
-            } else {
-                return `<span style="${style}">${content}</span>`;
-            }
-        },
-        /**
-         * 将一段游戏内文本转换为Html
-         * @param {Object[]} texts 标签对象
-         */
-        renderTextHtml: function (Text) {
-            let result = Text;
-            const matches = Text.match(/<Text>(.*?)<\/text>/gimsy);
-            if (!matches) return Text;
-            for (let match of matches) {
-                let text = extractTextContent(match);
-                let html = this.renderItemHtml(text[0]);
-                result = result.replace(match, html);
-            }
-            return result;
-        },
-        /**
-         * 获取形如<BUFF 110 1 desc>的资源字段并转换
-         */
-        renderResource: function () {
-            const matches = this.html.match(/<BUFF (\d+) (\d+) (.*?)>/gim);
-            if (!matches) return;
-            for (let match of matches) {
-                let [, id, level, type] = match.match(/<BUFF (\d+) (\d+) (.*?)>/i);
-                type = type.toLowerCase();
-                let type_map = {
-                    desc: "Desc",
-                    time: "Interval",
-                };
-                getResource(`buff.${id}_${level}`, this.client)
-                    .then((res) => {
-                        let data = res.data;
-                        let attr = type_map[type] || type;
-                        let value = data[attr];
-                        if (typeof value == "number" && type == "time") {
-                            let time = value / 16;
-                            if (time > 60) {
-                                time = `${Math.floor(time / 60)}分钟`;
-                            } else {
-                                time = `${time}秒`;
-                            }
-                            this.html = this.html.replace(match, time);
-                            return;
-                        }
-                        if (!value) return;
-                        let _matches = value.match(/<BUFF ([0-9a-zA-Z]+)>/gi);
-                        if (!_matches) this.html = this.html.replace(match, value);
-                        for (let _match of _matches) {
-                            let [, _attr] = _match.match(/<BUFF ([0-9a-zA-Z]+)>/i);
-                            for (let i = 1; i < 15; i++) {
-                                if (data[`BeginAttrib${i}`] == _attr) {
-                                    value = value.replace(_match, data[`BeginValue${i}A`]);
-                                }
-                            }
-                        }
-                        this.html = this.html.replace(match, value);
-                    })
-                    .catch((err) => {
-                        console.log(err);
-                    });
-            }
-        },
-    },
-    watch: {
-        text: {
-            immediate: true,
-            handler: function (val) {
-                this.html = this.renderTextHtml(val);
-                this.renderResource();
-            },
-        },
-    },
-};
-</script>
-
-<style>
-</style>