Skip to content

Commit b4ee8b7

Browse files
AruSeitoAruSeito
committed
Merge branch 'beta' into release/4.3.0
2 parents 9de8c7c + 210150a commit b4ee8b7

File tree

71 files changed

+1123
-929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1123
-929
lines changed

‎README-CN.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@ ILLA CLI 使您能够以超乎想象的速度部署 ILLA Builder。 [单击此
8787

8888
加入 ILLA 社区，分享您的想法、建议或问题，并与其他用户和贡献者交流。
8989

90+
加入微信群：
91+
92+
![screenshot-20240118-154219](https://github.com/illacloud/illa-builder/assets/112603073/f5b42507-201f-421c-b2b4-edf022479757)
93+
94+
9095
Discord与Github社区入口
9196

9297
[![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://discord.gg/illacloud) [![Discuss on GitHub](https://img.shields.io/badge/discussions-GitHub-333333?logo=github)](https://github.com/orgs/illacloud/discussions)

‎apps/builder/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"author": "ILLA Cloud <[email protected]>",
77
"license": "Apache-2.0",
8-
"version": "4.2.4",
8+
"version": "4.3.0",
99
"scripts": {
1010
"dev": "vite --strictPort --force",
1111
"build-cloud": "NODE_OPTIONS=--max-old-space-size=12288 vite build --mode cloud",
@@ -50,11 +50,13 @@
5050
"@illa-public/cropper": "workspace:*",
5151
"@illa-public/dynamic-string": "workspace:^",
5252
"@illa-public/icon": "workspace:*",
53+
"@illa-public/icon-hot-spot": "workspace:^",
5354
"@illa-public/illa-net": "workspace:*",
5455
"@illa-public/illa-storage": "workspace:*",
5556
"@illa-public/invite-modal": "workspace:*",
5657
"@illa-public/layout-auto-change": "workspace:*",
5758
"@illa-public/market-agent": "workspace:*",
59+
"@illa-public/missing-resource-module": "workspace:^",
5860
"@illa-public/mixpanel-utils": "workspace:*",
5961
"@illa-public/public-configs": "workspace:*",
6062
"@illa-public/public-types": "workspace:*",

‎apps/builder/src/App.tsx

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import createCache from "@emotion/cache"
2-
import { CacheProvider, Global } from "@emotion/react"
1+
import { Global } from "@emotion/react"
32
import {
43
ILLA_MIXPANEL_EVENT_TYPE,
54
ILLA_MIXPANEL_PUBLIC_PAGE_NAME,
65
} from "@illa-public/mixpanel-utils"
7-
import { px2Rem } from "@illa-public/styleis-plugin"
86
import { UpgradeModalGroup } from "@illa-public/upgrade-modal"
97
import { getCurrentTranslateLanguage } from "@illa-public/user-data"
108
import { useEffect, useMemo } from "react"
@@ -67,35 +65,23 @@ function App() {
6765
)
6866
}, [])
6967

70-
let cache = createCache({
71-
key: "css",
72-
stylisPlugins: [
73-
px2Rem({
74-
unit: "rem",
75-
remSize: 100,
76-
}),
77-
],
78-
})
79-
8068
return (
81-
<CacheProvider value={cache}>
82-
<HelmetProvider>
83-
<DndProvider backend={TouchBackend} options={dragOptions}>
84-
<ConfigProvider locale={configLanguage}>
85-
<Global styles={globalStyle} />
86-
<MessageGroup pt={!isProductMode ? "46px" : "0"} />
87-
<UpgradeModalGroup />
88-
<NotificationGroup pt={!isProductMode ? "46px" : "0"} />
89-
<ModalGroup />
90-
<RouterProvider router={ILLARoute} />
91-
<div
92-
className="illaCodeMirrorWrapper"
93-
css={illaCodeMirrorTooltipStyle}
94-
/>
95-
</ConfigProvider>
96-
</DndProvider>
97-
</HelmetProvider>
98-
</CacheProvider>
69+
<HelmetProvider>
70+
<DndProvider backend={TouchBackend} options={dragOptions}>
71+
<ConfigProvider locale={configLanguage}>
72+
<Global styles={globalStyle} />
73+
<MessageGroup pt={!isProductMode ? "46px" : "0"} />
74+
<UpgradeModalGroup />
75+
<NotificationGroup pt={!isProductMode ? "46px" : "0"} />
76+
<ModalGroup />
77+
<RouterProvider router={ILLARoute} />
78+
<div
79+
className="illaCodeMirrorWrapper"
80+
css={illaCodeMirrorTooltipStyle}
81+
/>
82+
</ConfigProvider>
83+
</DndProvider>
84+
</HelmetProvider>
9985
)
10086
}
10187

‎apps/builder/src/components/IconHotSpot/index.tsx

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎apps/builder/src/components/IconHotSpot/interface.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎apps/builder/src/components/IconHotSpot/style.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎apps/builder/src/components/Modal/Header/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import IconHotSpot from "@illa-public/icon-hot-spot"
12
import { FC } from "react"
23
import { Link } from "react-router-dom"
34
import {
@@ -6,7 +7,6 @@ import {
67
DragPointIcon,
78
getColor,
89
} from "@illa-design/react"
9-
import IconHotSpot from "@/components/IconHotSpot"
1010
import { HeaderProps } from "@/components/Modal/Header/interface"
1111
import {
1212
dragIconStyle,

‎apps/builder/src/main.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ILLAMixpanel } from "@illa-public/mixpanel-utils"
2-
import { initDateReport, initDayjs } from "@illa-public/utils"
2+
import { initDateReport, initDayjs, isCloudVersion } from "@illa-public/utils"
3+
import { LicenseInfo } from "@mui/x-data-grid-premium"
34
import * as Sentry from "@sentry/react"
45
import { StrictMode } from "react"
56
import { createRoot } from "react-dom/client"
@@ -24,6 +25,10 @@ if (
2425
})
2526
}
2627

28+
if (isCloudVersion) {
29+
LicenseInfo.setLicenseKey(import.meta.env.ILLA_MUI_LICENSE)
30+
}
31+
2732
initDateReport()
2833
ILLAMixpanel.setDeviceID()
2934
initDayjs()

‎apps/builder/src/middleware/reduxAsync/sendMessage/actionMethod.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,5 +84,33 @@ export const actionsAsync = (
8484
)
8585
break
8686
}
87+
case "batchUpdateResourceID": {
88+
Connection.getTextRoom("app", currentAppID)?.send(
89+
getTextMessagePayload(
90+
TextSignal.BROADCAST_ONLY,
91+
TextTarget.ACTION,
92+
true,
93+
action,
94+
teamID,
95+
uid,
96+
[payload],
97+
),
98+
)
99+
break
100+
}
101+
case "batchUpdateActionItemReducer": {
102+
Connection.getTextRoom("app", currentAppID)?.send(
103+
getTextMessagePayload(
104+
TextSignal.BROADCAST_ONLY,
105+
TextTarget.ACTION,
106+
true,
107+
action,
108+
teamID,
109+
uid,
110+
[payload],
111+
),
112+
)
113+
break
114+
}
87115
}
88116
}

‎apps/builder/src/page/App/Module/DataWorkspace/components/BaseDataItem/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { getIconFromWidgetType } from "@illa-public/icon"
2+
import IconHotSpot from "@illa-public/icon-hot-spot"
23
import { getDocLink } from "@illa-public/public-configs"
34
import { AnimatePresence, motion } from "framer-motion"
45
import { FC, useState } from "react"
56
import { useDispatch, useSelector } from "react-redux"
67
import { CaretRightIcon } from "@illa-design/react"
78
import StateIcon from "@/assets/dataWorkspace/state.svg?react"
8-
import IconHotSpot from "@/components/IconHotSpot"
99
import { MovableModal } from "@/components/Modal/movableModal"
1010
import { panelBarItemContainerAnimationVariants } from "@/components/PanelBar/style"
1111
import { ViewItemShape } from "@/page/App/components/InspectPanel/PanelSetters/TabsSetter/TabListSetter/interface"

0 commit comments

Comments
 (0)