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

Commit ec6539d

Browse files
Merge pull request #2037 from lowcoder-org/dev
Dev -> Main - v2.7.5
2 parents 9683aba + 0e5aa97 commit ec6539d

File tree

136 files changed

+11950
-1374
lines changed

Some content is hidden

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

136 files changed

+11950
-1374
lines changed

‎client/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.4
1+
2.7.5

‎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.4",
3+
"version": "2.7.5",
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.4",
3+
"version": "2.7.5",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-design/src/components/colorSelect/colorUtils.ts‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,26 @@ const isValidColor = (str?: string) => {
7575
return colord(str).isValid();
7676
};
7777

78+
const isTransparentColor = (color?: string) => {
79+
if (!color) return true;
80+
81+
// Check for common transparent values
82+
if (color === 'transparent' || color === '') return true;
83+
84+
// Check if it's a valid color with alpha = 0
85+
try {
86+
const colorObj = colord(color);
87+
if (colorObj.isValid()) {
88+
return colorObj.alpha() === 0;
89+
}
90+
} catch (e) {
91+
// If colord can't parse it, consider it transparent
92+
return true;
93+
}
94+
95+
return false;
96+
};
97+
7898
export const isDarkColor = (colorStr: string) => {
7999
return brightnessCompare(colorStr, 0.75);
80100
};
@@ -122,4 +142,4 @@ export const darkenColor = (colorStr: string, intensity: number) => {
122142
return color.darken(intensity).toHex().toUpperCase();
123143
};
124144

125-
export { toRGBA, toHex, alphaOfRgba, isValidColor, isValidGradient };
145+
export { toRGBA, toHex, alphaOfRgba, isValidColor, isValidGradient,isTransparentColor };

‎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.3",
4+
"version": "2.7.5",
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.3",
3+
"version": "2.7.5",
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.4",
3+
"version": "2.7.5",
44
"private": true,
55
"type": "module",
66
"main": "src/index.sdk.ts",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export function isThemeColorKey(key: string) {
123123
case "padding":
124124
case "gridColumns":
125125
case "textSize":
126-
case "lineHeight":
126+
case "lineHeight":
127127
return true;
128128
}
129129
return false;

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
foldKeymap,
2828
indentOnInput,
2929
} from "@codemirror/language";
30-
import { defaultKeymap, history, historyKeymap, indentWithTab } from "@codemirror/commands";
30+
import { defaultKeymap, history, historyKeymap, insertTab,indentLess,indentMore } from "@codemirror/commands";
3131
import { highlightSelectionMatches, searchKeymap } from "@codemirror/search";
3232
import { Diagnostic, linter, lintKeymap } from "@codemirror/lint";
3333
import { type EditorState, Prec } from "@codemirror/state";
@@ -282,7 +282,20 @@ export function useFocusExtension(onFocus?: (focused: boolean) => void): [Extens
282282
}
283283

284284
function indentWithTabExtension(open?: boolean) {
285-
return open ?? true ? keymap.of([indentWithTab]) : [];
285+
if (!(open ?? true)) return [];
286+
return keymap.of([
287+
{
288+
key: "Tab",
289+
run: (view: EditorView) => {
290+
const { main } = view.state.selection;
291+
if (!main.empty && main.from !== main.to) {
292+
return indentMore(view);
293+
}
294+
return insertTab(view);
295+
},
296+
},
297+
{ key: "Shift-Tab", run: indentLess },
298+
]);
286299
}
287300

288301
export function lineNoExtension(showLineNumber?: boolean) {
@@ -493,26 +506,26 @@ export function useExtensions(props: CodeEditorProps) {
493506
basicSetup,
494507
defaultTheme,
495508
highlightJsExt,
496-
autocompletionExtension,
497509
focusExtension,
498510
lineNoExt,
499511
languageExt,
500512
onChangeExt,
501513
placeholderExt,
502514
indentWithTabExt,
515+
autocompletionExtension,
503516
tooltipExt,
504517
lintExt,
505518
iconExt,
506519
],
507520
[
508521
highlightJsExt,
509-
autocompletionExtension,
510522
focusExtension,
511523
lineNoExt,
512524
languageExt,
513525
onChangeExt,
514526
placeholderExt,
515527
indentWithTabExt,
528+
autocompletionExtension,
516529
tooltipExt,
517530
lintExt,
518531
iconExt,

‎client/packages/lowcoder/src/components/table/EditableCell.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ function EditableCellComp<T extends JSONValue>(props: EditableCellProps<T>) {
225225
key={`normal-view-${cellIndex}`}
226226
tabIndex={editable ? 0 : -1 }
227227
onFocus={enterEditFn}
228+
style={{ width: '100%', height: '100%'}}
228229
>
229230
{normalView}
230231
</div>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /