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

Dev -> Main 2.6.3#1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
FalkWolsky merged 14 commits intomainfromdev
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
1aa2cb0
check variable name duplication when duplicating the query
Imiss-U1025Feb 10, 2025
353baf2
show variables in left panel
Imiss-U1025Feb 10, 2025
424f429
start from suffix number 1
Imiss-U1025Feb 10, 2025
6786b8e
variable override issue fixed
Imiss-U1025Feb 10, 2025
48bb024
#1173: Implemented json serialization of oracle BLOB column type
dragonpooFeb 10, 2025
7eed7e2
#1173: Change return type of BLOB column to base64 string
dragonpooFeb 10, 2025
397c8f1
fixed component tree styling
raheeliftikhar5Feb 10, 2025
c4447b2
fixed splitter comp height issue
raheeliftikhar5Feb 10, 2025
f9da458
fixed hidden modal buttons issue
raheeliftikhar5Feb 10, 2025
d5b86ec
update device preview mockups
raheeliftikhar5Feb 10, 2025
93be4f0
Merge pull request #1520 from lowcoder-org/mobile-preview
FalkWolskyFeb 10, 2025
fe3eddd
Updating Versions for 2.6.3 release
Feb 10, 2025
42a8018
Merge pull request #1516 from lowcoder-org/fix/global_unique_variable…
FalkWolskyFeb 10, 2025
0cd9490
Merge pull request #1517 from lowcoder-org/fix/oracle_blob_serialize
FalkWolskyFeb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletionclient/VERSION
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
2.6.2
2.6.3
2 changes: 1 addition & 1 deletionclient/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name":"lowcoder-frontend",
"version":"2.6.2",
"version":"2.6.3",
"type":"module",
"private":true,
"workspaces": [
Expand Down
5 changes: 2 additions & 3 deletionsclient/packages/lowcoder/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder",
"version": "2.6.2",
"version": "2.6.3",
"private": true,
"type": "module",
"main": "src/index.sdk.ts",
Expand DownExpand Up@@ -52,7 +52,6 @@
"file-saver": "^2.0.5",
"github-markdown-css": "^5.1.0",
"hotkeys-js": "^3.8.7",
"html5-device-mockups": "^3.2.1",
"immer": "^9.0.7",
"less": "^4.1.3",
"lodash": "^4.17.21",
Expand All@@ -68,7 +67,7 @@
"react": "^18.2.0",
"react-best-gradient-color-picker": "^3.0.10",
"react-colorful": "^5.5.1",
"react-device-mockups": "^0.1.12",
"react-device-mockup": "^1.0.0",
"react-documents": "^1.2.1",
"react-dom": "^18.2.0",
"react-draggable": "^4.4.4",
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,12 +36,13 @@ import {
HorizontalIcon,
VerticalIcon,
} from "lowcoder-design/src/icons";
import { BackgroundColor } from "@lowcoder-ee/constants/style";

const SplitPanelWrapper = styled(Splitter.Panel)<{ }>`
const SplitPanelWrapper = styled(Splitter.Panel)`
overflow: hidden;
`;

const SplitterWrapper = styled.div<{ $style: SplitLayoutRowStyleType }>`
height: 100%;
border-radius: ${(props) => props.$style?.radius || "0px"};
border-width: ${(props) => props.$style?.borderWidth || "0px"};
border-color: ${(props) => props.$style?.border || "transparent"};
Expand DownExpand Up@@ -103,7 +104,8 @@ const ColumnContainer = (props: ColumnContainerProps) => {
...props.style,
height: props.orientation === "horizontal"
? (props.matchColumnsHeight ? heightCalculator(props.margin) : "auto")
: (props.autoHeight ? "100%" : "auto"),
: (props.autoHeight ? heightCalculator(props.margin) : heightCalculator(props.margin)),
overflow: 'auto',
}}
/>
);
Expand All@@ -115,19 +117,26 @@ const SplitLayout = (props: SplitLayoutProps) => {
<BackgroundColorContext.Provider value={props.columnStyle.background}>
<DisabledContext.Provider value={props.disabled}>
<SplitterWrapper $style={props.bodyStyle}>
<Splitter style={{ overflow: props.mainScrollbar ? "auto" : "hidden"}} layout={props.orientation}>
<Splitter
style={{
overflow: props.mainScrollbar ? "auto" : "hidden",
height: props.autoHeight && props.orientation === 'vertical' ? '500px' : '100%',
}}
layout={props.orientation}
>
{props.columns.map((col, index) => {
const id = String(col.id);
const childDispatch = wrapDispatch(wrapDispatch(props.dispatch, "containers"), id);
const containerProps = props.containers[id]?.children;

return (
<SplitPanelWrapper
key={id}
collapsible={col.collapsible}
{...(col.minWidth !== undefined ? { min: col.minWidth } : {})}
{...(col.maxWidth !== undefined ? { max: col.maxWidth } : {})}
{...(col.width !== undefined ? { defaultSize: col.width } : {})}
>
>
<ColumnContainer
layout={containerProps.layout.getView()}
items={gridItemCompToGridItems(containerProps.items.getView())}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,14 +112,12 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
overridegetView(){
constqueryName=this.children.queryName.getView();
// const queryParams = keyValueListToSearchStr(Array.isArray(this?.children?.query) ? (this.children.query as unknown as any[]).map((i: any) => i.getView() as KeyValue) : []);
constresult=Object.values(this.children.queryVariables.childrenasRecord<string,{
children:{
key:{unevaledValue:string},
value:{unevaledValue:string}
}}>)
.filter(item=>item.children.key.unevaledValue!==""&&item.children.value.unevaledValue!=="")
.map(item=>({[item.children.key.unevaledValue]:item.children.value.unevaledValue}))
constresult=this.children.queryVariables.toJsonValue()
.filter(item=>item.key!==""&&item.value!=="")
.map(item=>({[item.keyasstring]:item.value}))
.reduce((acc,curr)=>Object.assign(acc,curr),{});

result.$queryName=queryName;
if(!queryName){
return()=>Promise.resolve();
}
Expand Down
21 changes: 17 additions & 4 deletionsclient/packages/lowcoder/src/comps/queries/queryComp.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -364,6 +364,7 @@ QueryCompTmp = class extends QueryCompTmp {
if(action.type===CompActionTypes.EXECUTE_QUERY){
if(getReduceContext().disableUpdateState)returnthis;
if(!action.args)action.args=this.children.variables.children.variables.toJsonValue().reduce((acc,curr)=>Object.assign(acc,{[curr.keyasstring]:curr.value}),{});
action.args.$queryName=this.children.name.getView();

returnthis.executeQuery(action);
}
Expand DownExpand Up@@ -673,8 +674,8 @@ export const QueryComp = withExposingConfigs(QueryCompTmp, [
returnundefined;
}
constnewNode=Object.values(input.data)
.filter((kvNode:any)=>kvNode.key.value)
.map((kvNode:any)=>({[kvNode.key.value]:kvNode.value.value}))
.filter((kvNode:any)=>kvNode.key)
.map((kvNode:any)=>({[kvNode.key]:kvNode.value}))
.reduce((prev,obj)=>({...prev, ...obj}),{});
returnnewNode;
},
Expand DownExpand Up@@ -773,12 +774,24 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {
if(!originQuery){
return;
}

constjsonData=originQuery.toJsonValue();
//Regenerate variable header
jsonData.variables?.variables?.forEach(kv=>{
const[prefix,_]=(kv.keyasstring).split(/(?=\d+$)/);
leti=1,newName="";
do{
newName=prefix+(i++);
}while(editorState.checkRename("",newName));
kv.key=newName;
})

constnewQueryName=this.genNewName(editorState);
constid=genQueryId();
this.dispatch(
wrapActionExtraInfo(
this.pushAction({
...originQuery.toJsonValue(),
...jsonData,
id:id,
name:newQueryName,
isNewCreate:true,
Expand All@@ -789,7 +802,7 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {
{
type:"add",
compName:name,
compType:originQuery.children.compType.getView(),
compType:jsonData.compType,
},
],
}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,9 +28,10 @@ export function toQueryView(params: FunctionProperty[]) {
variables?:any;
timeout:InstanceType<ParamsControlType>;
}):Promise<QueryResult>=>{
console.log("toQueryView props",props,params);
const{ applicationId, isViewMode}=getGlobalSettings();

constmappedVariables=Object.keys(props.variables).map(key=>({key:`query1.variable.${key}`,value:props.variables[key]}));
constmappedVariables=Object.keys(props.variables).map(key=>({key:`${props.args?.$queryName}.variables.${key}`,value:props.variables[key]}));
letrequest:QueryExecuteRequest={
path:props.applicationPath,
params:[
Expand Down
2 changes: 2 additions & 0 deletionsclient/packages/lowcoder/src/pages/common/copyModal.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,6 +40,8 @@ export function CopyModal(props: CopyModalProps) {
okButtonProps={{disabled:!copyName}}
destroyOnClose={true}
onCancel={close}
showCancelButton
showOkButton
onOk={async()=>{
letdsl=null;
awaitApplicationApi.getApplicationDetail({applicationId:id,type:"editing"}).then(
Expand Down
49 changes: 36 additions & 13 deletionsclient/packages/lowcoder/src/pages/editor/editorView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,8 +256,31 @@ export const EditorWrapper = styled.div`

const DeviceWrapperInner = styled(Flex)`
margin: 2% 0 0;
.screen {
overflow: auto;
.device-mockup.portrait {
> div:first-child {
> div:first-child {
> div:first-child {
> div:nth-child(2) {
display: block !important;
overflow: hidden auto !important;
}
}
}
}
}
.device-mockup.landscape {
> div:first-child {
> div:first-child {
> div:first-child {
> div:nth-child(2) {
> div:first-child {
display: block !important;
overflow: hidden auto !important;
}
}
}
}
}
}
`;

Expand DownExpand Up@@ -322,13 +345,11 @@ const DeviceWrapper = ({
useEffect(() => {
const loadWrapper = async () => {
if (deviceType === "tablet") {
await import('html5-device-mockups/dist/device-mockups.min.css');
const { IPadPro } = await import("react-device-mockups");
setWrapper(() => IPadPro);
const { IPadMockup } = await import("react-device-mockup");
setWrapper(() => IPadMockup);
} else if (deviceType === "mobile") {
await import('html5-device-mockups/dist/device-mockups.min.css');
const { IPhone7 } = await import("react-device-mockups");
setWrapper(() => IPhone7);
const { IPhoneMockup } = await import("react-device-mockup");
setWrapper(() => IPhoneMockup);
} else {
setWrapper(() => null);
}
Expand All@@ -339,13 +360,13 @@ const DeviceWrapper = ({

const deviceWidth = useMemo(() => {
if (deviceType === 'tablet' && deviceOrientation === 'portrait') {
return980;
return850;
}
if (deviceType === 'tablet' && deviceOrientation === 'landscape') {
return1280;
return1100;
}
if (deviceType === 'mobile' && deviceOrientation === 'portrait') {
return550;
return450;
}
if (deviceType === 'mobile' && deviceOrientation === 'landscape') {
return 1200;
Expand All@@ -357,8 +378,10 @@ const DeviceWrapper = ({
return (
<DeviceWrapperInner justify="center" >
<Wrapper
orientation={deviceOrientation}
width={deviceWidth}
isLandscape={deviceOrientation === 'landscape'}
screenWidth={deviceWidth}
className={`device-mockup ${deviceOrientation === 'landscape' && deviceType === 'mobile' ? 'landscape' : 'portrait'} `}
frameColor={"background: linear-gradient(90deg, #4b6cb7 0%, #182848 100%);"}
>
{children}
</Wrapper>
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,9 @@ export const DirectoryTreeStyle = styled(DirectoryTree)`
height: 26px;
display: flex;
align-items: center;
&::before {
content: none;
}
}
.ant-tree-title {
padding-right: 6px;
Expand DownExpand Up@@ -43,6 +46,9 @@ export const DirectoryTreeStyle = styled(DirectoryTree)`
.ant-tree-treenode {
padding: 0;
max-width: 288px;
&::before {
content: none;
}
}
.ant-tree-indent-unit {
width: 16px;
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,6 +71,7 @@ function AddGroupUserDialog(props: {
}}
okButtonProps={{ loading: confirmLoading }}
showCancelButton={false}
showOkButton
width="440px"
okText={trans("finish")}
onOk={async () => {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,8 @@ function CreateModal(props: CreateModalProp) {
width="602px"
title={trans("theme.createTheme")}
open={modalVisible}
showOkButton
showCancelButton
onOk={handleOk}
okButtonProps={{ disabled: !name || !selectId }}
onCancel={handleCancel}
Expand Down
23 changes: 6 additions & 17 deletionsclient/yarn.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11492,13 +11492,6 @@ coolshapes-react@lowcoder-org/coolshapes-react:
languageName: node
linkType: hard

"html5-device-mockups@npm:^3.2.1":
version: 3.2.1
resolution: "html5-device-mockups@npm:3.2.1"
checksum: abba0bccc6398313102a9365203092a7c0844879d1b0492168279c516c9462d2a7e016045be565bc183e3405a1ae4929402eaceb1952abdbf16f1580afa68df3
languageName: node
linkType: hard

"http-cache-semantics@npm:^4.1.1":
version: 4.1.1
resolution: "http-cache-semantics@npm:4.1.1"
Expand DownExpand Up@@ -14203,7 +14196,6 @@ coolshapes-react@lowcoder-org/coolshapes-react:
file-saver: ^2.0.5
github-markdown-css: ^5.1.0
hotkeys-js: ^3.8.7
html5-device-mockups: ^3.2.1
http-proxy-middleware: ^2.0.6
immer: ^9.0.7
less: ^4.1.3
Expand All@@ -14220,7 +14212,7 @@ coolshapes-react@lowcoder-org/coolshapes-react:
react: ^18.2.0
react-best-gradient-color-picker: ^3.0.10
react-colorful: ^5.5.1
react-device-mockups: ^0.1.12
react-device-mockup: ^1.0.0
react-documents: ^1.2.1
react-dom: ^18.2.0
react-draggable: ^4.4.4
Expand DownExpand Up@@ -17774,15 +17766,12 @@ coolshapes-react@lowcoder-org/coolshapes-react:
languageName: node
linkType: hard

"react-device-mockups@npm:^0.1.12":
version:0.1.12
resolution: "react-device-mockups@npm:0.1.12"
"react-device-mockup@npm:^1.0.0":
version:1.0.0
resolution: "react-device-mockup@npm:1.0.0"
peerDependencies:
html5-device-mockups: ^3.2.1
prop-types: ^15.5.4
react: ^15.0.0 || ^16.0.0 || ^17.0.0
react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0
checksum: 738e969802c32810c2ca3ca3bd6c9bacf9b3d7adda0569c4f5c7fb1d68bab860ac7bb5a50aa2677d852143cb30ab8520e556c4dc7f53be154fd16ca08a9ba32c
react: "*"
checksum: 5a653b3e22c9cad567bf607169a710b70dc80c0f5b2b981008c06ff2566535ee809cb0819f0d3663bd2f0e3da6052a1a2b77baea58413e2202c2bab4602aa13e
languageName: node
linkType: hard

Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
packageorg.lowcoder.sdk.plugin.common.sql;

importorg.apache.commons.codec.binary.Base64;
importorg.jetbrains.annotations.Nullable;

importjava.sql.Blob;
importjava.sql.ResultSet;
importjava.sql.ResultSetMetaData;
importjava.sql.SQLException;
Expand All@@ -25,6 +27,7 @@ public class ResultSetParser {
publicstaticfinalStringDATETIME_COLUMN_TYPE_NAME ="datetime";
publicstaticfinalStringTIMESTAMP_COLUMN_TYPE_NAME ="timestamp";
publicstaticfinalStringYEAR_COLUMN_TYPE_NAME ="year";
publicstaticfinalStringBLOB_COLUMN_TYPE_NAME ="blob";

publicstaticList<Map<String,Object>>parseRows(ResultSetresultSet)throwsSQLException {
ResultSetMetaDatametaData =resultSet.getMetaData();
Expand DownExpand Up@@ -74,6 +77,12 @@ private static Object getValue(ResultSet resultSet, int i, String typeName) thro
if (YEAR_COLUMN_TYPE_NAME.equalsIgnoreCase(typeName)) {
returnresultSet.getDate(i).toLocalDate().getYear();
}
if (BLOB_COLUMN_TYPE_NAME.equalsIgnoreCase(typeName)) {
//Convert binary data into base64
Blobblob =resultSet.getBlob(i);
byte[]blobBytes =blob.getBytes(1, (int)blob.length());
returnBase64.encodeBase64String(blobBytes);
}
returnresultSet.getObject(i);
}

Expand Down
2 changes: 1 addition & 1 deletionserver/api-service/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@


<properties>
<revision>2.6.2</revision>
<revision>2.6.3</revision>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp