mooho-base-admin-plus 2.4.35 → 2.4.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.4.35",
+  "version": "2.4.36",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/index.js

@@ -36,26 +36,26 @@ import router, { initRouter } from './router';
 //import { getHeaderName, getMenuSider, getSiderSubmenu } from './libs/system';
 
 // 组件
-import Copyright from './components/copyright/index.vue';
-import Link from './components/link/index.vue';
-import RichEditor from './components/richEditor/index.vue';
-import DialogSelect from './components/input/dialog-select.vue';
-import ItemSelect from './components/input/item-select.vue';
-import AttachmentUpload from './components/upload/upload-attachment.vue';
-import ImageUpload from './components/upload/upload-image.vue';
-import FileUpload from './components/upload/file-upload.vue';
-import ViewForm from './components/view/view-form.vue';
-import ViewTable from './components/view/view-table.vue';
-import ViewChart from './components/view/view-chart.vue';
-import ModalForm from './components/view/modal-form.vue';
-import ModalTable from './components/view/modal-table.vue';
-import FormSetting from './components/view/form-setting.vue';
-import FormSettingLayout from './components/view/form-setting-layout.vue';
-import TableSetting from './components/view/table-setting.vue';
-import ModalFormFilter from './components/view/modal-form-filter.vue';
-import ModalFormSort from './components/view/modal-form-sort.vue';
-import Shortcut from './components/home/shortcut.vue';
-import NoticeList from './components/home/notice-list.vue';
+// import Copyright from './components/copyright/index.vue';
+// import Link from './components/link/index.vue';
+// import RichEditor from './components/richEditor/index.vue';
+// import DialogSelect from './components/input/dialog-select.vue';
+// import ItemSelect from './components/input/item-select.vue';
+// import AttachmentUpload from './components/upload/upload-attachment.vue';
+// import ImageUpload from './components/upload/upload-image.vue';
+// import FileUpload from './components/upload/file-upload.vue';
+// import ViewForm from './components/view/view-form.vue';
+// import ViewTable from './components/view/view-table.vue';
+// import ViewChart from './components/view/view-chart.vue';
+// import ModalForm from './components/view/modal-form.vue';
+// import ModalTable from './components/view/modal-table.vue';
+// import FormSetting from './components/view/form-setting.vue';
+// import FormSettingLayout from './components/view/form-setting-layout.vue';
+// import TableSetting from './components/view/table-setting.vue';
+// import ModalFormFilter from './components/view/modal-form-filter.vue';
+// import ModalFormSort from './components/view/modal-form-sort.vue';
+// import Shortcut from './components/home/shortcut.vue';
+// import NoticeList from './components/home/notice-list.vue';
 
 // API
 import modelApi from './api/model';
@@ -88,29 +88,6 @@ import * as echarts from 'echarts';
 import request from './libs/request';
 import util from './libs/util';
 
-const components = {
-  Copyright,
-  RichEditor,
-  DialogSelect,
-  ItemSelect,
-  AttachmentUpload,
-  ImageUpload,
-  FileUpload,
-  ViewForm,
-  ViewTable,
-  ViewChart,
-  ModalForm,
-  ModalTable,
-  FormSetting,
-  FormSettingLayout,
-  TableSetting,
-  ModalFormFilter,
-  ModalFormSort,
-  Shortcut,
-  NoticeList,
-  iLink: Link
-};
-
 const install = function (app) {
   if (install.installed) return;
 
@@ -158,7 +135,21 @@ Object.keys(files).forEach(key => {
   pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
 });
 
-const created = async (app, routes, files) => {
+// 基础组件
+const componentFiles = import.meta.globEager('./components/**/*.vue');
+const components = {};
+
+Object.keys(componentFiles).forEach(key => {
+  components[
+    key
+      .replace(/(\.\/pages\/)/g, '')
+      .split('/')
+      .pop()
+      .split('.')[0]
+  ] = componentFiles[key].default;
+});
+
+const created = async (app, routes, files, componentFiles) => {
   app.use(API);
 
   if (window) {
@@ -169,6 +160,25 @@ const created = async (app, routes, files) => {
     window.$app.$Notice = app.config.globalProperties.$Notice;
   }
 
+  // 覆盖组件
+  if (componentFiles) {
+    Object.keys(componentFiles).forEach(key => {
+      components[
+        key
+          .replace(/(\.\/pages\/)/g, '')
+          .split('/')
+          .pop()
+          .split('.')[0]
+      ] = componentFiles[key].default;
+    });
+  }
+
+  // 注册组件
+  Object.keys(components).forEach(key => {
+    app.component(key, components[key]);
+  });
+
+  // 页面
   Object.keys(files).forEach(key => {
     pages[key.replace(/(\.\/pages\/)/g, '')] = files[key].default;
   });