Skip to content

Commit 022580b

Browse files
feat(common): Standardize Event Bus (#7650)
1 parent b1adafe commit 022580b

File tree

9 files changed

+16
-9
lines changed

9 files changed

+16
-9
lines changed

agent/cmd/server/nginx_conf/website_default.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ server {
1616
access_log /www/sites/domain/log/access.log main;
1717
error_log /www/sites/domain/log/error.log;
1818

19-
location ^~ /.well-known/acme-challenge {
19+
location ~ \.well-known{
2020
allow all;
21-
root /usr/share/nginx/html;
2221
}
2322
}

frontend/src/components/task-log/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</template>
1616
<script lang="ts" setup>
1717
import { reactive, ref } from 'vue';
18+
import bus from '@/global/bus';
1819
1920
defineProps({
2021
showClose: {
@@ -50,6 +51,7 @@ const openWithTaskID = (id: string, tail: boolean) => {
5051
config.tail = tail;
5152
}
5253
open.value = true;
54+
bus.emit('refreshTask', true);
5355
};
5456
5557
const openWithResourceID = (taskType: string, taskOperate: string, resourceID: number) => {

frontend/src/layout/components/Sidebar/index.vue

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,20 @@ import { isString } from '@vueuse/core';
7878
import { getSettingInfo, listNodeOptions } from '@/api/modules/setting';
7979
import { countExecutingTask } from '@/api/modules/log';
8080
import { compareVersion } from '@/utils/version';
81+
import bus from '@/global/bus';
8182
8283
const route = useRoute();
8384
const menuStore = MenuStore();
8485
const globalStore = GlobalStore();
8586
const nodes = ref([]);
8687
const nodeChangeRef = ref<DropdownInstance>();
8788
const version = ref();
89+
90+
bus.on('refreshTask', () => {
91+
console.log('on bus message');
92+
checkTask();
93+
});
94+
8895
defineProps({
8996
menuRouter: {
9097
type: Boolean,

frontend/src/layout/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import { getSystemAvailable } from '@/api/modules/setting';
2525
import { useRoute, useRouter } from 'vue-router';
2626
import { loadMasterProductProFromDB, loadProductProFromDB } from '@/utils/xpack';
2727
import { useTheme } from '@/global/use-theme';
28-
const { switchTheme } = useTheme();
2928
import TaskList from '@/components/task-list/index.vue';
29+
const { switchTheme } = useTheme();
3030
3131
useResize();
3232

frontend/src/views/app-store/detail/install/index.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,15 @@ import TaskLog from '@/components/task-log/index.vue';
136136
import { newUUID } from '@/utils/util';
137137
import { computeSizeFromMB } from '@/utils/util';
138138
139-
const router = useRouter();
140-
141139
interface InstallRrops {
142140
params?: App.AppParams;
143141
app: any;
144142
}
145-
146143
const installData = ref<InstallRrops>({
147144
app: {},
148145
});
146+
147+
const router = useRouter();
149148
const open = ref(false);
150149
const rules = ref<FormRules>({
151150
name: [Rules.appName],

frontend/src/views/app-store/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import i18n from '@/lang';
1414
import { onMounted, ref } from 'vue';
1515
import { SearchAppInstalled } from '@/api/modules/app';
16-
import bus from './bus';
16+
import bus from '@/global/bus';
1717
let showButton = ref(false);
1818
1919
const buttons = [

frontend/src/views/app-store/installed/delete/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { onBeforeUnmount, ref } from 'vue';
4949
import { App } from '@/api/interface/app';
5050
import { InstalledOp } from '@/api/modules/app';
5151
import i18n from '@/lang';
52-
import bus from '../../bus';
52+
import bus from '@/global/bus';
5353
import TaskLog from '@/components/task-log/index.vue';
5454
import { v4 as uuidv4 } from 'uuid';
5555

frontend/src/views/app-store/installed/upgrade/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ import { reactive, ref, onBeforeUnmount } from 'vue';
8787
import { MsgSuccess } from '@/utils/message';
8888
import { Rules } from '@/global/form-rules';
8989
import Diff from './diff/index.vue';
90-
import bus from '../../bus';
90+
import bus from '@/global/bus';
9191
import CodemirrorPro from '@/components/codemirror-pro/index.vue';
9292
import TaskLog from '@/components/task-log/index.vue';
9393
import { v4 as uuidv4 } from 'uuid';

0 commit comments

Comments
 (0)