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

Commit9c9fc0c

Browse files
authored
Merge branch 'main' into dev
2 parents13e81c2 +b7e41f0 commit9c9fc0c

File tree

12 files changed

+32
-18
lines changed

12 files changed

+32
-18
lines changed

‎client/packages/lowcoder/src/components/CompName.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ export const CompName = (props: Iprops) => {
115115

116116

117117
if(compInfo.isRemote){
118+
// Falk: Displaying the current version of the component
119+
items.push({
120+
text:trans("history.currentVersion")+": "+compInfo.packageVersion,
121+
onClick:()=>{
122+
},
123+
});
118124
items.push({
119125
text:trans("history.currentVersion")+": "+compInfo.packageVersion,
120126
onClick:()=>{
@@ -127,6 +133,7 @@ export const CompName = (props: Iprops) => {
127133
onClick:()=>{
128134
handleUpgrade();
129135
},
136+
130137
});
131138
}
132139

‎client/packages/lowcoder/src/pages/editor/editorView.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ function EditorView(props: EditorViewProps) {
374374
// we check if we are on the public cloud
375375
constisLowCoderDomain=window.location.hostname==='app.lowcoder.cloud';
376376

377+
// we check if we are on the public cloud
378+
constisLowCoderDomain=window.location.hostname==='app.lowcoder.cloud';
379+
377380
if(readOnly&&hideHeader){
378381
return(
379382
<CustomShortcutWrapper>
@@ -464,7 +467,6 @@ function EditorView(props: EditorViewProps) {
464467
<scriptkey="clearbit-script"src="https://tag.clearbitscripts.com/v1/pk_dfbc0aeefb28dc63475b67134facf127/tags.js"referrerPolicy="strict-origin-when-cross-origin"type="text/javascript"></script>
465468
]}
466469
</Helmet>
467-
468470
{showNewUserGuide&&<EditorTutorials/>}
469471
<EditorGlobalHotKeys
470472
disabled={readOnly}

‎client/packages/lowcoder/src/pages/editor/right/PluginPanel/index.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ export default function PluginPanel() {
3636
}),
3737
[commonSettings?.npmPlugins]
3838
);
39-
4039
consthandleSetNpmPlugins=(nextNpmPlugins:string[])=>{
4140
dispatch(
4241
setCommonSettings({

‎deploy/helm/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ appVersion: "latest"
1313
dependencies:
1414
-condition:redis.enabled
1515
name:redis
16-
repository:https://charts.bitnami.com/bitnami
17-
version:17.0.10
16+
repository:oci://registry-1.docker.io/bitnamicharts
17+
version:19.1.0
1818
-condition:mongodb.enabled
1919
name:mongodb
20-
repository:https://charts.bitnami.com/bitnami
21-
version:13.6.2
20+
repository:oci://registry-1.docker.io/bitnamicharts
21+
version:15.1.4
2222

‎deploy/helm/templates/_helpers.tpl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
6262
Selector labels
6363
*/}}
6464
{{- define"lowcoder.selectorLabels" -}}
65-
app.kubernetes.io/name:{{include"lowcoder.name" .}}
65+
{{-$name :=include"lowcoder.name" . -}}
66+
{{-$componentName := .component |default"" -}}
67+
{{-ifne$componentName"" -}}
68+
app.kubernetes.io/name:{{$name}}-{{$componentName}}
69+
{{-else -}}
70+
app.kubernetes.io/name:{{$name}}
71+
{{- end}}
6672
app.kubernetes.io/instance:{{ .Release.Name}}
6773
{{- end}}
6874

‎deploy/helm/templates/api-service/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels". | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels"(dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels". | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels"(dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

‎deploy/helm/templates/api-service/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
selector:
20-
{{- include "lowcoder.selectorLabels". | nindent 4 }}
20+
{{- include "lowcoder.selectorLabels"(dict "component" "api-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

‎deploy/helm/templates/frontend/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels". | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels"(dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels". | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels"(dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

‎deploy/helm/templates/frontend/service.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ spec:
1717
{{- end }}
1818
{{- end }}
1919
selector:
20-
{{- include "lowcoder.selectorLabels". | nindent 4 }}
20+
{{- include "lowcoder.selectorLabels"(dict "component" "frontend" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 4 }}

‎deploy/helm/templates/node-service/deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ spec:
1010
{{- end }}
1111
selector:
1212
matchLabels:
13-
{{- include "lowcoder.selectorLabels". | nindent 6 }}
13+
{{- include "lowcoder.selectorLabels"(dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 6 }}
1414
template:
1515
metadata:
1616
{{- with .Values.podAnnotations }}
1717
annotations:
1818
{{- toYaml . | nindent 8 }}
1919
{{- end }}
2020
labels:
21-
{{- include "lowcoder.selectorLabels". | nindent 8 }}
21+
{{- include "lowcoder.selectorLabels"(dict "component" "node-service" "Values" .Values "Release" .Release "Chart" .Chart) | nindent 8 }}
2222
spec:
2323
{{- with .Values.imagePullSecrets }}
2424
imagePullSecrets:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp