Skip to content

Commit

Permalink
Merge pull request #967 from lowcoder-org/dev
Browse files Browse the repository at this point in the history
Dev -> Main preparation for v2.4.1
  • Loading branch information
FalkWolsky authored Jun 17, 2024
2 parents e539465 + 48e6991 commit fdffe01
Show file tree
Hide file tree
Showing 1,290 changed files with 30,819 additions and 8,332 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
client/packages/lowcoder-plugin-demo/yarn.lock
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
application-dev.yml
server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
.vscode/settings.json
.vscode/launch.json
server/api-service/lowcoder-server/src/main/resources/application-dev-localhost.yaml
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"activityBar.background": "#2A3012",
"titleBar.activeBackground": "#3B431A",
"titleBar.activeForeground": "#F9FAF2"
}
},
"java.debug.settings.onBuildFailureProceed": true
}
2 changes: 1 addition & 1 deletion client/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.0
2.4.1
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ export function getEchartsLocale() {
switch (locale.language) {
case "en":
return "EN";
case "pt":
return "PT";
case "zh":
return "ZH";
}
Expand All @@ -24,6 +26,8 @@ export function getCalendarLocale() {
switch (language) {
case "zh":
return "zh-cn";
case "pt":
return "pt-br";
default:
return "en-gb";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import {en} from "./en"
export const pt: typeof en = {
...en,
"style": {
"textColor": "Cor do Texto",
"contrastText": "Cor de Contraste do Texto",
"accent": "Acento",
"border": "Cor da Borda",
"borderRadius": "Raio da Borda",
"borderWidth": "Grossura da Borda",
"backgroundColor": "Cor de Fundo",
"headerBackground": "Cor do Header",
"footerBackground": "Cor do Footer",
"checkedBackground": "Cor com Seleção",
"uncheckedBackground": "Cor sem Seleção",
"uncheckedBorder": "Borda sem Seleção",
"indicatorBackground": "Cor de Indicação",
"toolbarBackground": "Cor de Fundo da Barra de Informações",
"margin": "Margem",
"padding": "Preenchimento",
"marginLeft": "Margem Esquerda",
"marginRight": "Margem Direita",
"marginTop": "Margem Superior",
"marginBottom": "Margem Inferior",
"minWidth": "Largura Mínima",
"aspectRatio": "Proporção de Tela",
"textSize": "Tamanho do Texto",
},
"component": {
"data": "Dados Hillchart",
},
"methods": {
"setPoint": "Definir Ponto",
"invalidInput": "Entrada Inválida",
"requiredField": "{field} é obrigatório",
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import { I18nObjects } from "./types";

export const enObj: I18nObjects = {
defaultData: [
{
id : 1,
color: 'gray',
description: 'Validação: Integração do Salesforce',
x: 25,
size: 15
},
{
id : 2,
color: 'maroon',
description: 'Renovações',
x: 80,
size: 10 },
{
id : 3,
color: 'maroon',
description: 'Rafatoramento: Fancy Pants',
x: 35,
size: 10
},
{
id : 4,
color: 'cyan',
description: 'Refatoramento: Lighthouse Orbs',
x: 45,
size: 10
},
{
id : 5,
color: 'yellow',
description: 'Migração e Atualização de Dados',
x: 50,
size: 20
}
],
};
2 changes: 1 addition & 1 deletion client/packages/lowcoder-comps/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-comps",
"version": "2.4.5",
"version": "2.4.7",
"type": "module",
"license": "MIT",
"dependencies": {
Expand Down
Loading

0 comments on commit fdffe01

Please sign in to comment.