@jx3box/jx3box-common-ui 8.3.1 → 8.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "8.3.1",
+  "version": "8.3.3",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,9 +31,9 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.8.7",
-    "@jx3box/jx3box-common": "^8.2.7",
-    "@jx3box/jx3box-data": "^3.5.6",
-    "@jx3box/jx3box-editor": "^2.1.7",
+    "@jx3box/jx3box-common": "^8.2.11",
+    "@jx3box/jx3box-data": "^3.5.8",
+    "@jx3box/jx3box-editor": "^2.1.9",
     "@jx3box/reporter": "^0.0.4",
     "axios": "^0.26.1",
     "dayjs": "^1.11.0",

package/service/design.js

@@ -0,0 +1,9 @@
+import { $cms } from "@jx3box/jx3box-common/js/https";
+
+export const createDesignTask = (data) => {
+    return $cms().post(`/api/cms/design/task`, data);
+}
+
+export const getDesignTask = (params) => {
+    return $cms().get(`/api/cms/design/task/log`, { params });
+}

package/src/Breadcrumb.vue

@@ -45,9 +45,10 @@
                 <i class="el-icon-info"></i>
                 <span>反馈</span>
             </a>
-            <Adminbutton v-if="adminEnable" class="u-admin" />
-            <ListAdmin v-if="topicEnable" />
+            <!-- <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" />
             <slot name="op-prepend"></slot>
         </div>
     </div>
@@ -62,6 +63,7 @@ import Admin from "./bread/Admin";
 import Crumb from "./bread/Crumb";
 import Adminbutton from "./bread/Adminbutton";
 import ListAdmin from "./bread/ListAdmin";
+import AdminDrop from "./bread/AdminDrop";
 
 import { isApp } from "../assets/js/app.js";
 import Bus from "../service/bus";
@@ -145,8 +147,9 @@ export default {
     components: {
         Admin,
         Crumb,
-        Adminbutton,
-        ListAdmin,
+        // Adminbutton,
+        // ListAdmin,
+        AdminDrop,
     },
 };
 </script>

package/src/bread/AdminDrop.vue

@@ -0,0 +1,116 @@
+<template>
+    <div class="c-admin-drop">
+        <el-dropdown trigger="click" @command="handleCommand">
+            <el-button type="primary" class="c-admin-button c-admin-drop__button" :size="buttonSize"
+                ><i class="el-icon-setting"></i> 管理<i class="el-icon-arrow-down el-icon--right"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item v-if="isEditor" command="toggleAdminPanel" icon="el-icon-setting">
+                    <span>设置</span>
+                </el-dropdown-item>
+                <el-dropdown-item v-if="isEditor" command="directMessage" icon="el-icon-message">
+                    <span>私信</span>
+                </el-dropdown-item>
+                <el-dropdown-item icon="el-icon-upload" command="designTask">
+                    <span>推送</span>
+                </el-dropdown-item>
+            </el-dropdown-menu>
+        </el-dropdown>
+
+        <design-task v-model="showDesignTask" :post="post"></design-task>
+    </div>
+</template>
+
+<script>
+import Bus from "../../service/bus";
+import User from "@jx3box/jx3box-common/js/user";
+import DesignTask from "./DesignTask.vue";
+export default {
+    name: "AdminDrop",
+    components: {
+        DesignTask
+    },
+    props: {
+        buttonSize: {
+            type: String,
+            default: "medium",
+        },
+        post: {
+            type: Object,
+            default: () => {},
+        },
+        userId: {
+            type: Number,
+            default: 0,
+        },
+    },
+    data() {
+        return {
+            showDesignTask: false,
+        }
+    },
+    computed: {
+        isEditor() {
+            return User.isEditor();
+        },
+        sourceId() {
+            return this.post?.ID
+        },
+        sourceType() {
+            return this.post?.post_type
+        },
+    },
+    methods: {
+        handleCommand(command) {
+            this[command]();
+        },
+        toggleAdminPanel() {
+            Bus.$emit("toggleAdminPanel");
+        },
+        directMessage() {
+            this.$prompt("请输入私信内容", "管理私信", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                inputPlaceholder: "请输入私信内容",
+                inputValidator: (value) => {
+                    if (!value) {
+                        return "请输入私信内容";
+                    }
+                },
+                beforeClose: (action, instance, done) => {
+                    if (action === "confirm") {
+                        const data = {
+                            source_id: this.sourceId,
+                            source_type: this.sourceType,
+                            user_id: this.userId,
+                            content: "运营通知：" + instance.inputValue,
+                            type: "system",
+                            subtype: "admin_message"
+                        };
+                        sendMessage(data).then(() => {
+                            this.$message.success("私信成功");
+                            done();
+                        })
+                    } else {
+                        done();
+                    }
+                }
+            }).catch(() => {})
+        },
+        designTask() {
+            this.showDesignTask = true;
+        }
+    }
+};
+</script>
+
+<style lang="less">
+.c-admin-drop {
+    float: right;
+    margin-top: -2px;
+    margin-right: 10px;
+}
+.c-admin-drop__button {
+    padding: 8px 18px !important;
+}
+</style>

package/src/bread/DesignTask.vue

@@ -0,0 +1,115 @@
+<template>
+    <el-dialog custom-class="m-design-task" :visible="modelValue" @close="close" title="快捷推送" append-to-body>
+        <el-form :model="form" :rules="rules" ref="form" label-position="left" label-width="80px">
+            <el-form-item label="标题" required>
+                <el-input v-model="form.title" placeholder="请输入标题"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+                <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
+            </el-form-item>
+            <el-form-item label="星级" class="m-star-line">
+                <el-rate v-model="form.star" :colors="colors"></el-rate>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button @click="close">取 消</el-button>
+            <el-button type="primary" @click="onConfirm">确 定</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import { createDesignTask, getDesignTask } from "../../service/design";
+import {pick} from "lodash";
+export default {
+    name: "DesignTask",
+    props: {
+        modelValue: {
+            type: Boolean,
+            default: false
+        },
+        post: {
+            type: Object,
+            default: () => {}
+        }
+    },
+    model: {
+        prop: "modelValue",
+        event: "update:modelValue"
+    },
+    emits: ["update:modelValue"],
+    data() {
+        return {
+            form: {
+                title: "",
+                remark: "",
+                star: 0,
+            },
+            colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
+
+            logs: [],
+            rules: {
+                title: [
+                    { required: true, message: "请输入标题", trigger: "blur" },
+                ],
+            },
+        }
+    },
+    watch: {
+        modelValue(val) {
+            if (val) {
+                this.loadLogs();
+            }
+        }
+    },
+    methods: {
+        close(){
+            this.$emit("update:modelValue",false)
+        },
+        clearForm() {
+            this.form = {
+                title: "",
+                remark: "",
+                star: 0,
+            }
+
+            this.$refs?.form?.clearValidate();
+        },
+        onConfirm() {
+            if (!this.post?.ID) return;
+            const data = pick(this.post, ["client", "author"]);
+            data.title = this.form.title;
+            data.remark = this.form.remark;
+            data.star = this.form.star;
+            data.source_type = this.post?.post_type;
+            data.source_id = this.post?.ID;
+            data.link = `/${this.post?.post_type}/${this.post?.ID}`;
+            data.flow = 0;
+
+            createDesignTask(data).then(() => {
+                this.$message.success("提交成功");
+                this.close();
+            })
+        },
+        onCancel() {
+            this.close();
+            this.clearForm();
+        },
+        loadLogs() {
+            getDesignTask().then(res => {
+                this.logs = res.data.data || [];
+            })
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.m-design-task {
+    .m-star-line {
+        .el-form-item__content {
+            top: 10px;
+        }
+    }
+}
+</style>

package/src/header/shop.vue

@@ -61,7 +61,7 @@ export default {
 
                         localStorage.setItem('mall_pop', config.val);
 
-                        setUserMeta("mall_pop", { val: 1 });
+                        // setUserMeta("mall_pop", { val: 1 });
                     }
                 }
             }

package/src/header/vip.vue

@@ -58,7 +58,7 @@ export default {
 
                         localStorage.setItem('vip_pop', config.val);
 
-                        setUserMeta("vip_pop", { val: 1 });
+                        // setUserMeta("vip_pop", { val: 1 });
                     }
                 }
             }

package/vue.config.js

@@ -98,7 +98,7 @@ module.exports = {
             .rule("images")
             .use("url-loader")
             .loader("url-loader")
-            .tap((options) => Object.assign(options, { limit: 10240 }));
+            .tap((options) => Object.assign(options, { limit: 10240, esModule: false }));
 
         //💝 in-line svg imgs ~
         config.module