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 for 2.4.11 hotfix - /latest#1268

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 7 commits intomainfromdev
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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.4.11
2.4.12
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.4.11",
"version": "2.4.12",
"type": "module",
"private": true,
"workspaces": [
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -136,7 +136,7 @@ const ButtonTmpComp = (function () {
};
return new UICompBuilder(childrenMap, (props) => {
return(
<ButtonCompWrapper disabled={props.disabled}>
<ButtonCompWrapper$disabled={props.disabled}>
<EditorContext.Consumer>
{(editorState) => (
<Button100
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,10 +68,12 @@ export const Button100 = styled(Button)<{ $buttonStyle?: ButtonStyleType }>`
line-height:${(props) => props.$buttonStyle?.lineHeight};
`;

export const ButtonCompWrapper = styled.div<{ disabled: boolean }>`
export const ButtonCompWrapper = styled.div<{ $disabled: boolean }>`
display: flex;

// The button component is disabled but can respond to drag & select events
${(props) =>
props.disabled &&
props.$disabled &&
`
cursor: not-allowed;
button:disabled {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,7 +116,7 @@ const DropdownTmpComp = (function () {
);

return (
<ButtonCompWrapper disabled={props.disabled}>
<ButtonCompWrapper$disabled={props.disabled}>
{props.onlyMenu ? (
<Dropdown
disabled={props.disabled}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -95,7 +95,7 @@ const LinkTmpComp = (function () {
// chrome86 bug: button children should not contain only empty span
const hasChildren = hasIcon(props.prefixIcon) || !!props.text || hasIcon(props.suffixIcon);
return (
<ButtonCompWrapper disabled={props.disabled}>
<ButtonCompWrapper$disabled={props.disabled}>
<Link
$animationStyle={props.animationStyle}
ref={props.viewRef}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,7 +134,7 @@ const ScannerTmpComp = (function () {
};

return (
<ButtonCompWrapper disabled={props.disabled}>
<ButtonCompWrapper$disabled={props.disabled}>
<Button100
ref={props.viewRef}
$buttonStyle={props.style}
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -72,7 +72,7 @@ const ToggleTmpComp = (function () {

return (
<ButtonCompWrapperStyled
disabled={props.disabled}
$disabled={props.disabled}
$align={props.alignment}
$showBorder={props.showBorder}
$animationStyle={props.animationStyle}
Expand Down
8 changes: 4 additions & 4 deletionsclient/packages/lowcoder/src/layout/gridLayout.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -213,15 +213,15 @@ class GridLayout extends React.Component<GridLayoutProps, GridLayoutState> {
* @return {String} Container height in pixels.
*/
containerHeight(): string {
const { margin, rowHeight, fixedRowCount } = this.props as Required<GridLayoutProps>;
const { margin, rowHeight, fixedRowCount, isCanvas } = this.props as Required<GridLayoutProps>;
const { extraHeight, emptyRows } = this.props;
const positionParams = genPositionParams(this.props);

const { containerPadding } = positionParams;
const layout = this.getUILayout(undefined, true);

let nbRow = bottom(layout);
if (!_.isNil(emptyRows) && (_.size(layout) === 0 || fixedRowCount)) {
nbRow = emptyRows;// === Infinity ? 0 : emptyRows;
if (!_.isNil(emptyRows) && (_.size(layout) === 0 ||(fixedRowCount && isCanvas))) {
nbRow = emptyRows;
}
const containerHeight = Math.max(
nbRow * rowHeight + (nbRow - 1) * margin[1] + containerPadding[1] * 2
Expand Down
2 changes: 1 addition & 1 deletionclient/packages/lowcoder/src/util/styleUtils.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ const getBackgroundStyle = (style: Record<string, string | undefined>) => {
return css`
${isValidColor(style.background) && `background-color: ${style.background}`};
${isValidGradient(style.background) && !Boolean(style.backgroundImage) && `background-image: ${style.background}`};
${!isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image: ${style.backgroundImage}`};
${!isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image:url(${style.backgroundImage})`};
${isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image: url(${style.backgroundImage}), ${style.background}`};

${style.backgroundImageRepeat && `background-repeat: ${style.backgroundImageRepeat};`};
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,11 +301,29 @@ public void addGidIndexesUnique(MongockTemplate mongoTemplate) {
ensureIndexes(mongoTemplate, LibraryQuery.class, makeIndex("gid").unique());
}

private int getMongoDBVersion(MongockTemplate mongoTemplate) {
Document buildInfo = mongoTemplate.executeCommand(new Document("buildInfo", 1));
String versionString = buildInfo.getString("version");
if(versionString == null) return -1;
String[] versionParts = versionString.split("\\.");
int majorVersion = Integer.parseInt(versionParts[0]);
return majorVersion;
}

@ChangeSet(order = "026", id = "add-time-series-snapshot-history", author = "")
public void addTimeSeriesSnapshotHistory(MongockTemplate mongoTemplate, CommonConfig commonConfig) {
int mongoVersion = getMongoDBVersion(mongoTemplate);
if (mongoVersion < 5) {
log.warn("MongoDB version is below 5. Time-series collections are not supported. Upgrade the MongoDB version.");
}

// Create the time-series collection if it doesn't exist
if (!mongoTemplate.collectionExists(ApplicationHistorySnapshotTS.class)) {
mongoTemplate.createCollection(ApplicationHistorySnapshotTS.class, CollectionOptions.empty().timeSeries("createdAt"));
if(mongoVersion < 5) {
mongoTemplate.createCollection(ApplicationHistorySnapshotTS.class);
} else {
mongoTemplate.createCollection(ApplicationHistorySnapshotTS.class, CollectionOptions.empty().timeSeries("createdAt"));
}
}
Instant thresholdDate = Instant.now().minus(commonConfig.getQuery().getAppSnapshotKeepDuration(), ChronoUnit.DAYS);
List<ApplicationHistorySnapshot> snapshots = mongoTemplate.find(new Query().addCriteria(Criteria.where("createdAt").gte(thresholdDate)), ApplicationHistorySnapshot.class);
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.4.11</revision>
<revision>2.4.12</revision>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletionserver/node-service/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-node-server",
"version": "2.4.11",
"version": "2.4.12",
"private": true,
"engines": {
"node": "^14.18.0 || >=16.0.0"
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp