leisure-core 0.6.82 → 0.6.85

package/index.js

@@ -1,5 +1,5 @@
 import LeDrag from "./le-libs/js/drag.js";
-import leMixins from "./le-libs/mixins/main.js";
+// import leMixins from "./le-libs/mixins/main.js";
 import {
   parseTime,
   formatMoney,
@@ -11,24 +11,20 @@ import LeButton from "./le-button/index.js";
 import LeButtonQr from "./le-button-qr/index.js";
 import LeButtonMsg from "./le-button-msg/index.js";
 import LeDialogContainer from "./le-dialog-container/index.js";
-import LeRole from "./le-role/index.js";
-import LeMenu from "./le-menu/index.js";
-import LeRoleUser from "./le-role-user/index.js";
-import LeUser from "./le-user/index.js";
+
 import LeMedia from "./le-media/index.js";
 import LeMediaUpload from "./le-media-upload/index.js";
 import LeMediaList from "./le-media-list/index.js";
-import LeRichText from "./le-rich-text/index.js";
+
 import LeButtonUpload from "./le-button-upload/index.js";
 import LeButtonSelectMedia from "./le-button-select-media/index.js";
 import LeImage from "./le-image/index.js";
 import LeImageContainer from "./le-image-container/index.js";
-import LeBackUp from "./le-backup/index.js";
+
 import LeUpload from "./le-upload/index.js";
-import LeMpurl from "./le-mpurl/index.js";
+
 import { LeHelp, LeHelpDetail } from "./le-help/index.js";
-import LeSelectUser from "./le-select-user/index.js";
-import LeArea from "./le-area/index.js";
+
 import LeSelect from "./le-select/index.js";
 import LeSelectSearch from "./le-select-search/index.js";
 import LeInput from "./le-input/index.js";
@@ -53,31 +49,27 @@ import LeUploadTable from "./le-upload-table/index.js";
 import LeReport from "./le-report/index.js";
 
 const components = [
-  LeArea,
   LeButton,
   LeButtonQr,
   LeButtonMsg,
   LeDialogContainer,
   LeLogin,
   LeHome,
-  LeMenu,
-  LeRole,
-  LeRoleUser,
-  LeUser,
+
   LeMedia,
   LeMediaUpload,
   LeMediaList,
-  LeRichText,
+
   LeButtonUpload,
   LeButtonSelectMedia,
   LeImageContainer,
   LeImage,
-  LeBackUp,
+
   LeUpload,
-  LeMpurl,
+
   LeHelp,
   LeHelpDetail,
-  LeSelectUser,
+
   LeSelect,
   LeSelectSearch,
   LeInput,
@@ -170,31 +162,24 @@ if (typeof window !== "undefined" && window.Vue) {
 
 export default {
   install,
-  LeArea,
   LeButton,
   LeButtonQr,
   LeButtonMsg,
   LeDialogContainer,
   LeLogin,
   LeHome,
-  LeMenu,
-  LeRole,
-  LeRoleUser,
-  LeUser,
+
   LeMedia,
   LeMediaUpload,
   LeMediaList,
-  LeRichText,
+
   LeButtonUpload,
   LeButtonSelectMedia,
   LeImageContainer,
   LeImage,
-  LeBackUp,
   LeUpload,
-  LeMpurl,
   LeHelp,
   LeHelpDetail,
-  LeSelectUser,
   LeSelect,
   LeSelectSearch,
   LeInput,
@@ -210,7 +195,6 @@ export default {
   LeSpan,
   LeInputAdvanced,
   // LeButtonAudit,
-  leMixins,
   LeInputValidate,
   LeDatePickerAuto,
   LeTableEdit,

package/le-home/src/sub.vue

@@ -0,0 +1,82 @@
+<template>
+  <div>
+    <!-- 有子菜单 → 渲染 el-submenu -->
+    <el-submenu v-if="hasChildren" :index="getIndex" :key="menuItem.id">
+      <template slot="title">
+        <i v-if="menuItem.icon" :class="menuItem.icon"></i>
+        <span>{{ menuItem.title }}</span>
+      </template>
+      <!-- 递归渲染子节点 -->
+      <menu-node
+        v-for="child in menuItem.children"
+        :key="child.id"
+        :menu-item="child"
+        :parent-index="getIndex"
+        @menu-click="handleChildClick"
+      />
+    </el-submenu>
+
+    <!-- 叶子菜单 → 渲染 el-menu-item -->
+    <el-menu-item
+      v-else
+      :index="getIndex"
+      @click="emitClick"
+      :title="shouldShowTooltip ? menuItem.title : ''"
+    >
+      <span class="menu-item-text">{{ menuItem.title }}</span>
+    </el-menu-item>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "MenuNode",
+  props: {
+    // 当前菜单项数据
+    menuItem: {
+      type: Object,
+      required: true,
+    },
+    // 父级 index，用于构建唯一层级路径
+    parentIndex: {
+      type: String,
+      default: "",
+    },
+  },
+  computed: {
+    // 是否有子菜单（且子菜单未被全部过滤掉）
+    hasChildren() {
+      return this.menuItem.children && this.menuItem.children.length > 0;
+    },
+    // 构建唯一 index，使用 id 拼接，避免同名冲突
+    getIndex() {
+      const base = this.parentIndex ? this.parentIndex + "-" : "";
+      return base + this.menuItem.id;
+    },
+    // 是否显示 tooltip（文字超长）
+    shouldShowTooltip() {
+      return this.menuItem.title && this.menuItem.title.length > 8;
+    },
+  },
+  methods: {
+    // 点击叶子菜单
+    emitClick() {
+      this.$emit("menu-click", this.menuItem);
+    },
+    // 子节点触发点击，向上冒泡
+    handleChildClick(item) {
+      this.$emit("menu-click", item);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.menu-item-text {
+  display: inline-block;
+  max-width: calc(100% + 25px);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>

package/le-report/src/main.vue

@@ -161,13 +161,13 @@
 </template>
 
 <script>
-import debtReportMixins from "@/mixins/debtReportMixins.js";
+import rMixins from "./rmixins.js";
 import ExcelJS from "exceljs";
 import FileSaver from "file-saver";
 
 export default {
   name: "le-report",
-  mixins: [debtReportMixins],
+  mixins: [rMixins],
   props: {
     showIndex: {
       type: Boolean,

package/le-report/src/rmixins.js

@@ -0,0 +1,30 @@
+const rMixins = {
+  data() {
+    return {
+      elTableMaxHeight: 200,
+    };
+  },
+
+  mounted() {
+    window.addEventListener("resize", this.changeHeight);
+    this.changeHeight();
+  },
+
+  destroyed() {
+    window.removeEventListener("resize", this.changeHeight);
+  },
+  methods: {
+    changeHeight() {
+      this.$nextTick(() => {
+        if (!this.$refs.eltablemain) return;
+        let dyHeight = this.elTableMaxHeight;
+        let all = window.innerHeight;
+        let top = this.$refs.eltablemain.$el.getBoundingClientRect().top;
+        dyHeight = all - top - 30;
+        this.elTableMaxHeight = dyHeight - 50;
+      });
+    },
+  },
+};
+
+export default rMixins;

package/le-upload-table/src/main.vue

@@ -114,14 +114,14 @@
 </template>
 
 <script>
-import {
-  upload,
-  create,
-  del,
-  list,
-  download,
-} from "@/api/attachment/attachment.js";
-import { downLoadSimple } from "@/utils/downLoadFile.js";
+// import {
+//   upload,
+//   create,
+//   del,
+//   list,
+//   download,
+// } from "@/api/attachment/attachment.js";
+// import { downLoadSimple } from "@/utils/downLoadFile.js";
 
 export default {
   name: "le-upload-table",
@@ -183,6 +183,30 @@ export default {
       type: Boolean,
       default: true,
     },
+    uploadApi: {
+      type: Function,
+      required: true, // 强制父组件提供
+    },
+    // 批量创建附件记录（接收参数数组，返回 Promise<{ data: { data: [...] } }>）
+    createApi: {
+      type: Function,
+      required: true,
+    },
+    // 删除附件（接收 { id }，返回 Promise）
+    deleteApi: {
+      type: Function,
+      required: true,
+    },
+    // 查询附件列表（接收 { mid, mtype }，返回 Promise<{ data: { data: [...] } }>）
+    listApi: {
+      type: Function,
+      required: true,
+    },
+    // 下载文件（接收参数，通常为 fileName 等，返回 void 或 Promise）
+    downloadApi: {
+      type: Function,
+      required: true,
+    },
   },
   watch: {
     showPop: {
@@ -212,7 +236,7 @@ export default {
     currentTotalSize() {
       return this.localAttachments.reduce(
         (total, file) => total + (file.size || 0),
-        0
+        0,
       );
     },
     //  currentTotalSize() {
@@ -224,24 +248,36 @@ export default {
   },
   mounted() {},
   methods: {
+    // getList(callback) {
+    //   let param = {};
+    //   param.mid = this.mid;
+    //   param.mtype = this.mtype;
+    //   const formData = new URLSearchParams(param);
+    //   list(formData).then((res) => {
+    //     this.localAttachments = res.data.data;
+    //     if (callback) {
+    //       callback();
+    //     }
+    //   });
+    // },
     getList(callback) {
-      let param = {};
-      param.mid = this.mid;
-      param.mtype = this.mtype;
+      const param = { mid: this.mid, mtype: this.mtype };
       const formData = new URLSearchParams(param);
-      list(formData).then((res) => {
-        this.localAttachments = res.data.data;
-        if (callback) {
-          callback();
-        }
-      });
+      this.listApi(formData)
+        .then((res) => {
+          this.localAttachments = res.data.data || [];
+          if (callback) callback();
+        })
+        .catch(() => {
+          this.$message.error("获取附件列表失败");
+        });
     },
     // 上传前校验
     beforeUpload(file) {
       // 检查文件大小
       if (file.size / 1024 / 1024 > this.maxSize) {
         this.$message.error(
-          `文件 "${file.name}" 大小不能超过 ${this.maxSize}MB`
+          `文件 "${file.name}" 大小不能超过 ${this.maxSize}MB`,
         );
         return false;
       }
@@ -263,58 +299,98 @@ export default {
     },
 
     // 上传文件
+    // async uploadFile(param) {
+    //   if (this.uploading) {
+    //     this.$message.warning("正在上传中，请稍候...");
+    //     return;
+    //   }
+
+    //   this.uploading = true;
+
+    //   try {
+    //     const formData = new FormData();
+    //     formData.append("files", param.file);
+
+    //     if (this.dir) {
+    //       formData.append("dir", this.dir);
+    //     }
+
+    //     const res = await upload(formData);
+
+    //     if (res.data && res.data.data) {
+    //       const urlList = res.data.data;
+
+    //       if (urlList && urlList.length > 0) {
+    //         let newFiles = [];
+    //         urlList.forEach((ele) => {
+    //           const newFile = {
+    //             id: Date.now(),
+    //             mid: this.mid,
+    //             mtype: this.mtype,
+    //             mtype_name: this.mname,
+    //             attach_name_ori: ele.filesOriginal,
+    //             attach_name: ele.filesNew,
+    //             attach_size: ele.fileSize,
+    //             attach_path: ele.filesUrlPath,
+    //             create_at: new Date(),
+    //           };
+    //           newFiles.push(newFile);
+    //         });
+
+    //         this._saveData(newFiles, (res) => {
+    //           const uploadFiles = res.data.data;
+    //           const localData = [...this.localAttachments, ...uploadFiles];
+    //           this.localAttachments = localData;
+    //           this.$message.success(`文件上传成功`);
+    //         });
+    //       } else {
+    //         this.$message.error("上传成功但未返回文件URL");
+    //       }
+    //     } else {
+    //       this.$message.error(res.data?.msg || "上传失败");
+    //     }
+    //   } catch (error) {
+    //     this.$message.error(`文件上传失败`);
+    //   } finally {
+    //     this.uploading = false;
+    //   }
+    // },
+
     async uploadFile(param) {
       if (this.uploading) {
         this.$message.warning("正在上传中，请稍候...");
         return;
       }
-
       this.uploading = true;
-
       try {
         const formData = new FormData();
         formData.append("files", param.file);
+        if (this.dir) formData.append("dir", this.dir);
 
-        if (this.dir) {
-          formData.append("dir", this.dir);
-        }
-
-        const res = await upload(formData);
-
-        if (res.data && res.data.data) {
-          const urlList = res.data.data;
-
-          if (urlList && urlList.length > 0) {
-            let newFiles = [];
-            urlList.forEach((ele) => {
-              const newFile = {
-                id: Date.now(),
-                mid: this.mid,
-                mtype: this.mtype,
-                mtype_name: this.mname,
-                attach_name_ori: ele.filesOriginal,
-                attach_name: ele.filesNew,
-                attach_size: ele.fileSize,
-                attach_path: ele.filesUrlPath,
-                create_at: new Date(),
-              };
-              newFiles.push(newFile);
-            });
-
-            this._saveData(newFiles, (res) => {
-              const uploadFiles = res.data.data;
-              const localData = [...this.localAttachments, ...uploadFiles];
-              this.localAttachments = localData;
-              this.$message.success(`文件上传成功`);
-            });
-          } else {
-            this.$message.error("上传成功但未返回文件URL");
-          }
-        } else {
-          this.$message.error(res.data?.msg || "上传失败");
+        const res = await this.uploadApi(formData);
+        const urlList = res?.data?.data;
+        if (!urlList || urlList.length === 0) {
+          this.$message.error("上传成功但未返回文件URL");
+          return;
         }
+        const newFiles = urlList.map((ele) => ({
+          id: Date.now(),
+          mid: this.mid,
+          mtype: this.mtype,
+          mtype_name: this.mname,
+          attach_name_ori: ele.filesOriginal,
+          attach_name: ele.filesNew,
+          attach_size: ele.fileSize,
+          attach_path: ele.filesUrlPath,
+          create_at: new Date(),
+        }));
+        // 调用创建 API
+        await this._createRecords(newFiles);
+        // 刷新列表
+        await this.getList();
+        this.$message.success("文件上传成功");
       } catch (error) {
-        this.$message.error(`文件上传失败`);
+        this.$message.error(error.message || "文件上传失败");
       } finally {
         this.uploading = false;
       }
@@ -331,7 +407,7 @@ export default {
         // 直接更新本地数据
         let param = { id: file.id };
         const formData = new URLSearchParams(param);
-        del(formData).then(() => {
+        this.deleteApi(formData).then(() => {
           const updatedAttachments = [...this.localAttachments];
           updatedAttachments.splice(index, 1);
           this.localAttachments = updatedAttachments;
@@ -370,12 +446,15 @@ export default {
     handleDownLoad(row) {
       let params = {};
       params.fileName = row.attach_name;
-      downLoadSimple(
-        "/system-attachment/download",
-        row.attach_name_ori,
-        params
-      ).catch((error) => {
-        this.$message.error(error);
+      // downLoadSimple(
+      //   "/system-attachment/download",
+      //   row.attach_name_ori,
+      //   params,
+      // ).catch((error) => {
+      //   this.$message.error(error);
+      // });
+      this.downloadApi(row.attach_name_ori, params).catch((err) => {
+        this.$message.error(err.message || "下载失败");
       });
     },
 
@@ -430,29 +509,43 @@ export default {
       this.closeBtn();
     },
 
-    _saveData(datas, callBack) {
-      if (datas && datas.length > 0) {
-        let params = [];
-        datas.forEach((ele) => {
-          let param = {};
-          param.mid = ele.mid;
-          param.mtype = ele.mtype;
-          param.mtype_name = ele.mtype_name;
-          param.attach_name = ele.attach_name;
-          param.attach_name_ori = ele.attach_name_ori;
-          param.attach_size = ele.attach_size;
-          param.attach_path = ele.attach_path;
-          params.push(param);
-        });
-        create(params)
-          .then((res) => {
-            if (callBack) callBack(res);
-            this.$message.success("上传服务器成功");
-          })
-          .catch((err) => {
-            this.$message.error("上传失败");
-          });
-      }
+    // _saveData(datas, callBack) {
+    //   if (datas && datas.length > 0) {
+    //     let params = [];
+    //     datas.forEach((ele) => {
+    //       let param = {};
+    //       param.mid = ele.mid;
+    //       param.mtype = ele.mtype;
+    //       param.mtype_name = ele.mtype_name;
+    //       param.attach_name = ele.attach_name;
+    //       param.attach_name_ori = ele.attach_name_ori;
+    //       param.attach_size = ele.attach_size;
+    //       param.attach_path = ele.attach_path;
+    //       params.push(param);
+    //     });
+    //     create(params)
+    //       .then((res) => {
+    //         if (callBack) callBack(res);
+    //         this.$message.success("上传服务器成功");
+    //       })
+    //       .catch((err) => {
+    //         this.$message.error("上传失败");
+    //       });
+    //   }
+    // },
+
+    _createRecords(datas) {
+      if (!datas || datas.length === 0) return Promise.resolve();
+      const params = datas.map((ele) => ({
+        mid: ele.mid,
+        mtype: ele.mtype,
+        mtype_name: ele.mtype_name,
+        attach_name: ele.attach_name,
+        attach_name_ori: ele.attach_name_ori,
+        attach_size: ele.attach_size,
+        attach_path: ele.attach_path,
+      }));
+      return this.createApi(params);
     },
 
     closeBtn() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.6.82",
+  "version": "0.6.85",
   "description": "leisure-core是京心数据基于vue2.x开发的一套后台管理系统桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",
@@ -21,7 +21,9 @@
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2",
     "vxe-table": "~3.19.28",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "exceljs": "^4.4.0",
+    "file-saver": "^2.0.5"
   },
   "devDependencies": {}
 }

package/le-area/index.js

@@ -1,7 +0,0 @@
-import LeArea from "./src/main.vue";
-
-LeArea.install = function (Vue) {
-  Vue.component(LeArea.name, LeArea);
-};
-
-export default LeArea;