@jx3box/jx3box-common-ui 8.4.8 → 8.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "8.4.8",
+    "version": "8.5.0",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {
@@ -68,4 +68,4 @@
         "type": "git",
         "url": "git+https://github.com/JX3BOX/jx3box-common-ui.git"
     }
-}
+}

package/src/bread/DesignTask.vue

@@ -1,10 +1,10 @@
 <template>
     <el-dialog custom-class="m-design-task" :width="isPhone ? '95%' : '600px'" :visible="modelValue" @close="close" title="快捷推送" append-to-body>
-        <el-form :model="form" ref="form" :label-position="isPhone ? 'top' : 'left'" label-width="80px">
-            <el-form-item label="标题">
+        <el-form :model="form" ref="form" :rules="rules" :label-position="isPhone ? 'top' : 'left'" label-width="80px">
+            <el-form-item label="标题" prop="title">
                 <el-input v-model="form.title" placeholder="请输入标题"></el-input>
             </el-form-item>
-            <el-form-item label="类型">
+            <el-form-item label="类型" prop="type">
                 <el-select v-model="form.type" placeholder="请选择类型" style="width:100%;" filterable>
                     <el-option v-for="item in config" :key="item.id" :label="item.label" :value="item.name"></el-option>
                 </el-select>
@@ -92,7 +92,16 @@ export default {
                 "std": "旗舰",
                 "origin": "缘起",
                 "wujie": "无界",
-                "test": "tifu"
+                "test": "体服"
+            },
+
+            rules: {
+                title: [
+                    { required: true, message: "请输入标题", trigger: "blur"}
+                ],
+                type: [
+                    { required: true, message: "请选择类型", trigger: "change"}
+                ]
             }
         }
     },
@@ -101,6 +110,9 @@ export default {
             if (val) {
                 if (this.post) {
                     this.form.title = this.post.post_title;
+                    if (this.post?.post_type) {
+                        this.form.type = this.post.post_type;
+                    }
                 }
                 this.loadLogs();
 

package/src/bread/MoveToCommunityDialog.vue

@@ -21,20 +21,28 @@
             <el-form-item label="简介">
                 <el-input type="textarea" :rows="5" placeholder="请输入内容" v-model="form.introduction"> </el-input>
             </el-form-item>
+        </el-form>
 
-            <el-divider content-position="left">附图</el-divider>
-            <div class="u-imgs">
-                <div
-                    :class="`u-imgs-item ${form.banner_img === item && 'active'}`"
-                    v-for="(item, i) in form.extra_images"
-                    :key="i"
-                    @click="setBannerIndex(item)"
-                >
-                    <el-image :src="item" fit="cover" style="width: 148px; height: 148px" />
-                    <div class="u-mark">封面</div>
-                </div>
+        <el-divider content-position="left">附图</el-divider>
+        <div class="u-imgs">
+            <div
+                :class="`u-imgs-item ${form.banner_img === item && 'active'}`"
+                v-for="(item, i) in form.extra_images"
+                :key="i"
+                @click="setBannerIndex(item)"
+            >
+                <el-image :src="item" fit="cover" style="width: 148px; height: 148px" />
+                <div class="u-mark">封面</div>
             </div>
-        </el-form>
+        </div>
+
+        <el-divider content-position="left"></el-divider>
+
+        <div class="u_r_box">
+            <el-popover placement="top" trigger="manual" size="mini" content="请确认此操作不可逆" v-model="visible">
+                <el-checkbox slot="reference" v-model="checked">我已确认此操作不可逆</el-checkbox>
+            </el-popover>
+        </div>
         <template #footer>
             <el-button @click="close">取 消</el-button>
             <el-button type="primary" @click="onConfirm">确 定</el-button>
@@ -66,12 +74,14 @@ export default {
     emits: ["update:modelValue"],
     data() {
         return {
+            visible: false,
+            checked: false,
             form: {
                 category: "",
                 id: "",
                 introduction: "",
-                banner_img: "",
-                extra_images: [],
+                banner_img: undefined,
+                extra_images: undefined,
             },
             categoryList: [],
             isPhone: window.innerWidth < 768,
@@ -84,6 +94,11 @@ export default {
                 this.initForm();
             }
         },
+        checked(val) {
+            if (val) {
+                this.visible = false;
+            }
+        },
     },
     methods: {
         initForm() {
@@ -91,7 +106,7 @@ export default {
             const content = this.post.post_content;
             this.form.introduction = this.getIntroduction(content);
             const imgs = this.getImgSrc(content);
-            this.form.extra_images = [...new Set(imgs)];
+            if (imgs.length > 0) this.form.extra_images = [...new Set(imgs)];
         },
 
         close() {
@@ -112,6 +127,10 @@ export default {
                 this.$message.error("请选择分类!");
                 return;
             }
+            if (!this.checked) {
+                this.visible = true;
+                return;
+            }
             recoverTopicFromPosts(this.form).then(() => {
                 this.$message.success("操作成功");
                 this.close();
@@ -153,6 +172,10 @@ export default {
 </script>
 
 <style lang="less">
+.u_r_box {
+    display: flex;
+    justify-content: flex-end;
+}
 .u-imgs {
     display: flex;
     overflow-x: auto;

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, esModule: false }));
+            .tap((options) => Object.assign(options, { limit: 10240 }));
 
         //💝 in-line svg imgs ~
         config.module