Skip to content

Commit 2286a21

Browse files
author
FalkWolsky
committed
Add Icon Comp - Fixes
1 parent 59cc38e commit 2286a21

File tree

6 files changed

+70
-107
lines changed

6 files changed

+70
-107
lines changed

‎client/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
"chalk": "4",
7878
"number-precision": "^1.6.0",
7979
"react-player": "^2.11.0",
80+
"remixicon-react": "^1.0.0",
8081
"tui-image-editor": "^3.15.3"
8182
}
8283
}

‎client/packages/lowcoder-design/src/components/iconSelect/index.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
22
import type { IconDefinition } from "@fortawesome/free-regular-svg-icons";
3+
import type { IconDefinition as IconDefinitionBrands } from "@fortawesome/free-brands-svg-icons";
34
import { Popover } from "antd";
45
import { ActionType } from "@rc-component/trigger/lib/interface";
56
import { TacoInput } from "components/tacoInput";
@@ -147,6 +148,7 @@ async function getAllIcons() {
147148
const [{ far }, { fas }] = await Promise.all([
148149
import("@fortawesome/free-regular-svg-icons"),
149150
import("@fortawesome/free-solid-svg-icons"),
151+
// import("@fontawesome/free-brands-svg-icons"),
150152
]);
151153
const ret: Record<string, Icon> = {};
152154
for (const [type, pack] of Object.entries({ solid: fas, regular: far })) {

‎client/packages/lowcoder-design/src/icons/index.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -278,28 +278,7 @@ export { ReactComponent as SignatureIcon } from "./icon-signature.svg";
278278
export { ReactComponent as ManualIcon } from "./icon-manual.svg";
279279
export { ReactComponent as WarnIcon } from "./icon-warn.svg";
280280
export { ReactComponent as SyncManualIcon } from "./icon-sync-manual.svg";
281-
282-
export { ReactComponent as DangerIcon } from "icons/icon-danger.svg";
283-
export { ReactComponent as TableMinusIcon } from "icons/icon-table-minus.svg";
284-
export { ReactComponent as TablePlusIcon } from "icons/icon-table-plus.svg";
285-
export { ReactComponent as MobileAppIcon } from "icons/icon-mobile-app.svg";
286-
export { ReactComponent as MobileNavIcon } from "icons/icon-navigation-mobile.svg";
287-
export { ReactComponent as PcNavIcon } from "icons/icon-navigation-pc.svg";
288-
export { ReactComponent as UnLockIcon } from "icons/icon-unlock.svg";
289-
export { ReactComponent as CalendarDeleteIcon } from "icons/icon-calendar-delete.svg";
290-
export { ReactComponent as TableCheckedIcon } from "icons/icon-table-checked.svg";
291-
export { ReactComponent as TableUnCheckedIcon } from "icons/icon-table-boolean-false.svg";
292-
export { ReactComponent as FileFolderIcon } from "icons/icon-editor-folder.svg";
293-
export { ReactComponent as ExpandIcon } from "icons/icon-expand.svg";
294-
export { ReactComponent as CompressIcon } from "icons/icon-compress.svg";
295-
export { ReactComponent as TableCellsIcon } from "icons/icon-table-cells.svg"; // Added By Aqib Mirza
296-
export { ReactComponent as TimeLineIcon } from "icons/icon-timeline-comp.svg"
297-
export { ReactComponent as LottieIcon } from "icons/icon-lottie.svg";
298-
export { ReactComponent as MentionIcon } from "icons/icon-mention-comp.svg";
299-
export { ReactComponent as AutoCompleteCompIcon } from "icons/icon-autocomplete-comp.svg";
300-
301281
export { ReactComponent as IconCompIcon } from "icons/IconCompIcon.svg";
302-
303282
export { ReactComponent as DangerIcon } from "./icon-danger.svg";
304283
export { ReactComponent as TableMinusIcon } from "./icon-table-minus.svg";
305284
export { ReactComponent as TablePlusIcon } from "./icon-table-plus.svg";

‎client/packages/lowcoder/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"main": "src/index.sdk.ts",
77
"types": "src/index.sdk.ts",
88
"dependencies": {
9-
"@ant-design/icons": "^4.7.0",
9+
"@ant-design/icons": "^5.3.0",
1010
"@codemirror/autocomplete": "^6.11.1",
1111
"@codemirror/commands": "^6.3.2",
1212
"@codemirror/lang-css": "^6.2.1",
@@ -19,9 +19,10 @@
1919
"@dnd-kit/modifiers": "^5.0.0",
2020
"@dnd-kit/sortable": "^6.0.0",
2121
"@dnd-kit/utilities": "^3.1.0",
22-
"@fortawesome/fontawesome-svg-core": "^6.4.0",
23-
"@fortawesome/free-regular-svg-icons": "^6.4.0",
24-
"@fortawesome/free-solid-svg-icons": "^6.4.0",
22+
"@fortawesome/fontawesome-svg-core": "^6.5.1",
23+
"@fortawesome/free-brands-svg-icons": "^6.5.1",
24+
"@fortawesome/free-regular-svg-icons": "^6.5.1",
25+
"@fortawesome/free-solid-svg-icons": "^6.5.1",
2526
"@fortawesome/react-fontawesome": "latest",
2627
"@manaflair/redux-batch": "^1.0.0",
2728
"@rjsf/antd": "^5.15.1",

‎client/packages/lowcoder/src/comps/index.tsx‎

Lines changed: 15 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import { VideoMeetingStreamComp } from "./comps/meetingComp/videoMeetingStreamCo
6767
import { ControlButton } from "./comps/meetingComp/controlButton";
6868
import { VideoMeetingControllerComp } from "./comps/meetingComp/videoMeetingControllerComp";
6969
import { VideoSharingStreamComp } from "./comps/meetingComp/videoSharingStreamComp";
70+
import { IconComp } from "./comps/iconComp";
7071

7172
import {
7273
AudioCompIcon,
@@ -130,43 +131,9 @@ import {
130131
CommentIcon,
131132
MentionIcon,
132133
AutoCompleteCompIcon,
133-
134-
IconCompIcon,
135-
} from "lowcoder-design";
136-
// from Mousheng
137-
import { defaultFormData, FormComp } from "./comps/formComp/formComp";
138-
import { IFrameComp } from "./comps/iframeComp";
139-
import { defaultGridData, defaultListViewData, GridComp, ListViewComp } from "./comps/listViewComp";
140-
import { ModuleComp } from "./comps/moduleComp/moduleComp";
141-
import { NavComp } from "./comps/navComp/navComp";
142-
import { TableComp } from "./comps/tableComp";
143-
import { registerComp, UICompManifest, UICompType } from "./uiCompRegistry";
144-
import { QRCodeComp } from "./comps/qrCodeComp";
145-
import { JsonExplorerComp } from "./comps/jsonComp/jsonExplorerComp";
146-
import { JsonEditorComp } from "./comps/jsonComp/jsonEditorComp";
147-
import { TreeComp } from "./comps/treeComp/treeComp";
148-
import { TreeSelectComp } from "./comps/treeComp/treeSelectComp";
149-
import { trans } from "i18n";
150-
import { remoteComp } from "./comps/remoteComp/remoteComp";
151-
import { AudioComp } from "./comps/mediaComp/audioComp";
152-
import { VideoComp } from "./comps/mediaComp/videoComp";
153-
import { DrawerComp } from "./hooks/drawerComp";
154-
import { CarouselComp } from "./comps/carouselComp";
155-
import { ToggleButtonComp } from "./comps/buttonComp/toggleButtonComp";
156-
import { defaultCollapsibleContainerData } from "./comps/containerComp/collapsibleContainerComp";
157-
import { RemoteCompInfo } from "types/remoteComp";
158-
import { ScannerComp } from "./comps/buttonComp/scannerComp";
159-
import { SignatureComp } from "./comps/signatureComp";
160-
import { TimeLineComp } from "./comps/timelineComp/timelineComp";
161-
import { MentionComp } from "./comps/textInputComp/mentionComp";
162-
import { AutoCompleteComp } from "./comps/autoCompleteComp/autoCompleteComp"
163-
import { IconComp } from "./comps/iconComp";
164-
// from Mousheng
165-
166-
//Added by Aqib Mirza
167-
import { JsonLottieComp } from "./comps/jsonComp/jsonLottieComp";
168134
ResponsiveLayoutCompIcon,
169135
MermaidIcon,
136+
IconCompIcon,
170137
} from "lowcoder-design";
171138

172139
type Registry = {
@@ -950,6 +917,19 @@ var uiCompMap: Registry = {
950917
h: 40,
951918
},
952919
},
920+
icon: {
921+
name: trans("uiComp.iconCompName"),
922+
enName: "icon",
923+
description: trans("uiComp.iconCompDesc"),
924+
categories: ["multimedia"],
925+
icon: IconCompIcon,
926+
keywords: trans("uiComp.iconCompKeywords"),
927+
comp: IconComp,
928+
layoutInfo: {
929+
w: 2,
930+
h: 10,
931+
},
932+
},
953933
imageEditor: {
954934
name: trans("uiComp.imageEditorCompName"),
955935
enName: "Image Editor",
@@ -1058,23 +1038,6 @@ var uiCompMap: Registry = {
10581038
},
10591039
},
10601040

1061-
// from Mousheng
1062-
icon: {
1063-
name: trans("uiComp.iconCompName"),
1064-
enName: "icon",
1065-
description: trans("uiComp.iconCompDesc"),
1066-
categories: ["dataDisplay"],
1067-
icon: IconCompIcon,
1068-
keywords: trans("uiComp.iconCompKeywords"),
1069-
comp: IconComp,
1070-
layoutInfo: {
1071-
w: 2,
1072-
h: 10,
1073-
},
1074-
},
1075-
1076-
// from Mousheng
1077-
10781041
// Integration
10791042

10801043
iframe: {

‎client/yarn.lock‎

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ __metadata:
6363
languageName: node
6464
linkType: hard
6565

66-
"@ant-design/colors@npm:^6.0.0":
67-
version: 6.0.0
68-
resolution: "@ant-design/colors@npm:6.0.0"
69-
dependencies:
70-
"@ctrl/tinycolor": ^3.4.0
71-
checksum: 55110ac8a3353f3ec2d2fdee6ffb841967dd75f3783ef4e68c22731e042606bc5b3c3febb6cd20aed3f14585729ce8eddf75b531c703c06a2e95b8569861bb47
72-
languageName: node
73-
linkType: hard
74-
7566
"@ant-design/colors@npm:^7.0.0, @ant-design/colors@npm:^7.0.2":
7667
version: 7.0.2
7768
resolution: "@ant-design/colors@npm:7.0.2"
@@ -106,36 +97,42 @@ __metadata:
10697
languageName: node
10798
linkType: hard
10899

109-
"@ant-design/icons@npm:^4.7.0":
110-
version: 4.8.1
111-
resolution: "@ant-design/icons@npm:4.8.1"
100+
"@ant-design/icons-svg@npm:^4.4.0":
101+
version: 4.4.2
102+
resolution: "@ant-design/icons-svg@npm:4.4.2"
103+
checksum: c66cda4533ec2f86162a9adda04be2aba5674d5c758ba886bd9d8de89dc45473ef3124eb755b4cfbd09121d3bdc34e075ee931e47dd0f8a7fdc01be0cb3d6c40
104+
languageName: node
105+
linkType: hard
106+
107+
"@ant-design/icons@npm:^5.2.6":
108+
version: 5.2.6
109+
resolution: "@ant-design/icons@npm:5.2.6"
112110
dependencies:
113-
"@ant-design/colors": ^6.0.0
111+
"@ant-design/colors": ^7.0.0
114112
"@ant-design/icons-svg": ^4.3.0
115113
"@babel/runtime": ^7.11.2
116114
classnames: ^2.2.6
117-
lodash: ^4.17.15
118-
rc-util: ^5.9.4
115+
rc-util: ^5.31.1
119116
peerDependencies:
120117
react: ">=16.0.0"
121118
react-dom: ">=16.0.0"
122-
checksum: abd3603ea951983a8bfa7f4c7e6fcc787ccdc4804faa8bb8641b6904a95cf5fc04753cf636a6c5b5b798f371f4075fddae29684779bb16e2a025b727ab2c8ad3
119+
checksum: 2f571699b1903383cd09faa78e4cce34973debb0e7ec6223b9d9a0a6ab2b2f0c876072db62bbd4e6a45e864df5447343315e066abeffaf58aa5b97df3acc89f1
123120
languageName: node
124121
linkType: hard
125122

126-
"@ant-design/icons@npm:^5.2.6":
127-
version: 5.2.6
128-
resolution: "@ant-design/icons@npm:5.2.6"
123+
"@ant-design/icons@npm:^5.3.0":
124+
version: 5.3.0
125+
resolution: "@ant-design/icons@npm:5.3.0"
129126
dependencies:
130127
"@ant-design/colors": ^7.0.0
131-
"@ant-design/icons-svg": ^4.3.0
128+
"@ant-design/icons-svg": ^4.4.0
132129
"@babel/runtime": ^7.11.2
133130
classnames: ^2.2.6
134131
rc-util: ^5.31.1
135132
peerDependencies:
136133
react: ">=16.0.0"
137134
react-dom: ">=16.0.0"
138-
checksum: 2f571699b1903383cd09faa78e4cce34973debb0e7ec6223b9d9a0a6ab2b2f0c876072db62bbd4e6a45e864df5447343315e066abeffaf58aa5b97df3acc89f1
135+
checksum: 6b58bb057f0c92b5d1fc5bd062119e070ac0ef86979c011dbae657b54e51bdfc4efd1d7f52cd3e0e05a8f82c81847f86bb4bb7f797154b5fcfc750f4758b4a45
139136
languageName: node
140137
linkType: hard
141138

@@ -1946,7 +1943,7 @@ __metadata:
19461943
languageName: node
19471944
linkType: hard
19481945

1949-
"@ctrl/tinycolor@npm:^3.4.0, @ctrl/tinycolor@npm:^3.6.1":
1946+
"@ctrl/tinycolor@npm:^3.6.1":
19501947
version: 3.6.1
19511948
resolution: "@ctrl/tinycolor@npm:3.6.1"
19521949
checksum: cefec6fcaaa3eb8ddf193f981e097dccf63b97b93b1e861cb18c645654824c831a568f444996e15ee509f255658ed82fba11c5365494a6e25b9b12ac454099e0
@@ -2336,7 +2333,7 @@ __metadata:
23362333
languageName: node
23372334
linkType: hard
23382335

2339-
"@fortawesome/fontawesome-svg-core@npm:^6.4.0":
2336+
"@fortawesome/fontawesome-svg-core@npm:^6.5.1":
23402337
version: 6.5.1
23412338
resolution: "@fortawesome/fontawesome-svg-core@npm:6.5.1"
23422339
dependencies:
@@ -2345,7 +2342,16 @@ __metadata:
23452342
languageName: node
23462343
linkType: hard
23472344

2348-
"@fortawesome/free-regular-svg-icons@npm:^6.4.0":
2345+
"@fortawesome/free-brands-svg-icons@npm:^6.5.1":
2346+
version: 6.5.1
2347+
resolution: "@fortawesome/free-brands-svg-icons@npm:6.5.1"
2348+
dependencies:
2349+
"@fortawesome/fontawesome-common-types": 6.5.1
2350+
checksum: c29f8a9ad9886c0733d3616b5ea05b08b4943c1b5231c73f31a07e7df36c337e5a51cfe7cc610e623cb2b4a0607e3f82a8a3f46107c4347aa653784489672314
2351+
languageName: node
2352+
linkType: hard
2353+
2354+
"@fortawesome/free-regular-svg-icons@npm:^6.5.1":
23492355
version: 6.5.1
23502356
resolution: "@fortawesome/free-regular-svg-icons@npm:6.5.1"
23512357
dependencies:
@@ -2354,7 +2360,7 @@ __metadata:
23542360
languageName: node
23552361
linkType: hard
23562362

2357-
"@fortawesome/free-solid-svg-icons@npm:^6.4.0":
2363+
"@fortawesome/free-solid-svg-icons@npm:^6.5.1":
23582364
version: 6.5.1
23592365
resolution: "@fortawesome/free-solid-svg-icons@npm:6.5.1"
23602366
dependencies:
@@ -11622,6 +11628,7 @@ __metadata:
1162211628
number-precision: ^1.6.0
1162311629
prettier: ^3.1.0
1162411630
react-player: ^2.11.0
11631+
remixicon-react: ^1.0.0
1162511632
rimraf: ^3.0.2
1162611633
rollup: ^2.79.0
1162711634
shelljs: ^0.8.5
@@ -11665,7 +11672,7 @@ __metadata:
1166511672
version: 0.0.0-use.local
1166611673
resolution: "lowcoder@workspace:packages/lowcoder"
1166711674
dependencies:
11668-
"@ant-design/icons": ^4.7.0
11675+
"@ant-design/icons": ^5.3.0
1166911676
"@codemirror/autocomplete": ^6.11.1
1167011677
"@codemirror/commands": ^6.3.2
1167111678
"@codemirror/lang-css": ^6.2.1
@@ -11678,9 +11685,10 @@ __metadata:
1167811685
"@dnd-kit/modifiers": ^5.0.0
1167911686
"@dnd-kit/sortable": ^6.0.0
1168011687
"@dnd-kit/utilities": ^3.1.0
11681-
"@fortawesome/fontawesome-svg-core": ^6.4.0
11682-
"@fortawesome/free-regular-svg-icons": ^6.4.0
11683-
"@fortawesome/free-solid-svg-icons": ^6.4.0
11688+
"@fortawesome/fontawesome-svg-core": ^6.5.1
11689+
"@fortawesome/free-brands-svg-icons": ^6.5.1
11690+
"@fortawesome/free-regular-svg-icons": ^6.5.1
11691+
"@fortawesome/free-solid-svg-icons": ^6.5.1
1168411692
"@fortawesome/react-fontawesome": latest
1168511693
"@manaflair/redux-batch": ^1.0.0
1168611694
"@rjsf/antd": ^5.15.1
@@ -14398,7 +14406,7 @@ __metadata:
1439814406
languageName: node
1439914407
linkType: hard
1440014408

14401-
"rc-util@npm:^5.0.1, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.28.0, rc-util@npm:^5.30.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1, rc-util@npm:^5.8.0, rc-util@npm:^5.9.4":
14409+
"rc-util@npm:^5.0.1, rc-util@npm:^5.16.1, rc-util@npm:^5.17.0, rc-util@npm:^5.18.1, rc-util@npm:^5.19.2, rc-util@npm:^5.2.0, rc-util@npm:^5.20.1, rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.25.2, rc-util@npm:^5.26.0, rc-util@npm:^5.27.0, rc-util@npm:^5.28.0, rc-util@npm:^5.30.0, rc-util@npm:^5.31.1, rc-util@npm:^5.32.2, rc-util@npm:^5.34.1, rc-util@npm:^5.35.0, rc-util@npm:^5.36.0, rc-util@npm:^5.37.0, rc-util@npm:^5.38.0, rc-util@npm:^5.38.1, rc-util@npm:^5.8.0":
1440214410
version: 5.38.1
1440314411
resolution: "rc-util@npm:5.38.1"
1440414412
dependencies:
@@ -15225,6 +15233,15 @@ __metadata:
1522515233
languageName: node
1522615234
linkType: hard
1522715235

15236+
"remixicon-react@npm:^1.0.0":
15237+
version: 1.0.0
15238+
resolution: "remixicon-react@npm:1.0.0"
15239+
peerDependencies:
15240+
react: ">=0.14.0"
15241+
checksum: be7abfb3558c9ed18ccfff5a28bd66dbee4207887682ae7a00c697e6051eadecad0da83f1e83910ed6ddebe7f2ab73e488f0f4c604897605bbb3d8f519f416ed
15242+
languageName: node
15243+
linkType: hard
15244+
1522815245
"request-promise-core@npm:1.1.4":
1522915246
version: 1.1.4
1523015247
resolution: "request-promise-core@npm:1.1.4"

0 commit comments

Comments
 (0)