impr: 代码优化

JackySoft · Dec 18, 2024 · 6021da2 · 6021da2
1 parent 4b3023a
commit 6021da2
Show file tree

Hide file tree

Showing 70 changed files with 17 additions and 97 deletions.
diff --git a/packages/editor/src/config/components.ts b/packages/editor/src/config/components.ts
@@ -94,7 +94,7 @@ const components = [
   },
   {
     type: 'FormItems',
-    title: '表单组件',
+    title: '表单录入',
     data: [
       {
         icon: '',
@@ -330,7 +330,7 @@ const components = [
   },
   {
     type: 'Basic',
-    title: '基础组件',
+    title: '数据展示',
     data: [
       {
         icon: '',
@@ -381,7 +381,7 @@ const components = [
   },
   {
     type: 'Other',
-    title: '地图',
+    title: '其它',
     data: [
       {
         icon: '',

diff --git a/packages/materials/Basic/Avatar/index.ts b/packages/materials/Basic/Avatar/index.ts
diff --git a/packages/materials/Basic/CountDown/index.ts b/packages/materials/Basic/CountDown/index.ts
diff --git a/packages/materials/Basic/Icon/index.ts b/packages/materials/Basic/Icon/index.ts
diff --git a/packages/materials/Basic/Image/index.ts b/packages/materials/Basic/Image/index.ts
diff --git a/packages/materials/Basic/Link/index.ts b/packages/materials/Basic/Link/index.ts
diff --git a/packages/materials/Basic/QRCode/index.ts b/packages/materials/Basic/QRCode/index.ts
diff --git a/packages/materials/Basic/Statistic/index.ts b/packages/materials/Basic/Statistic/index.ts
diff --git a/packages/materials/Basic/Text/index.ts b/packages/materials/Basic/Text/index.ts
diff --git a/packages/materials/Basic/Title/index.ts b/packages/materials/Basic/Title/index.ts
diff --git a/packages/materials/Container/Card/index.ts b/packages/materials/Container/Card/index.ts
diff --git a/packages/materials/Container/Div/index.ts b/packages/materials/Container/Div/index.ts
diff --git a/packages/materials/Container/Flex/index.ts b/packages/materials/Container/Flex/index.ts
diff --git a/packages/materials/Container/Form/index.ts b/packages/materials/Container/Form/index.ts
diff --git a/packages/materials/EChart/BarChart/index.ts b/packages/materials/EChart/BarChart/index.ts
diff --git a/packages/materials/EChart/ColumnChart/index.ts b/packages/materials/EChart/ColumnChart/index.ts
diff --git a/packages/materials/EChart/LineChart/index.ts b/packages/materials/EChart/LineChart/index.ts
diff --git a/packages/materials/EChart/PieChart/index.ts b/packages/materials/EChart/PieChart/index.ts
diff --git a/packages/materials/EChart/Progress/index.ts b/packages/materials/EChart/Progress/index.ts
diff --git a/packages/materials/EChart/RingProgress/index.ts b/packages/materials/EChart/RingProgress/index.ts
diff --git a/packages/materials/EChart/TinyColumn/index.ts b/packages/materials/EChart/TinyColumn/index.ts
diff --git a/packages/materials/EChart/TinyLine/index.ts b/packages/materials/EChart/TinyLine/index.ts
diff --git a/packages/materials/FeedBack/Drawer/index.ts b/packages/materials/FeedBack/Drawer/index.ts
diff --git a/packages/materials/FeedBack/Empty/index.ts b/packages/materials/FeedBack/Empty/index.ts
diff --git a/packages/materials/FeedBack/Modal/index.ts b/packages/materials/FeedBack/Modal/index.ts
diff --git a/packages/materials/FeedBack/Result/index.ts b/packages/materials/FeedBack/Result/index.ts
diff --git a/packages/materials/FormItems/Cascader/index.ts b/packages/materials/FormItems/Cascader/index.ts
diff --git a/packages/materials/FormItems/CheckBox/index.tsx b/packages/materials/FormItems/CheckBox/index.tsx
diff --git a/packages/materials/FormItems/DatePicker/index.ts b/packages/materials/FormItems/DatePicker/index.ts
diff --git a/packages/materials/FormItems/DatePickerRange/index.ts b/packages/materials/FormItems/DatePickerRange/index.ts
diff --git a/packages/materials/FormItems/EditTable/index.tsx b/packages/materials/FormItems/EditTable/index.tsx
diff --git a/packages/materials/FormItems/FormItem/index.ts b/packages/materials/FormItems/FormItem/index.ts
diff --git a/packages/materials/FormItems/FormList/index.ts b/packages/materials/FormItems/FormList/index.ts
diff --git a/packages/materials/FormItems/Input/index.ts b/packages/materials/FormItems/Input/index.ts
diff --git a/packages/materials/FormItems/InputNumber/index.ts b/packages/materials/FormItems/InputNumber/index.ts
diff --git a/packages/materials/FormItems/InputOTP/index.ts b/packages/materials/FormItems/InputOTP/index.ts
diff --git a/packages/materials/FormItems/InputPassword/index.ts b/packages/materials/FormItems/InputPassword/index.ts
diff --git a/packages/materials/FormItems/Radio/index.tsx b/packages/materials/FormItems/Radio/index.tsx
diff --git a/packages/materials/FormItems/RichText/index.ts b/packages/materials/FormItems/RichText/index.ts
diff --git a/packages/materials/FormItems/Segmented/index.ts b/packages/materials/FormItems/Segmented/index.ts
diff --git a/packages/materials/FormItems/Select/index.ts b/packages/materials/FormItems/Select/index.ts
diff --git a/packages/materials/FormItems/Slider/index.ts b/packages/materials/FormItems/Slider/index.ts
diff --git a/packages/materials/FormItems/StaticItem/index.ts b/packages/materials/FormItems/StaticItem/index.ts
diff --git a/packages/materials/FormItems/Switch/index.ts b/packages/materials/FormItems/Switch/index.ts
diff --git a/packages/materials/FormItems/TextArea/index.ts b/packages/materials/FormItems/TextArea/index.ts
diff --git a/packages/materials/FormItems/TimePicker/index.ts b/packages/materials/FormItems/TimePicker/index.ts
diff --git a/packages/materials/FormItems/TimePickerRange/index.ts b/packages/materials/FormItems/TimePickerRange/index.ts
diff --git a/packages/materials/FormItems/TreeSelect/index.ts b/packages/materials/FormItems/TreeSelect/index.ts
diff --git a/packages/materials/FormItems/Upload/index.ts b/packages/materials/FormItems/Upload/index.ts
diff --git a/packages/materials/Functional/Button/index.ts b/packages/materials/Functional/Button/index.ts
diff --git a/packages/materials/Functional/Descriptions/index.ts b/packages/materials/Functional/Descriptions/index.ts
diff --git a/packages/materials/Functional/FileUpload/index.ts b/packages/materials/Functional/FileUpload/index.ts
diff --git a/packages/materials/Functional/List/index.ts b/packages/materials/Functional/List/index.ts
diff --git a/packages/materials/Functional/Steps/index.ts b/packages/materials/Functional/Steps/index.ts
diff --git a/packages/materials/Functional/Tab/index.ts b/packages/materials/Functional/Tab/index.ts
diff --git a/packages/materials/Functional/Tabs/index.ts b/packages/materials/Functional/Tabs/index.ts
diff --git a/packages/materials/IFrame/index.ts b/packages/materials/IFrame/index.ts
diff --git a/packages/materials/Layout/Col/index.ts b/packages/materials/Layout/Col/index.ts
diff --git a/packages/materials/Layout/Divider/index.ts b/packages/materials/Layout/Divider/index.ts
diff --git a/packages/materials/Layout/Row/index.ts b/packages/materials/Layout/Row/index.ts
diff --git a/packages/materials/Layout/Space/index.ts b/packages/materials/Layout/Space/index.ts
diff --git a/packages/materials/Map/BMap/index.ts b/packages/materials/Map/BMap/index.ts
diff --git a/packages/materials/MarsRender/MarsRender.tsx b/packages/materials/MarsRender/MarsRender.tsx
@@ -64,22 +64,7 @@ export const Material = memo(({ item }: { item: ComItemType }) => {
         return Comp;
       });
     } else if (Components[item.type as keyof typeof Components]) {
-      const Comp = lazy(() => {
-        let res = Components[item.type as keyof typeof Components]().then((mod: any) => {
-          if (mod[item.type]) {
-            cachedComponents[item.type] = mod[item.type];
-            return Promise.resolve({
-              default: mod[item.type],
-              get [Symbol.toStringTag]() {
-                return 'Module';
-              },
-            });
-          } else {
-            return Promise.reject();
-          }
-        });
-        return res;
-      });
+      const Comp = lazy(Components[item.type as keyof typeof Components]);
       setComponent(Comp);
     }
     setConfig(elementsMap[item.id].config);
@@ -181,7 +166,7 @@ export const Material = memo(({ item }: { item: ComItemType }) => {
       );
     } else {
       return (
-        <Suspense fallback={<div>加载中</div>}>
+        <Suspense fallback={<antd.Spin size="default"></antd.Spin>}>
           <Component
             className={['mars-component']} // 暂时还没用，日后可能会用
             id={item.id}

diff --git a/packages/materials/Map/BMap/BMap.tsx → packages/materials/Other/BMap/BMap.tsx b/packages/materials/Map/BMap/BMap.tsx → packages/materials/Other/BMap/BMap.tsx
diff --git a/packages/materials/IFrame/IFrame.tsx → packages/materials/Other/IFrame/IFrame.tsx b/packages/materials/IFrame/IFrame.tsx → packages/materials/Other/IFrame/IFrame.tsx
diff --git a/packages/materials/Page/index.ts b/packages/materials/Page/index.ts
diff --git a/packages/materials/Scene/GridForm/index.ts b/packages/materials/Scene/GridForm/index.ts
diff --git a/packages/materials/Scene/MarsTable/index.tsx b/packages/materials/Scene/MarsTable/index.tsx
diff --git a/packages/materials/Scene/SearchForm/index.ts b/packages/materials/Scene/SearchForm/index.ts
diff --git a/packages/materials/index.tsx b/packages/materials/index.tsx
@@ -1,16 +1,16 @@
-const modules1 = import.meta.glob('./[A-Z][a-zA-Z]+/index.ts(x)?');
-const modules2 = import.meta.glob('./[A-Z][a-zA-Z]+/*/index.ts(x)?');
-const exportModule: any = {};
-const modules = {
-  ...modules1,
-  ...modules2,
-};
+const componentMap: { [key: string]: any } = {};
+
+/**
+ * 按需加载组件
+ */
+const modules: { [key: string]: () => Promise<any> } = import.meta.glob('./[a-zA-Z]+/**');
 
-let regex = /\/([a-z]+)\/index/i;
 for (const path in modules) {
-  const componentName = path.match(regex);
-  if (componentName?.[1]) {
-    exportModule[componentName[1]] = modules[path];
+  const [type, name] = path.split('/').slice(-2);
+  if (type === 'MarsRender') continue;
+  if (type === name.split('.')?.[0]) {
+    componentMap[type] = modules[path];
   }
 }
-export const module = exportModule;
+
+export const module = componentMap;