@jx3box/jx3box-common-ui 8.0.3 → 8.0.5

package/assets/css/admin.less

@@ -74,10 +74,38 @@
     .x;
 }
 
+.c-admin-extend {
+    .u-condition {
+        .mt(10px);
+        .el-input-group__prepend {
+            padding-left: 10px;
+            padding-right: 10px;
+        }
+    }
+    .u-map {
+        .u-prepend {
+            .fl;
+            width: auto;
+            min-width: 57px;
+            box-sizing: border-box;
+            .fz(12px,38px);
+            text-align: center;
+        }
+        .el-select {
+            .db;
+            .ml(57px);
+        }
+        .el-input__inner {
+            border-top-left-radius: 0;
+            border-bottom-left-radius: 0;
+        }
+    }
+}
+
 @media screen and (max-width:@ipad){
     .c-admin{
         .el-drawer{
             .w(100%) !important;
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "8.0.3",
+  "version": "8.0.5",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {

package/service/cms.js

@@ -53,4 +53,9 @@ function getCollection(id) {
     return $cms({ mute: true }).get(`/api/cms/post/collection/${id}`);
 }
 
-export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember, getHonorJson, getSliders, getCollection };
+// 获取自定义主题
+function getTopicBucket(params) {
+    return $cms().get(`/api/cms/topic/bucket`, { params });
+}
+
+export { getPostAuthors, uploadImage, upload, getDecoration, getDecorationJson, checkTeamMember, getHonorJson, getSliders, getCollection, getTopicBucket, };

package/src/Breadcrumb.vue

@@ -47,7 +47,7 @@
             </a>
             <Adminbutton v-if="adminEnable" class="u-admin" />
             <ListAdmin v-if="topicEnable" />
-            <Admin v-if="adminEnable" :marksOptions="adminMarks" />
+            <Admin v-if="adminEnable" :marksOptions="adminMarks" :show-extend="true" :app="slug" :subtypeMap="subtypeMap" />
             <slot name="op-prepend"></slot>
         </div>
     </div>
@@ -80,7 +80,9 @@ export default {
         "crumbEnable",
         "withoutLeft",
         "adminMarks",
-        "icon"
+        "icon",
+        "subtypeMap",
+        "showExtend"
     ],
     data: function () {
         return {
@@ -89,7 +91,7 @@ export default {
             isNotAdmin: !User.isEditor(),
             isOverlay: false,
             isApp: isApp(),
-            show: false
+            show: false,
         };
     },
     computed: {

package/src/bread/Admin.vue

@@ -41,9 +41,13 @@
                     :predefine="color_options"
                     size="mini"
                 ></el-color-picker>
-                <span class="c-admin-highlight-preview" :style="{ color: color }" style="margin-right: 10px;">预览高亮效果</span>
+                <span class="c-admin-highlight-preview" :style="{ color: color }" style="margin-right: 10px"
+                    >预览高亮效果</span
+                >
             </template>
-            <el-checkbox class="c-admin-highlight-checkbox" v-model="isStar" :true-label="1" :false-label="0">精选</el-checkbox>
+            <el-checkbox class="c-admin-highlight-checkbox" v-model="isStar" :true-label="1" :false-label="0"
+                >精选</el-checkbox
+            >
 
             <el-divider content-position="left">封面海报</el-divider>
             <div class="c-admin-banner">
@@ -94,6 +98,22 @@
                 </div>
             </div>
 
+            <div class="c-admin-extend" v-if="showExtend">
+                <div class="u-condition u-map" v-if="Object.keys(subtypeMap)">
+                    <span class="u-prepend el-input-group__prepend">子类型</span>
+                    <el-select v-model="post_subtype" filterable placeholder="请选择" clearable>
+                        <el-option v-for="(label, value) in subtypeMap" :value="value" :label="label" :key="value">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="u-condition u-map">
+                    <span class="u-prepend el-input-group__prepend">标签</span>
+                    <el-select v-model="tag" filterable placeholder="请选择" clearable multiple collapse-tags>
+                        <el-option v-for="value in tags" :value="value" :label="value" :key="value"> </el-option>
+                    </el-select>
+                </div>
+            </div>
+
             <div class="c-admin-buttons">
                 <el-button type="primary" @click="submit" :loading="pushing">提交</el-button>
                 <el-button type="plain" @click="close">取消</el-button>
@@ -109,6 +129,7 @@ import { __cms, __postType, __visibleMap } from "@jx3box/jx3box-common/data/jx3b
 import { getSetting, postSetting } from "../../service/admin";
 import User from "@jx3box/jx3box-common/js/user";
 import { cms as marks } from "@jx3box/jx3box-common/data/mark.json";
+import { getTopicBucket } from "../../service/cms";
 export default {
     name: "Admin",
     props: {
@@ -134,6 +155,18 @@ export default {
             type: Boolean,
             default: false,
         },
+        showExtend: {
+            type: Boolean,
+            default: false,
+        },
+        subtypeMap: {
+            type: Object,
+            default: () => {},
+        },
+        app: {
+            type: String,
+            default: "",
+        },
     },
     data() {
         return {
@@ -188,6 +221,9 @@ export default {
             // 类型
             post_type: "",
             type_options: [],
+            post_subtype: "",
+            tag: [],
+            tags: [],
 
             // 作者
             post_author: "",
@@ -205,7 +241,9 @@ export default {
                 color: this.isHighlight ? this.color : "",
                 mark: this.mark || [],
                 sticky: this.isSticky ? Date.now() : null,
-                star: this.isStar
+                star: this.isStar,
+                tags: this.tag,
+                post_subtype: this.post_subtype,
             };
         },
         isAdmin: function () {
@@ -263,7 +301,7 @@ export default {
         // 拉
         pull: function () {
             getSetting(this.pid).then((data) => {
-                let { ID, color, mark, post_status, post_author, sticky, post_banner, post_type, visible, star } = data;
+                let { ID, color, mark, post_status, post_author, sticky, post_banner, post_type, visible, star, post_subtype, tags } = data;
                 this.pid = ID;
                 this.post_status = post_status;
                 this.visible = visible;
@@ -277,6 +315,8 @@ export default {
                 if (this.sticky) this.isSticky = true;
 
                 this.isStar = star || 0;
+                this.tag = tags || [];
+                this.post_subtype = post_subtype || "";
 
                 // 设置加载完成标识
                 this.pulled = true;
@@ -305,6 +345,13 @@ export default {
                     this.close();
                 });
         },
+        // 获取topic标签
+        loadTopic() {
+            getTopicBucket({ type: "bbs" }).then((res) => {
+                const data = res.data.data?.map((item) => item.name) || [];
+                this.tags = data;
+            });
+        },
     },
     watch: {
         "$route.params.id": function (id) {
@@ -342,6 +389,10 @@ export default {
             if (this.pid && this.hasRight) {
                 this.pull();
             }
+
+            if (this.showExtend && this.app && this.dialog_visible) {
+                this.loadTopic();
+            }
         });
     },
 };