@jx3box/jx3box-common-ui 8.3.3 → 8.3.4

package/package.json

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

package/service/design.js

@@ -7,3 +7,7 @@ export const createDesignTask = (data) => {
 export const getDesignTask = (params) => {
     return $cms().get(`/api/cms/design/task/log`, { params });
 }
+
+export const getConfigBannerTypes = (params) => {
+    return $cms().get(`/api/cms/config/banner/types`, { params });
+}

package/src/Breadcrumb.vue

@@ -48,7 +48,7 @@
             <!-- <Adminbutton v-if="adminEnable" class="u-admin" /> -->
             <!-- <ListAdmin v-if="topicEnable" /> -->
             <Admin v-if="adminEnable" :marksOptions="adminMarks" :show-extend="showExtend" :app="slug" :subtypeMap="subtypeMap" />
-            <AdminDrop v-if="adminEnable" />
+            <!-- <AdminDrop v-if="adminEnable" /> -->
             <slot name="op-prepend"></slot>
         </div>
     </div>
@@ -149,7 +149,7 @@ export default {
         Crumb,
         // Adminbutton,
         // ListAdmin,
-        AdminDrop,
+        // AdminDrop,
     },
 };
 </script>

package/src/bread/AdminDrop.vue

@@ -25,6 +25,7 @@
 import Bus from "../../service/bus";
 import User from "@jx3box/jx3box-common/js/user";
 import DesignTask from "./DesignTask.vue";
+import { sendMessage } from "../../service/admin";
 export default {
     name: "AdminDrop",
     components: {
@@ -80,7 +81,7 @@ export default {
                 beforeClose: (action, instance, done) => {
                     if (action === "confirm") {
                         const data = {
-                            source_id: this.sourceId,
+                            source_id: String(this.sourceId),
                             source_type: this.sourceType,
                             user_id: this.userId,
                             content: "运营通知：" + instance.inputValue,

package/src/bread/DesignTask.vue

@@ -4,6 +4,11 @@
             <el-form-item label="标题" required>
                 <el-input v-model="form.title" placeholder="请输入标题"></el-input>
             </el-form-item>
+            <el-form-item label="类型">
+                <el-select v-model="form.type" placeholder="请选择类型" style="width:100%;">
+                    <el-option v-for="item in config" :key="item.id" :label="item.label" :value="item.name"></el-option>
+                </el-select>
+            </el-form-item>
             <el-form-item label="备注">
                 <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
             </el-form-item>
@@ -11,6 +16,27 @@
                 <el-rate v-model="form.star" :colors="colors"></el-rate>
             </el-form-item>
         </el-form>
+
+        <el-divider content-position="left">
+            近期推送
+        </el-divider>
+        <template v-if="logs && logs.length">
+            <el-table :data="logs" border size="small">
+                <el-table-column label="推送时间" prop="push_at" align="center">
+                    <template #default="{row}">
+                        {{ formatTime(row.push_at) }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="推送人" prop="pusher.display_name" align="center"></el-table-column>
+                <el-table-column label="星级" prop="star" align="center">
+                    <template #default="{row}">
+                        <el-rate v-model="row.star" disabled :colors="colors"></el-rate>
+                    </template>
+                </el-table-column>
+                <el-table-column label="备注" prop="remark" align="center"></el-table-column>
+            </el-table>
+        </template>
+        <el-alert v-else title="当前文章暂无历史推送" type="info" show-icon :closable="false"></el-alert>
         <template #footer>
             <el-button @click="close">取 消</el-button>
             <el-button type="primary" @click="onConfirm">确 定</el-button>
@@ -19,8 +45,9 @@
 </template>
 
 <script>
-import { createDesignTask, getDesignTask } from "../../service/design";
+import { createDesignTask, getDesignTask, getConfigBannerTypes } from "../../service/design";
 import {pick} from "lodash";
+import dayjs from "dayjs";
 export default {
     name: "DesignTask",
     props: {
@@ -44,6 +71,7 @@ export default {
                 title: "",
                 remark: "",
                 star: 0,
+                subtype: "",
             },
             colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
 
@@ -53,15 +81,22 @@ export default {
                     { required: true, message: "请输入标题", trigger: "blur" },
                 ],
             },
+            config: []
         }
     },
     watch: {
         modelValue(val) {
             if (val) {
+                if (this.post) {
+                    this.form.title = this.post.post_title;
+                }
                 this.loadLogs();
             }
         }
     },
+    mounted() {
+        this.loadConfig();
+    },
     methods: {
         close(){
             this.$emit("update:modelValue",false)
@@ -81,8 +116,10 @@ export default {
             data.title = this.form.title;
             data.remark = this.form.remark;
             data.star = this.form.star;
+            data.subtype = this.form.type;
+
             data.source_type = this.post?.post_type;
-            data.source_id = this.post?.ID;
+            data.source_id = String(this.post?.ID);
             data.link = `/${this.post?.post_type}/${this.post?.ID}`;
             data.flow = 0;
 
@@ -96,9 +133,18 @@ export default {
             this.clearForm();
         },
         loadLogs() {
-            getDesignTask().then(res => {
+            if (!this.post?.ID) return;
+            getDesignTask({ source_id: this.post?.ID }).then(res => {
                 this.logs = res.data.data || [];
             })
+        },
+        loadConfig() {
+            getConfigBannerTypes({ _no_page: 1 }).then(res => {
+                this.config = res.data.data || [];
+            })
+        },
+        formatTime(time) {
+            return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
         }
     }
 }
@@ -111,5 +157,8 @@ export default {
             top: 10px;
         }
     }
+    .u-time {
+        color: #c0c4cc;
+    }
 }
 </style>