Merge branch 'remix-icons' into Icons-Expansion

lowcoder-org · FalkWolsky · Feb 22, 2024 · Aug 4, 2023 · Aug 9, 2023 · Aug 9, 2023
commit 98d5c05b0caeed39af5f497d384ca637dcd4883c
diff --git a/client/packages/lowcoder-design/src/icons/index.ts b/client/packages/lowcoder-design/src/icons/index.ts
diff --git a/client/packages/lowcoder/src/comps/index.tsx b/client/packages/lowcoder/src/comps/index.tsx
@@ -130,9 +130,10 @@ import {
   CommentIcon,
   MentionIcon,
   AutoCompleteCompIcon,
+
   IconCompIcon,
 } from "lowcoder-design";
-
+// from Mousheng
 import { defaultFormData, FormComp } from "./comps/formComp/formComp";
 import { IFrameComp } from "./comps/iframeComp";
 import { defaultGridData, defaultListViewData, GridComp, ListViewComp } from "./comps/listViewComp";
@@ -160,9 +161,13 @@ import { TimeLineComp } from "./comps/timelineComp/timelineComp";
 import { MentionComp } from "./comps/textInputComp/mentionComp";
 import { AutoCompleteComp } from "./comps/autoCompleteComp/autoCompleteComp"
 import { IconComp } from "./comps/iconComp";
+// from Mousheng
 
 //Added by Aqib Mirza
 import { JsonLottieComp } from "./comps/jsonComp/jsonLottieComp";
+  ResponsiveLayoutCompIcon,
+  MermaidIcon,
+} from "lowcoder-design";
 
 type Registry = {
   [key in UICompType]?: UICompManifest;
@@ -1053,6 +1058,23 @@ var uiCompMap: Registry = {
     },
   },
 
+// from Mousheng
+  icon: {
+    name: trans("uiComp.iconCompName"),
+    enName: "icon",
+    description: trans("uiComp.iconCompDesc"),
+    categories: ["dataDisplay"],
+    icon: IconCompIcon,
+    keywords: trans("uiComp.iconCompKeywords"),
+    comp: IconComp,
+    layoutInfo: {
+      w: 2,
+      h: 10,
+    },
+  },
+
+// from Mousheng
+
   // Integration
 
   iframe: {
@@ -1110,19 +1132,7 @@ var uiCompMap: Registry = {
       h: 24,
     },
   },
-  icon: {
-    name: trans("uiComp.iconCompName"),
-    enName: "icon",
-    description: trans("uiComp.iconCompDesc"),
-    categories: ["dataDisplay"],
-    icon: IconCompIcon,
-    keywords: trans("uiComp.iconCompKeywords"),
-    comp: IconComp,
-    layoutInfo: {
-      w: 2,
-      h: 10,
-    },
-  },
+
 };
 
 export function loadComps() {

diff --git a/client/packages/lowcoder/src/comps/uiCompRegistry.ts b/client/packages/lowcoder/src/comps/uiCompRegistry.ts
@@ -119,10 +119,13 @@ export type UICompType =
   | "calendar"
   | "signature"
   | "jsonLottie" //Added By Aqib Mirza
-  | "timeline"
-  | "mention"
-  | "autocomplete"
-  | "icon"
+  | "icon" //Added By Mousheng
+  | "timeline" //Added By Mousheng
+  | "comment" //Added By Mousheng
+  | "mention" //Added By Mousheng
+  | "autocomplete" //Added By Mousheng
+  | "responsiveLayout";
+
 
 export const uiCompRegistry = {} as Record<UICompType | string, UICompManifest>;