@jx3box/jx3box-ui 2.0.3 → 2.0.4

package/README.md

@@ -50,3 +50,54 @@
 - topicBy 主题筛选
 - versionBy 版本筛选
 - zlpBy 资料片筛选
+
+
+### 顶部模块
+
+主要是header的模块
+
+- alternate 马甲切换
+- asset 用户资产
+- box 魔盒矩阵（移动端）
+- box2 魔盒矩阵（PC）
+- client 客户端切换
+- lang 语言切换
+- logo
+- manage 后台管理入口
+- message 消息中心入口
+- nav 导航栏
+- publish 创作中心入口
+- search 搜索框
+- shop 商城入口
+- user 用户头像+信息pop
+- 会员中心入口
+
+### 交互模块
+
+主要是文章详情中用于用户交互的组件，包含打赏，分享，收藏等等
+
+- BoxcoinAdmin 管理员品鉴
+- BoxcoinRecords 品鉴+打赏记录
+- BoxcoinUser 用户打赏
+- Contributors 多人合作文章中打赏目标选择
+- Fav 收藏
+- Like 点赞
+- Rss 订阅
+- Share 分享
+- WatchLater 稍后再看
+
+
+### 单页
+
+主要是用于详情页的展示内容
+
+- Author 侧边栏作者信息
+- CmsSingle 单页框架
+- Collection 小册
+- Comment 评论
+- Creators 联合创作
+- PostDirectory 目录
+- PostHeader 创作信息
+- PostTopic 右侧边栏头条
+- SimpleThx 简单交互组件集合
+- Thx 交互组件

package/i18n/messages/en-US.js

@@ -55,6 +55,7 @@ export default {
         panel: {
             manageCenter: "Admin",
         },
+        all: "All",
     },
     footer: {
         slogan1: "All-in-one tools & resources for JX3.",

package/i18n/messages/vi.js

@@ -55,6 +55,7 @@ export default {
         panel: {
             manageCenter: "Quản trị",
         },
+        all: "Tất cả",
     },
     footer: {
         slogan1: "Tổng hợp công cụ & tài nguyên JX3.",

package/i18n/messages/zh-CN.js

@@ -55,6 +55,7 @@ export default {
         panel: {
             manageCenter: "管理中心",
         },
+        all: "全部",
     },
     footer: {
         slogan1: "一站式剑三工具与资源聚合站。",

package/i18n/messages/zh-TW.js

@@ -55,6 +55,7 @@ export default {
         panel: {
             manageCenter: "管理中心",
         },
+        all: "全部",
     },
     footer: {
         slogan1: "一站式劍三工具與資源聚合站。",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-ui",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {

package/src/App.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script>
-import singlebox from "./single/cms-single.vue";
+import singlebox from "./single/CmsSingle.vue";
 import UploadAlum from "./editor/UploadAlum.vue";
 import Author from "./single/Author.vue";
 import SimpleThxVue from "./single/SimpleThx.vue";

package/src/comment/CommentContent.vue

@@ -213,27 +213,27 @@ export default {
             default: "",
         },
         hasReply: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canDelete: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canSetTop: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canCancelTop: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canHide: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         isLike: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         likes: {
@@ -241,11 +241,11 @@ export default {
             default: 0,
         },
         canSetStar: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canCancelStar: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         attachments: {
@@ -257,11 +257,11 @@ export default {
             default: 0,
         },
         canAddWhite: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
         canRemoveWhite: {
-            type: Boolean,
+            type: [Boolean, Number],
             default: false,
         },
     },

package/src/footer/resource.vue

@@ -62,7 +62,7 @@
                         :alt="$jx3boxT('jx3boxUi.footer.qqBot', 'QQ机器人')"
                     />
                 </div>
-                <div>
+                <div @click="copyText('3889010020')" class="cursor-pointer">
                     <p class="font-bold uppercase tracking-wider text-gray-500" style="font-size: 10px">
                         {{ $jx3boxT("jx3boxUi.footer.qqBotService", "QQ 机器人服务") }}
                     </p>
@@ -82,6 +82,7 @@
 </template>
 
 <script>
+import { copyText } from "../../utils";
 import i18nMixin from "../../i18n/mixin";
 export default {
     name: "FooterResource",
@@ -127,6 +128,7 @@ export default {
     computed: {},
     watch: {},
     methods: {
+        copyText,
         getDownloadName(item) {
             if (item?.key) {
                 const k = item.key === "harmonyNext" ? "harmonyNext" : item.key;

package/src/header/alternate.vue

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import Bus from "./bus";
+import Bus from "../../utils/bus";
 import { showAvatar } from "@jx3box/jx3box-common/js/utils";
 import dayjs from "dayjs";
 import User from "@jx3box/jx3box-common/js/user";
@@ -75,7 +75,7 @@ export default {
         },
     },
     mounted() {
-        Bus.$on("showAlternate", () => {
+        Bus.on("showAlternate", () => {
             this.visible = true;
         });
         this.init();

package/src/header/box.vue

@@ -30,7 +30,7 @@
 <script>
 import search from "./search.vue";
 import _ from "lodash";
-import Bus from "./bus";
+import Bus from "../../utils/bus";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import i18nMixin from "../../i18n/mixin";
 import box from "../../assets/data/box.json";
@@ -76,7 +76,7 @@ export default {
     },
     methods: {
         closeBox: function () {
-            Bus.$emit("toggleBox", false);
+            Bus.emit("toggleBox", false);
         },
         matchedClient: function (client) {
             return client == "all" ? true : client == this.client;
@@ -126,7 +126,7 @@ export default {
         this.loadMenu();
     },
     mounted: function () {
-        Bus.$on("toggleBox", (status) => {
+        Bus.on("toggleBox", (status) => {
             if (status == undefined) {
                 this.status = !this.status;
             } else {
@@ -134,7 +134,7 @@ export default {
             }
         });
         document.addEventListener("click", function () {
-            Bus.$emit("toggleBox", false);
+            Bus.emit("toggleBox", false);
         });
     },
     components: {

package/src/header/box2.vue

@@ -41,6 +41,14 @@
                                 <span class="u-txt">{{ item.abbr }}</span>
                             </a>
                         </li>
+                        <li v-if="allMatched && filteredList.length > 0">
+                            <a class="u-item" href="/app">
+                                <div class="u-icon-wrap">
+                                    <img class="u-pic" svg-inline :src="allicon" />
+                                </div>
+                                <span class="u-txt">{{ $jx3boxT("jx3boxUi.header.all", "全部") }}</span>
+                            </a>
+                        </li>
                     </ul>
                     <div v-if="searchQuery && !homeMatched && filteredList.length === 0" class="u-empty">
                         未找到匹配应用
@@ -52,13 +60,15 @@
 </template>
 
 <script>
-import Bus from "./bus";
+import Bus from "../../utils/bus";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import i18nMixin from "../../i18n/mixin";
 import box from "../../assets/data/box.json";
 import { getMenu } from "../../service/header.js";
+import axios from "axios";
+import { flatten } from "lodash";
 
-const { __imgPath, __cdn } = JX3BOX;
+const { __cdn, __imgPath } = JX3BOX;
 
 export default {
     name: "Box2",
@@ -67,17 +77,27 @@ export default {
         return {
             status: false,
             searchQuery: "",
-            data: box,
+            data: [],
             client: location.href.includes("origin") ? "origin" : "std",
         };
     },
     computed: {
         homeicon: function () {
-            return __imgPath + "image/box/home.svg";
+            return this.getBoxIcon("home.svg");
+        },
+        allicon: function () {
+            return this.getBoxIcon("more.svg");
         },
         list: function () {
             return this.data.filter((item) => {
-                return item.status && (item.client == this.client || item.client == "all");
+                const currentClient = String(this.client || "").toLowerCase();
+                const rawClient = item.client;
+                const matchedClient = !rawClient
+                    ? true
+                    : Array.isArray(rawClient)
+                    ? rawClient.map((c) => String(c || "").toLowerCase()).includes(currentClient)
+                    : String(rawClient || "").toLowerCase().includes(currentClient);
+                return matchedClient;
             });
         },
         filteredList: function () {
@@ -95,7 +115,12 @@ export default {
         homeMatched: function () {
             const query = (this.searchQuery || "").toLowerCase().trim();
             if (!query) return true;
-            return "首页".includes(query);
+            return this.$jx3boxT("jx3boxUi.header.home", "首页").includes(query);
+        },
+        allMatched: function () {
+            const query = (this.searchQuery || "").toLowerCase().trim();
+            if (!query) return true;
+            return this.$jx3boxT("jx3boxUi.header.all", "全部").includes(query);
         },
     },
     methods: {
@@ -135,18 +160,26 @@ export default {
         },
         loadMenu() {
             try {
-                const _box = JSON.parse(sessionStorage.getItem("box"));
-                if (_box) {
-                    this.data = _box;
+                const data = JSON.parse(sessionStorage.getItem("box"));
+                if (data) {
+                    this.data = data;
                 } else {
-                    getMenu("box").then((res) => {
-                        this.data = res.data?.data?.val;
+                    axios.get(__imgPath + "logo/app.json").then((res) => {
+                        const _data = flatten(Object.values(res.data || {}));
+                        this.data = _data.map((item) => ({
+                            img: item.key + ".svg",
+                            uuid: item.key,
+                            abbr: item.label,
+                            href: item.link,
+                            client: item.client || ["std", "origin"],
+                        }));
+
+                        if (!this.data.length) this.data = box;
                         sessionStorage.setItem("box", JSON.stringify(this.data));
                     });
                 }
             } catch (e) {
                 this.data = box;
-                console.log("loadBox2 error", e);
             }
         },
         onEsc(e) {
@@ -166,12 +199,12 @@ export default {
                 this.status = !!status;
             }
         };
-        Bus.$on("toggleBox", this.__toggleHandler);
+        Bus.on("toggleBox", this.__toggleHandler);
         window.addEventListener("keydown", this.onEsc);
     },
     beforeUnmount() {
         if (this.__toggleHandler) {
-            Bus.$off("toggleBox", this.__toggleHandler);
+            Bus.off("toggleBox", this.__toggleHandler);
             this.__toggleHandler = null;
         }
         window.removeEventListener("keydown", this.onEsc);

package/src/header/lang.vue

@@ -1,7 +1,6 @@
 <template>
     <div class="c-header-panel c-lang-switcher" id="c-header-lang-switcher">
         <span class="u-translator" href="/dashboard/boxcoin">
-            <!-- <langIcon class="u-icon" /> -->
             <img
                 class="u-icon"
                 svg-inline
@@ -86,7 +85,7 @@ export default {
             if (!normalized) return;
 
             const ok = setJx3boxUiLocale(normalized);
-            if (!ok) location.reload();
+            if (ok) location.reload();
         },
     },
 };

package/src/header/logo.vue

@@ -14,7 +14,7 @@
 <script>
 // import { useLayoutStore } from "@/store/layout";
 import i18nMixin from "../../i18n/mixin";
-import Bus from "./bus";
+import Bus from "../../utils/bus";
 
 export default {
     name: "c-header-logo",
@@ -34,7 +34,7 @@ export default {
         // 盒子
         toggleBox: function (e) {
             e.stopPropagation();
-            Bus.$emit("toggleBox");
+            Bus.emit("toggleBox");
         },
     },
     mounted: function () {},

package/src/header/userInfo.vue

@@ -86,7 +86,7 @@
 
                     <div class="u-other">
                         <a href="/dashboard/role" class="u-item"
-                            ><el-icon><Sunny /></el-icon>{{ $jx3boxT("jx3boxUi.header.roleManage", "角色管理") }}
+                            ><el-icon><User /></el-icon>{{ $jx3boxT("jx3boxUi.header.roleManage", "角色管理") }}
                         </a>
                         <a href="/dashboard/fav" class="u-item"
                             ><el-icon><Star /></el-icon>{{ $jx3boxT("jx3boxUi.header.favorites", "收藏订阅") }}
@@ -95,7 +95,7 @@
                             ><el-icon><Memo /></el-icon>{{ $jx3boxT("jx3boxUi.header.orderCenter", "订单中心") }}
                         </a>
                         <a href="/dashboard/config" class="u-item"
-                            ><el-icon><Box /></el-icon>{{ $jx3boxT("jx3boxUi.header.dashboard", "个人中心") }}
+                            ><el-icon><Help /></el-icon>{{ $jx3boxT("jx3boxUi.header.dashboard", "个人中心") }}
                         </a>
                         <hr />
                         <a href="/dashboard/profile" class="u-item"
@@ -125,7 +125,7 @@ import { showDate } from "@jx3box/jx3box-common/js/moment";
 import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import { copyText } from "./utils";
 import { getMenu } from "../../service/header";
-import Bus from "./bus";
+import Bus from "../../utils/bus";
 import alternate from "./alternate.vue";
 import i18nMixin from "../../i18n/mixin";
 
@@ -272,7 +272,7 @@ export default {
             }
         },
         changeAlternate: function () {
-            Bus.$emit("showAlternate");
+            Bus.emit("showAlternate");
         },
     },
 };

package/src/header/bus.js

@@ -1,9 +0,0 @@
-import mitt from "mitt";
-
-const emitter = mitt();
-
-export default {
-    $on: emitter.on,
-    $off: emitter.off,
-    $emit: emitter.emit,
-};