Skip to content

Commit 252b7db

Browse files
authored
fix: fixed application and i18n (#19)
* fix:update i18n * fix: fixed application and i18n
1 parent 53fb8f2 commit 252b7db

File tree

9 files changed

+164
-70
lines changed

9 files changed

+164
-70
lines changed

packages/web/src/boot/axios.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ export default boot(({ app }) => {
6969
throw Error(data.msg);
7070
}
7171

72-
if (data.message) {
73-
Notify.create({
74-
message: data.message
75-
});
76-
}
72+
// if (data.message) {
73+
// Notify.create({
74+
// message: data.message
75+
// });
76+
// }
7777

7878
return data.data;
7979
}

packages/web/src/components/EditComponent.vue

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898

9999
<script lang="ts" setup>
100100
import { ref, watch, onMounted, PropType, reactive } from 'vue';
101-
import { useQuasar } from 'quasar';
102101
import axios from 'axios';
103102
import { useDevelopingApps } from '../stores/app';
104103
import { ApplicationInfo } from '@devbox/core';
@@ -119,11 +118,11 @@ const props = defineProps({
119118
});
120119
121120
const { t } = useI18n();
122-
const $q = useQuasar();
123121
const chartNodes = ref<any>([]);
124122
const selectedKey = ref(null);
125123
const tempFile = ref();
126124
const fileStatus = ref(false);
125+
const currentFile = ref();
127126
128127
const fileInfo = reactive({
129128
code: '',
@@ -217,7 +216,8 @@ const getChildren = (items: any) => {
217216
children: data.isDir ? [{}] : null,
218217
handler: data.isDir ? loadChildren : null,
219218
isDir: data.isDir,
220-
defaultHide: true
219+
defaultHide: true,
220+
muted: true
221221
};
222222
children.push(selectData);
223223
@@ -249,7 +249,8 @@ async function loadChart() {
249249
path: props.app.appName,
250250
key: props.app.appName,
251251
isDir: true,
252-
defaultHide: true
252+
defaultHide: true,
253+
muted: true
253254
}
254255
];
255256
} catch (e: any) {
@@ -265,7 +266,15 @@ const toggleVaule = (data) => {
265266
};
266267
267268
const onSelected = async (value) => {
268-
selectedKey.value = value.item.path;
269+
if (fileStatus.value) {
270+
checkFileSave(value);
271+
} else {
272+
selectedKey.value = value.item.path;
273+
fetchData(value);
274+
}
275+
};
276+
277+
const fetchData = async (value) => {
269278
try {
270279
const res: any = await axios.get(
271280
store.url + '/api/files/' + value.item.path,
@@ -285,6 +294,31 @@ const onSelected = async (value) => {
285294
}
286295
};
287296
297+
const checkFileSave = (value) => {
298+
BtDialog.show({
299+
platform: 'web',
300+
cancel: true,
301+
okStyle: {
302+
background: '#00BE9E',
303+
color: '#ffffff'
304+
},
305+
title: 'Reanme',
306+
message: t('message.save_file')
307+
})
308+
.then(async (val) => {
309+
if (val) {
310+
await onSaveFile();
311+
selectedKey.value = value.item.path;
312+
await fetchData(value);
313+
} else {
314+
await fetchData(value);
315+
}
316+
})
317+
.catch((err) => {
318+
console.log(err);
319+
});
320+
};
321+
288322
const loadChildren = async (node: any) => {
289323
try {
290324
const res: any = await axios.get(store.url + '/api/files/' + node.path);

packages/web/src/components/dialog/ChooseContainer.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
lazy-rules
6969
color="teal-4"
7070
class="form-item-input q-mt-xs"
71-
placeholder="Container Name AAA"
7271
>
7372
</q-input>
7473
</div>

packages/web/src/i18n/en-US/index.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
// This is just an example,
2-
// so you can safely delete all default props below
3-
41
export default {
52
launch_input_placehoder: 'Search',
6-
launch_no_result: 'No Results',
7-
page_404: 'No results',
3+
launch_no_result: 'No results',
4+
page_404: 'Oops. Nothing here...',
85
no_data: 'No data.',
9-
home_welcome: 'No data',
6+
home_welcome: 'Welcome to DevBox',
107
home_desc: 'An easy way to develop in Terminus',
118
home_start: 'Start',
129
home_create: 'Create a new application',
1310
home_update: 'Upload a chart package',
1411
home_recent: 'Recent',
15-
home_recent_resc_1: 'The application you recently',
16-
home_recent_resc_2: 'Your recently developed apps',
17-
home_documents: ' will appear here',
12+
home_recent_resc_1: 'Your recently developed apps',
13+
home_recent_resc_2: ' will appear here',
14+
home_documents: 'Documents',
1815
home_doc_1: 'DevBox tutorials',
1916
home_doc_2: 'Basic concepts of Terminus applications',
2017
home_doc_3: 'Understand Terminus Application Chart',
@@ -37,7 +34,7 @@ export default {
3734
home_image: 'Image',
3835
home_image_hint: 'Image for app containers',
3936
home_image_rules: 'Add image',
40-
home_port: 'Image',
37+
home_port: 'Port',
4138
home_port_hint: 'Specify ports that need to be exposed',
4239
home_port_rules: 'Must be an integer between 0 and 65535',
4340
home_memory: 'Required memory',
@@ -305,6 +302,7 @@ export default {
305302
rename_folder_failed: 'Failed to rename',
306303
delete_file_success: 'File deleted successfully',
307304
delete_file_failed: 'Failed to delete',
308-
deleteTip: 'Delete this file/folder?'
305+
deleteTip: 'Delete this file/folder?',
306+
save_file: 'Do you want to save the current file?'
309307
}
310308
};

packages/web/src/i18n/zh-CN/index.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
export default {
22
launch_input_placehoder: '搜索',
33
launch_no_result: '没有结果',
4-
page_404: '没有结果',
4+
page_404: '哎呀,什么都没有...',
55
no_data: '无数据',
6-
home_welcome: '无数据',
6+
home_welcome: '欢迎使用 DevBox',
77
home_desc: '在 Terminus 中轻松开发应用',
88
home_start: '开始',
99
home_create: '创建新应用',
1010
home_update: '上传 chart 包',
1111
home_recent: '最近',
1212
home_recent_resc_1: '您最近开发的应用',
13-
home_recent_resc_2: '您最近开发的应用',
14-
home_documents: '将显示在这里',
13+
home_recent_resc_2: '将显示在这里',
14+
home_documents: '文档',
1515
home_doc_1: 'DevBox 教程',
1616
home_doc_2: 'Terminus 应用的基本概念',
1717
home_doc_3: '理解 Terminus 应用 chart',
@@ -34,7 +34,7 @@ export default {
3434
home_image: '图像',
3535
home_image_hint: '应用容器的镜像',
3636
home_image_rules: '添加图像',
37-
home_port: '图像',
37+
home_port: '端口',
3838
home_port_hint: '指定要暴露的端口',
3939
home_port_rules: '必须是 0 到 65535 之间的整数',
4040
home_memory: '所需内存',
@@ -238,7 +238,7 @@ export default {
238238
config_permissions_datatype_rules: '输入数据类型',
239239
config_permissions_version_hint: '所需数据版本',
240240
config_permissions_version_rules: '输入版本',
241-
config_permissions_operations_hint: '服务提供商所需的操作',
241+
config_permissions_operations_hint: '服务提供方所需的操作',
242242
config_permissions_operations_rules: '请输入关键操作',
243243
config: {
244244
addClients: '添加客户端',
@@ -276,6 +276,7 @@ export default {
276276
rename_folder_failed: '重命名失败',
277277
delete_file_success: '删除成功',
278278
delete_file_failed: '删除失败',
279-
deleteTip: '确定删除这个文件/文件夹吗?'
279+
deleteTip: '确定删除这个文件/文件夹吗?',
280+
save_file: '是否保存当前文件?'
280281
}
281282
};

0 commit comments

Comments
 (0)