From 74abf865fd6073f82c8ad4dd3b16b1c7fed573ee Mon Sep 17 00:00:00 2001 From: fangxiang Date: Mon, 18 Apr 2022 17:08:40 +0800 Subject: [PATCH] =?UTF-8?q?vuex=E6=B7=BB=E5=8A=A0=E4=BF=A1=E5=8F=B7?= =?UTF-8?q?=E6=BA=90=EF=BC=8C=E6=A8=A1=E5=BC=8F=EF=BC=8C=E9=A2=84=E6=A1=88?= =?UTF-8?q?=EF=BC=8C=E8=BD=AE=E8=AF=A2=E5=88=97=E8=A1=A8=E3=80=82=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E5=99=A8=E5=AF=B9?= =?UTF-8?q?=E8=AF=9D=E6=A1=86=E6=B2=A1=E6=98=BE=E7=A4=BA=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E8=8F=9C=E5=8D=95=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/pad/toolbar/exit_full_screen_icon.png | Bin 0 -> 755 bytes public/pad/toolbar/stop_plan_polling.png | Bin 0 -> 1281 bytes src/App.vue | 2 +- src/common/Initializer.ts | 17 ++++++ src/common/RemoteDataExangeProcesser.ts | 61 +++++++++++++++++++ src/components/FileManageDialog.vue | 3 +- src/pad/ContentWall.vue | 6 +- src/pages/TopToolBar.vue | 2 +- src/pages/WallPage.vue | 6 +- src/store/index.ts | 22 +++++++ 10 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 public/pad/toolbar/exit_full_screen_icon.png create mode 100644 public/pad/toolbar/stop_plan_polling.png 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 0000000000000000000000000000000000000000..2bee74e21f683b6edbe21e60ec6edec22ae604a8 GIT binary patch literal 755 zcmVjZ6vscUB8`-lM4}`L&pZ$lwpKBAS$i z1zpU7g zHdAvhKsmb?xCGn+cCk zdy53rgmQKO7){7Gdu<-ihJYC!P|ltVJ1^lC&?n?FZdC}XLOFXD7);1}y*4jOhE{oC zVQR=jE@+hpI-~nGOkXS{KskE^Sn0JnSYw(LnFR^C?EH1L$+<%i zGI5AMxEO#ZAExgb{|QqGEtCxNw*dBkgTB0N6@3?;A0!smcDiTx+=-fMGH2Dw7u zwfU-?-3m+qYl3-DIs46Pb2@8tz(B?`IjVmJHB6>nNx+C)eug%4xYn25kXBPvzflpQD zeF3Ht+bUor`@A++8Wqr!#5WHl{zpSMY)C|$gk3e}Wx-2V3*C*7`4__XL16)( zLtIPO!$9C`c;6zZhiy6%*l-Y?S;VuLFy*9J*15x%s0rE~- zh<5&0!Fvh$XvWSfzWpEB1j)RG$%*|@gS*`Owu$X zK`K)9#0wIQYF)~p8m)?3@K7b1YLz2%&a7tb)irz1+H2OfN&m^tUbANQH}l`?o9{O3 zkkQdm9E8zRfn~tuz%iu3cfd=)lUAxf63L9h7%^e=DZn~lYD4q93tVEQ+TD=+12Euk zJl7y8hx3648XlT&h0%`y z5BcV-RB~f5P#E)fO5p{AF(IYwP8jUvWFZKnj{u$lE&|p7ORZFY6^9F>Cjw6a^MJL$ zh?Q!zOl&kUVf1yt^?~lYtW-bO;C44~i@(0#88Tt?&3SU3)N0@=f9q`E1K_nXfmNQ^ zCLrXCey<>>3`M_rBjaSo$d!=FFeM}~nwXVp3$Udofe@YrZUs)v^=IVn0A4I1^`$3U zilXuOS74?39vJqKN*<2fwh~fXf%#UdU;COE9jRgeX9Uqv6@9pMWyIR{ zSgBTYkhMKR4n9yQTU!(N1~p91&QTu_FSJM>TR z{_N5~|Fyv0qAMsvPaU+C>g!Nn&ZLJ(WoU5)p+S9NJlgoFt!=F3Dq-}YA(>SokJ$x3 zlgE2C6Ulo+q@1A;MmutEmH0Uqe!W~Ku!<_W%=(%@-wm;wI)Leg+b!15xq<+>Ng;t% zB9G<3@*0b82bbvH;cvTE38ywZf8F+KcVyFX8@Bs2y)KxL#MVK#(iU@YKiED(JtOIz+p9rgz$^= zw^phREyQ9Vj2`mVYlD^Q!ivA00es;zhNkd?a|zv;`(<8zE)YgvW~HiP6mH9raz5z+ z|1a0Y34R+L>!X-Om52$W=KxCzB&!fRJ$L=Em1<1_QrX&^b6@J4LshNd2#}Ac=Xr}7 zi^Fr{f>A@4Xi0RVi3y|U`nrCW17+VMi5HjzRaDWb-P=CHUF{9X{7>dH81JQ5+VN^=s+o{_u$vvM(~4usKn`d1$u z_5#lXzayjjSbm00000NkvXXu0mjf(J6G) literal 0 HcmV?d00001 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) {