Skip to content

Commit fdffe01

Browse files
FalkWolskyFalkWolsky
authored
Merge pull request lowcoder-org#967 from lowcoder-org/dev
Dev -> Main preparation for v2.4.1
2 parents e539465 + 48e6991 commit fdffe01

File tree

1,290 files changed

+30819
-8332
lines changed

Some content is hidden

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

1,290 files changed

+30819
-8332
lines changed

‎.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,8 @@ client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
1010
client/packages/lowcoder-plugin-demo/yarn.lock
1111
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
1212
application-dev.yml
13+
server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
14+
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
15+
.vscode/settings.json
16+
.vscode/launch.json
17+
server/api-service/lowcoder-server/src/main/resources/application-dev-localhost.yaml

‎.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
"activityBar.background": "#2A3012",
44
"titleBar.activeBackground": "#3B431A",
55
"titleBar.activeForeground": "#F9FAF2"
6-
}
6+
},
7+
"java.debug.settings.onBuildFailureProceed": true
78
}

‎client/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.0
1+
2.4.1

‎client/packages/lowcoder-cli-template-typescript/src/i18n/comps/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ export function getEchartsLocale() {
1414
switch (locale.language) {
1515
case "en":
1616
return "EN";
17+
case "pt":
18+
return "PT";
1719
case "zh":
1820
return "ZH";
1921
}
@@ -24,6 +26,8 @@ export function getCalendarLocale() {
2426
switch (language) {
2527
case "zh":
2628
return "zh-cn";
29+
case "pt":
30+
return "pt-br";
2731
default:
2832
return "en-gb";
2933
}

‎client/packages/lowcoder-cli-template-typescript/src/i18n/comps/locales/pt.ts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import {en} from "./en"
2+
export const pt: typeof en = {
3+
...en,
4+
"style": {
5+
"textColor": "Cor do Texto",
6+
"contrastText": "Cor de Contraste do Texto",
7+
"accent": "Acento",
8+
"border": "Cor da Borda",
9+
"borderRadius": "Raio da Borda",
10+
"borderWidth": "Grossura da Borda",
11+
"backgroundColor": "Cor de Fundo",
12+
"headerBackground": "Cor do Header",
13+
"footerBackground": "Cor do Footer",
14+
"checkedBackground": "Cor com Seleção",
15+
"uncheckedBackground": "Cor sem Seleção",
16+
"uncheckedBorder": "Borda sem Seleção",
17+
"indicatorBackground": "Cor de Indicação",
18+
"toolbarBackground": "Cor de Fundo da Barra de Informações",
19+
"margin": "Margem",
20+
"padding": "Preenchimento",
21+
"marginLeft": "Margem Esquerda",
22+
"marginRight": "Margem Direita",
23+
"marginTop": "Margem Superior",
24+
"marginBottom": "Margem Inferior",
25+
"minWidth": "Largura Mínima",
26+
"aspectRatio": "Proporção de Tela",
27+
"textSize": "Tamanho do Texto",
28+
},
29+
"component": {
30+
"data": "Dados Hillchart",
31+
},
32+
"methods": {
33+
"setPoint": "Definir Ponto",
34+
"invalidInput": "Entrada Inválida",
35+
"requiredField": "{field} é obrigatório",
36+
}
37+
};

‎client/packages/lowcoder-cli-template-typescript/src/i18n/comps/locales/ptObj.tsx

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { I18nObjects } from "./types";
2+
3+
export const enObj: I18nObjects = {
4+
defaultData: [
5+
{
6+
id : 1,
7+
color: 'gray',
8+
description: 'Validação: Integração do Salesforce',
9+
x: 25,
10+
size: 15
11+
},
12+
{
13+
id : 2,
14+
color: 'maroon',
15+
description: 'Renovações',
16+
x: 80,
17+
size: 10 },
18+
{
19+
id : 3,
20+
color: 'maroon',
21+
description: 'Rafatoramento: Fancy Pants',
22+
x: 35,
23+
size: 10
24+
},
25+
{
26+
id : 4,
27+
color: 'cyan',
28+
description: 'Refatoramento: Lighthouse Orbs',
29+
x: 45,
30+
size: 10
31+
},
32+
{
33+
id : 5,
34+
color: 'yellow',
35+
description: 'Migração e Atualização de Dados',
36+
x: 50,
37+
size: 20
38+
}
39+
],
40+
};

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy