diff --git a/public/pad/toolbar/exit_full_screen_icon.png b/public/pad/toolbar/exit_full_screen_icon.png new file mode 100644 index 0000000..2bee74e Binary files /dev/null and b/public/pad/toolbar/exit_full_screen_icon.png differ diff --git a/public/pad/toolbar/stop_plan_polling.png b/public/pad/toolbar/stop_plan_polling.png new file mode 100644 index 0000000..fb3a442 Binary files /dev/null and b/public/pad/toolbar/stop_plan_polling.png differ diff --git a/src/App.vue b/src/App.vue index 2b9720b..33bca7a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,7 +15,7 @@ import { useStore } from "src/store"; import VConsole from "vconsole"; -// 根据调价加载 vConsole +// 根据条件加载 vConsole { if (window.location.href.indexOf("__showDebug__=_1025_") != -1) { new VConsole(); diff --git a/src/common/Initializer.ts b/src/common/Initializer.ts index 66ad256..c307085 100644 --- a/src/common/Initializer.ts +++ b/src/common/Initializer.ts @@ -46,6 +46,10 @@ export default class Initializer { let response = await this.getSignalSources(); if (response) { $store.commit("buildSignalSourceTree", { options, response }); + $store.commit("setArrayValue", { + name: "signal_sources", + value: response.signal_sources, + }); GlobalData.getInstance().signal_source = response.signal_sources; } } catch (e) { @@ -63,6 +67,11 @@ export default class Initializer { let response = await this.getModes(); if (response) { $store.commit("buildModeTree", { options, response }); + $store.commit("setArrayValue", { + name: "modes", + value: response.modes, + }); + GlobalData.getInstance().modes = response.modes; } } catch (e) { @@ -79,6 +88,10 @@ export default class Initializer { let response = await this.getPlans(); if (response) { $store.commit("buildPlanTree", { options, response }); + $store.commit("setArrayValue", { + name: "plans", + value: response.plans, + }); GlobalData.getInstance().plans = response.plans; } } catch (e) { @@ -95,6 +108,10 @@ export default class Initializer { let response = await this.getPollings(); if (response) { $store.commit("buildPollingTree", { options, response }); + $store.commit("setArrayValue", { + name: "pollings", + value: response.pollings, + }); GlobalData.getInstance().pollings = response.pollings; } } catch (e) { diff --git a/src/common/RemoteDataExangeProcesser.ts b/src/common/RemoteDataExangeProcesser.ts index ff82f5b..570455b 100644 --- a/src/common/RemoteDataExangeProcesser.ts +++ b/src/common/RemoteDataExangeProcesser.ts @@ -114,6 +114,10 @@ export default class RemoteDataExangeProcesser { ) as Protocol.ModeAddNotifyEntity; if (temp) { GlobalData.getInstance().modes.push(temp.mode); + $store.commit("setArrayValue", { + name: "modes", + value: GlobalData.getInstance().modes, + }); $store.commit("addModeTreeItem", { parent: temp.mode.group_uuid, is_group: false, @@ -134,6 +138,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().modes.splice(pos, 1); } + $store.commit("setArrayValue", { + name: "modes", + value: GlobalData.getInstance().modes, + }); $store.commit("deleteModeTreeItem", { is_group: false, uuid: temp.uuid, @@ -153,6 +161,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().modes[pos] = temp.mode; } + $store.commit("setArrayValue", { + name: "modes", + value: GlobalData.getInstance().modes, + }); $store.commit("setModeTreeItem", { is_group: false, item_data: temp.mode, @@ -207,6 +219,10 @@ export default class RemoteDataExangeProcesser { ) as Protocol.PlanAddNotifyEntity; if (temp) { GlobalData.getInstance().plans.push(temp.plan); + $store.commit("setArrayValue", { + name: "plans", + value: GlobalData.getInstance().plans, + }); $store.commit("addPlanTreeItem", { parent: temp.plan.group_uuid, is_group: false, @@ -227,6 +243,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().plans.splice(pos, 1); } + $store.commit("setArrayValue", { + name: "plans", + value: GlobalData.getInstance().plans, + }); $store.commit("deletePlanTreeItem", { is_group: false, uuid: temp.uuid, @@ -246,6 +266,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().plans[pos] = temp.plan; } + $store.commit("setArrayValue", { + name: "plans", + value: GlobalData.getInstance().plans, + }); $store.commit("setPlanTreeItem", { is_group: false, item_data: temp.plan, @@ -301,6 +325,10 @@ export default class RemoteDataExangeProcesser { ) as Protocol.PollingAddNotifyEntity; if (temp) { GlobalData.getInstance().pollings.push(temp.polling); + $store.commit("setArrayValue", { + name: "pollings", + value: GlobalData.getInstance().pollings, + }); $store.commit("addPollingTreeItem", { parent: temp.polling.group_uuid, is_group: false, @@ -321,6 +349,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().pollings.splice(pos, 1); } + $store.commit("setArrayValue", { + name: "pollings", + value: GlobalData.getInstance().pollings, + }); $store.commit("deletePollingTreeItem", { is_group: false, uuid: temp.uuid, @@ -340,6 +372,10 @@ export default class RemoteDataExangeProcesser { if (pos != -1) { GlobalData.getInstance().pollings[pos] = temp.polling; } + $store.commit("setArrayValue", { + name: "pollings", + value: GlobalData.getInstance().pollings, + }); $store.commit("setPollingTreeItem", { is_group: false, item_data: temp.polling, @@ -395,6 +431,10 @@ export default class RemoteDataExangeProcesser { ) as Protocol.SignalSourceAddNotifyEntity; if (temp) { GlobalData.getInstance().signal_source.push(temp.signal_source); + $store.commit("setArrayValue", { + name: "signal_sources", + value: GlobalData.getInstance().signal_source, + }); $store.commit("addSignalSourceTreeItem", { parent: temp.signal_source.group_uuid, is_group: false, @@ -409,6 +449,16 @@ export default class RemoteDataExangeProcesser { notify.data ) as Protocol.SignalSourceDeleteNotifyEntity; if (temp) { + let pos = GlobalData.getInstance().signal_source.findIndex( + (element) => element && element.uuid == temp.uuid + ); + if (pos != -1) { + GlobalData.getInstance().signal_source.splice(pos, 1); + } + $store.commit("setArrayValue", { + name: "signal_sources", + value: GlobalData.getInstance().signal_source, + }); $store.commit("deleteSignalSourceTreeItem", { is_group: false, uuid: temp.uuid, @@ -422,6 +472,17 @@ export default class RemoteDataExangeProcesser { notify.data ) as Protocol.SignalSourceEditNotifyEntity; if (temp) { + let pos = GlobalData.getInstance().signal_source.findIndex( + (element) => element && element.uuid == temp.signal_source.uuid + ); + if (pos != -1) { + GlobalData.getInstance().signal_source[pos] = + temp.signal_source; + } + $store.commit("setArrayValue", { + name: "signal_sources", + value: GlobalData.getInstance().signal_source, + }); $store.commit("setSignalSourceTreeItem", { is_group: false, item_data: temp.signal_source, diff --git a/src/components/FileManageDialog.vue b/src/components/FileManageDialog.vue index 0485102..20de7a9 100644 --- a/src/components/FileManageDialog.vue +++ b/src/components/FileManageDialog.vue @@ -469,7 +469,7 @@ export default defineComponent({ let uploading = ref(false); let files = ref([]); let show_context_menu = ref(false); - let target_dom: any = ref(document.body.children[0]); + let target_dom: any = ref(undefined); let current_file = ref(new FileEntity()); let default_path_label = ref($t.t("local disk")); let default_path = ref("media"); @@ -818,6 +818,7 @@ export default defineComponent({ path.value = default_path.value; status.value = "normal"; upload_url.value = ""; + target_dom.value = undefined; clipboard.clear(); if (resolve) { resolve(resolve_value); diff --git a/src/pad/ContentWall.vue b/src/pad/ContentWall.vue index 5b568f3..5186bf1 100644 --- a/src/pad/ContentWall.vue +++ b/src/pad/ContentWall.vue @@ -33,7 +33,7 @@ :isActive="item.uuid == $store.state.selected_window" :resizeIconSize="14" :isGuide="true" - v-for="(item, index) in windows" + v-for="(item, index) of windows" :key="index" @resizeEndHandler="resizeWindow(item.window_id, $event)" @moveEndHandler="moveWindow(item.window_id, $event)" @@ -68,7 +68,7 @@ @touchstart="$store.commit('setSelectedWindow', '')" >
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue index 33a0e1f..88c677b 100644 --- a/src/pages/WallPage.vue +++ b/src/pages/WallPage.vue @@ -28,7 +28,7 @@ :isActive="item.uuid == $store.state.selected_window" :resizeIconSize="14" :isGuide="true" - v-for="(item, index) in windows" + v-for="(item, index) of windows" :key="index" @resizeEndHandler="resizeWindow(item.window_id, $event)" @moveEndHandler="moveWindow(item.window_id, $event)" @@ -63,7 +63,7 @@
= (state)[playload.name]; + if (arr) { + arr.splice(0, arr.length); + for (const item of playload.value) { + if (item) { + arr.push(item); + } + } + } + } + }, setWindowPropertys(state: StateInterface, playload?: any[]) { if (playload && Array.isArray(playload)) { for (let item of playload) {