Skip to content

Commit a5f5919

Browse files
committed
pull from origin
2 parents abc37df + a739e2e commit a5f5919

Some content is hidden

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

51 files changed

+460
-65
lines changed

client/packages/lowcoder-core/lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ var CodeNode = /** @class */ (function (_super) {
17771777
return;
17781778
}
17791779
// wait for lazy loaded comps to load before executing query on page load
1780-
if (!Object.keys(value).length) {
1780+
if (!Object.keys(value).length && paths.size) {
17811781
isFetching_1 = true;
17821782
ready_1 = false;
17831783
}

client/packages/lowcoder-core/src/eval/codeNode.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class CodeNode extends AbstractNode<ValueAndMsg<unknown>> {
173173
return;
174174
}
175175
// wait for lazy loaded comps to load before executing query on page load
176-
if (!Object.keys(value).length) {
176+
if (!Object.keys(value).length && paths.size) {
177177
isFetching = true;
178178
ready = false;
179179
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ export { ReactComponent as BorderRadiusIcon } from "./remix/rounded-corner.svg";
216216
export { ReactComponent as ShadowIcon } from "./remix/shadow-line.svg";
217217
export { ReactComponent as OpacityIcon } from "./remix/contrast-drop-2-line.svg";
218218
export { ReactComponent as AnimationIcon } from "./remix/loader-line.svg";
219+
export { ReactComponent as LineHeightIcon } from "./remix/line-height.svg";
219220

220221

221222
export { ReactComponent as LeftInfoLine } from "./remix/information-line.svg";

client/packages/lowcoder/src/api/commonSettingApi.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export interface ThemeDetail {
6262
animationDuration?: string;
6363
opacity?: string;
6464
boxShadow?: string;
65+
lineHeight?: string;
6566
boxShadowColor?: string;
6667
animationIterationCount?: string;
6768
components?: Record<string, JSONObject>;
@@ -83,6 +84,7 @@ export function getThemeDetailName(key: keyof ThemeDetail) {
8384
case "padding": return trans("style.padding");
8485
case "gridColumns": return trans("themeDetail.gridColumns");
8586
case "textSize": return trans("style.textSize");
87+
case "lineHeight": return trans("themeDetail.lineHeight");
8688
}
8789
return "";
8890
}
@@ -105,6 +107,7 @@ export function isThemeColorKey(key: string) {
105107
case "padding":
106108
case "gridColumns":
107109
case "textSize":
110+
case "lineHeight":
108111
return true;
109112
}
110113
return false;

client/packages/lowcoder/src/base/codeEditor/codeEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function useCodeMirror(
224224
window.clearTimeout(isTypingRef.current);
225225
isTypingRef.current = window.setTimeout(() => (isTypingRef.current = 0), 100);
226226
onChange?.(state);
227-
}, 100)
227+
}, 1000)
228228
, [onChange]
229229
);
230230

client/packages/lowcoder/src/components/PageSkeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ export default function PageSkeleton(props: IProps) {
8383

8484
return (
8585
<Layout>
86-
{!hideHeader && isHeaderReady && (
86+
{/* {!hideHeader && isHeaderReady && (
8787
<Header
8888
headerStart={<StyledLogoWithName branding={true} />}
8989
style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}
9090
/>
91-
)}
91+
)} */}
9292
<Layout>
9393
{!hideSideBar && <SideBar>{skeleton}</SideBar>}
9494
<MainContent>{!hideContent && skeleton}</MainContent>

client/packages/lowcoder/src/components/ThemeSettingsCompStyles.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
TextStyleIcon,
2626
ImageCompIconSmall,
2727
RotationIcon,
28+
LineHeightIcon
2829
} from "lowcoder-design/src/icons";
2930
import { trans } from "i18n";
3031
import { debounce } from "lodash";
@@ -375,6 +376,10 @@ export default function ThemeSettingsCompStyles(props: CompStyleProps) {
375376
icon = <RotationIcon style={{width: "16px", margin: "5px 0 0 5px", padding: "0px"}}/>;
376377
break;
377378
}
379+
case 'lineHeight': {
380+
icon = <LineHeightIcon style={{width: "16px", margin: "5px 0 0 5px", padding: "0px"}}/>;
381+
break;
382+
}
378383
}
379384
return icon;
380385
}

client/packages/lowcoder/src/components/ThemeSettingsSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
381381
max={48} // Define the maximum value for the slider
382382
value={parseInt(gridColumns || "24")}
383383
onChange={(value) => setGridColumns(value.toString())}
384-
onAfterChange={(value) => gridColumnsInputBlur(value.toString())}
384+
onChangeComplete={(value) => gridColumnsInputBlur(value.toString())}
385385
/>
386386
</div>
387387
)}

client/packages/lowcoder/src/comps/comps/buttonComp/buttonCompConstants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ export const Button100 = styled(Button)<{ $buttonStyle?: ButtonStyleType }>`
6565
overflow: hidden;
6666
text-overflow: ellipsis;
6767
}
68+
line-height:${(props) => props.$buttonStyle?.lineHeight};
6869
`;
6970

7071
export const ButtonCompWrapper = styled.div<{ disabled: boolean }>`

client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const LeftButtonWrapper = styled.div<{ $buttonStyle: DropdownStyleType }>`
6060
${(props) => `font-style: ${props.$buttonStyle.fontStyle};`}
6161
6262
width: 100%;
63+
line-height:${(props) => props.$buttonStyle.lineHeight};
6364
}
6465
6566
`;

0 commit comments

Comments
 (0)