Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10cf573

Browse files
author
dragonpoo
authored
Merge branch 'dev' into fix/myorg
2 parents5015a71 +3d063e2 commit10cf573

File tree

44 files changed

+568
-321
lines changed

Some content is hidden

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

44 files changed

+568
-321
lines changed

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.0
1+
2.7.2

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-frontend",
3-
"version":"2.7.0",
3+
"version":"2.7.2",
44
"type":"module",
55
"private":true,
66
"workspaces": [

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-comps",
3-
"version":"2.7.1",
3+
"version":"2.7.2",
44
"type":"module",
55
"license":"MIT",
66
"dependencies": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export { ReactComponent as RecyclerIcon } from "./remix/delete-bin-line.svg";
255255
export{ReactComponentasMarketplaceIcon}from"./v1/icon-application-marketplace.svg";
256256
export{ReactComponentasFavoritesIcon}from"./v1/icon-application-favorites.svg";
257257
export{ReactComponentasHomeSettingIcon}from"./remix/settings-4-line.svg";
258-
export{ReactComponentasEnterpriseIcon}from"./remix/earth-line.svg";
258+
export{ReactComponentasEnterpriseIcon}from"./remix/shield-star-line.svg";
259259
export{ReactComponentasVerticalIcon}from"./remix/vertical.svg";
260260
export{ReactComponentasHorizontalIcon}from"./remix/horizontal.svg";
261261

‎client/packages/lowcoder-sdk-webpack-bundle/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"lowcoder-sdk-webpack-bundle",
33
"description":"",
4-
"version":"2.7.0",
4+
"version":"2.7.2",
55
"main":"index.jsx",
66
"scripts": {
77
"test":"echo\"Error: no test specified\" && exit 1",

‎client/packages/lowcoder-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-sdk",
3-
"version":"2.7.0",
3+
"version":"2.7.2",
44
"type":"module",
55
"files": [
66
"src",

‎client/packages/lowcoder/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder",
3-
"version":"2.7.0",
3+
"version":"2.7.2",
44
"private":true,
55
"type":"module",
66
"main":"src/index.sdk.ts",

‎client/packages/lowcoder/src/api/newsApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const getHubspotContent = async () => {
132132
};
133133
try{
134134
constresult=awaitNewsApi.secureRequest(apiBody);
135-
returnresult?.data[0]?.hubspot?.length>0 ?result.data[0].hubspotasany[] :[];
135+
returnresult?.data[0]?.results?.length>0 ?result.data[0].resultsasany[] :[];
136136
}catch(error){
137137
console.error("Error getting news:",error);
138138
throwerror;

‎client/packages/lowcoder/src/app.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ import GlobalInstances from 'components/GlobalInstances';
6060
import{fetchHomeData,fetchServerSettingsAction}from"./redux/reduxActions/applicationActions";
6161
import{getNpmPackageMeta}from"./comps/utils/remote";
6262
import{packageMetaReadyAction,setLowcoderCompsLoading}from"./redux/reduxActions/npmPluginActions";
63-
import{fetchBrandingSetting}from"./redux/reduxActions/enterpriseActions";
6463
import{EnterpriseProvider}from"./util/context/EnterpriseContext";
6564
import{SimpleSubscriptionContextProvider}from"./util/context/SimpleSubscriptionContext";
6665
import{getBrandingSetting}from"./redux/selectors/enterpriseSelectors";
@@ -137,7 +136,6 @@ type AppIndexProps = {
137136
defaultHomePage:string|null|undefined;
138137
fetchHomeDataFinished:boolean;
139138
fetchConfig:(orgId?:string)=>void;
140-
fetchBrandingSetting:(orgId?:string)=>void;
141139
fetchHomeData:(currentUserAnonymous?:boolean|undefined)=>void;
142140
fetchLowcoderCompVersions:()=>void;
143141
getCurrentUser:()=>void;
@@ -167,7 +165,6 @@ class AppIndex extends React.Component<AppIndexProps, any> {
167165
if(!this.props.currentUserAnonymous){
168166
this.props.fetchHomeData(this.props.currentUserAnonymous);
169167
this.props.fetchLowcoderCompVersions();
170-
this.props.fetchBrandingSetting(this.props.currentOrgId);
171168
}
172169
}
173170
}
@@ -521,7 +518,6 @@ const mapDispatchToProps = (dispatch: any) => ({
521518
fetchHomeData:(currentUserAnonymous:boolean|undefined)=>{
522519
dispatch(fetchHomeData({}));
523520
},
524-
fetchBrandingSetting:(orgId?:string)=>dispatch(fetchBrandingSetting({ orgId,fallbackToGlobal:true})),
525521
fetchLowcoderCompVersions:async()=>{
526522
try{
527523
dispatch(setLowcoderCompsLoading(true));

‎client/packages/lowcoder/src/comps/comps/moduleContainerComp/moduleLayoutComp.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,12 @@ function ModuleLayoutView(props: IProps) {
6565
constdefaultGrid=useContext(ThemeContext)?.theme?.gridColumns||"24";//Added By Aqib Mirza
6666
const{ readOnly}=useContext(ExternalEditorContext);
6767

68-
if(readOnly){
69-
return(
70-
<ModulePreviewWrapperclassName={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
71-
);
72-
}
68+
// Removed this so that module load with canvas view and app settings will apply
69+
// if (readOnly) {
70+
// return (
71+
// <ModulePreviewWrapper className={CNRootContainer}>{props.containerView}</ModulePreviewWrapper>
72+
// );
73+
// }
7374

7475
constlayout={
7576
[moduleContainerId]:{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp