From a792e5666a5c01bd5840eee57fc6a248e60ac97f Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Mon, 11 Jan 2021 13:35:23 +0000 Subject: [PATCH 1/7] debugger --- .../js/components/home/debugger/Debugger.vue | 241 ++++++++++++++++++ resources/assets/js/home/XCase.vue | 15 +- 2 files changed, 252 insertions(+), 4 deletions(-) create mode 100644 resources/assets/js/components/home/debugger/Debugger.vue diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue new file mode 100644 index 000000000..eb9c0a038 --- /dev/null +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -0,0 +1,241 @@ + + + + + \ No newline at end of file diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index 03c0c51fa..339bccb42 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -8,20 +8,29 @@ :height="height" allowfullscreen > + @@ -238,4 +239,107 @@ export default { clip: rect(0, 0, 0, 0); pointer-events: none; } + +.hiddencon { + margin: 0; + padding: 0; + position: fixed; + right: -37px; + top: 10px; + opacity: 0.9; +} + +.hiddencon-rtl { + margin: 0; + padding: 0; + position: fixed; + left: -37px; + top: 10px; + opacity: 0.9; +} + +.hiddencon2 { + top: auto; + bottom: 10px; +} + +.hiddencon:hover { + right: 0; +} + +.hiddencon-rtl:hover { + left: 0; +} + +.hiddencon-label { + margin-top: -40px; + margin-left: -23px; + padding: 4px; + position: absolute; + top: 50%; + display: inline-block; + color: white; + background: #626262; + font-size: 14px; + border-radius: 20px 0 0 20px; +} + +.hiddencon-label-rtl { + margin-top: -40px; + margin-right: -23px; + padding: 4px; + position: absolute; + top: 50%; + display: inline-block; + color: white; + background: #626262; + font-size: 14px; + border-radius: 0 20px 20px 0; +} + +.hiddencon, +.hiddencon-label { + -webkit-transition: all 0.4s ease-in-out; + transition: all 0.4s ease-in-out; +} + +.hiddencon p, +.hiddencon ul { + margin: 0; + padding: 0; + border: 8px solid #798189; + border-right: 0; + color: #fff; + background-color: #000; + text-align: center; + vertical-align: center; + border-radius: 10px 0 0 10px; +} + +.hiddencon ul { + margin: 0; + overflow: auto; +} + +.hiddencon li { + display: block; +} + +.hiddencon li a { + display: block; + padding: 10px; + border-bottom: 1px solid #333; + color: #ddd; + -webkit-transition: all 0.4s linear; + transition: all 0.4s linear; +} + +.hiddencon li:last-child a { + border-bottom: 0; +} + +.hiddencon li a:hover { + background-color: #333; + text-decoration: none; +} \ No newline at end of file diff --git a/resources/assets/js/components/home/debugger/ModalDebugger.vue b/resources/assets/js/components/home/debugger/ModalDebugger.vue new file mode 100644 index 000000000..6d58e1ff1 --- /dev/null +++ b/resources/assets/js/components/home/debugger/ModalDebugger.vue @@ -0,0 +1,233 @@ + + + + + + + From f5fbbc56988263f19bc7950d64e918fe1390fc4b Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Mon, 18 Jan 2021 21:22:32 +0000 Subject: [PATCH 3/7] updat --- resources/assets/js/api/Cases.js | 24 ++- .../home/debugger/ModalDebugger.vue | 196 ++++++++++-------- resources/assets/js/home/main.js | 3 +- 3 files changed, 139 insertions(+), 84 deletions(-) diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 21f380c18..8f537fa17 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -172,8 +172,28 @@ export let cases = { keys: {}, paged: dt.paged }) - } - + }, + debugVars(data) { + var params; + if (data.filter === "all") { + return axios.get(window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/debug_vars`); + } else { + params = new URLSearchParams(); + params.append('filter', data.filter); + return axios.post(window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/debug_vars`, params); + } + }, + debugVarsTriggers(data) { + let dc = _.random(0, 10000000000), + r = _.random(1.0, 100.0); + return axios.get(window.config.SYS_SERVER + + window.config.SYS_URI + + `cases/debug_triggers?r=${r}&_dc=${dc}`); + }, }; export let casesHeader = { diff --git a/resources/assets/js/components/home/debugger/ModalDebugger.vue b/resources/assets/js/components/home/debugger/ModalDebugger.vue index 6d58e1ff1..5121d2af4 100644 --- a/resources/assets/js/components/home/debugger/ModalDebugger.vue +++ b/resources/assets/js/components/home/debugger/ModalDebugger.vue @@ -7,65 +7,60 @@ role="toolbar" aria-label="Toolbar with button groups" > -
- - + +
- - - - - - -
-
@
- -
+
+ +
+ + +
+
- +
+
+
+
+ + +
+
+
@@ -262,6 +243,19 @@ input[type="radio"] { background-color: #6c757d; border-color: #6c757d; } + +.VueTables__search-field > label { + display: none; +} + +.VueTables.VueTables--client .row { + display: -ms-flexbox; + display: flex; + -ms-flex-wrap: wrap; + flex-wrap: wrap; + margin-right: 0px; + margin-left: 0px; +} From 58536e3ce29f0e443966819a9b5f1376463d603a Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 21 Jan 2021 19:24:52 +0000 Subject: [PATCH 5/7] update --- resources/assets/js/api/Api.js | 3 +- resources/assets/js/api/Cases.js | 21 +- .../js/components/home/debugger/Debugger.vue | 518 +++++++++--------- .../home/debugger/ModalDebugger.vue | 261 --------- resources/assets/js/home/XCase.vue | 29 +- resources/assets/js/home/main.js | 3 + 6 files changed, 290 insertions(+), 545 deletions(-) delete mode 100644 resources/assets/js/components/home/debugger/ModalDebugger.vue diff --git a/resources/assets/js/api/Api.js b/resources/assets/js/api/Api.js index d8024421a..1d3430769 100644 --- a/resources/assets/js/api/Api.js +++ b/resources/assets/js/api/Api.js @@ -68,7 +68,8 @@ const services = { SEARCH: "/home/search", PROCESSES: "/home/processes", USERS: "/home/users", - TASKS: "/home/tasks" + TASKS: "/home/tasks", + DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}" }; export default { diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 4c226a143..625b75c9a 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -84,10 +84,10 @@ export let cases = { return axios.post(window.config.SYS_SERVER + window.config.SYS_URI + `appProxy/getSummary`, params, { - headers: { - 'Cache-Control': 'no-cache' - } - }); + headers: { + 'Cache-Control': 'no-cache' + } + }); }, casenotes(data) { var params = new FormData(); @@ -187,6 +187,19 @@ export let cases = { paged: dt.paged }) }, + /** + * Make a search request to the Api service + * @param {object} dt - filter parameters + */ + debugStatus(dt) { + return Api.get({ + service: "DEBUG_STATUS", + params: {}, + keys: { + prj_uid: dt.PRO_UID + }, + }) + }, debugVars(data) { var params; if (data.filter === "all") { diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 5755d4b40..564496221 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -1,47 +1,94 @@ \ No newline at end of file diff --git a/resources/assets/js/components/home/debugger/ModalDebugger.vue b/resources/assets/js/components/home/debugger/ModalDebugger.vue deleted file mode 100644 index 21105334d..000000000 --- a/resources/assets/js/components/home/debugger/ModalDebugger.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index 339bccb42..6e9c89e83 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -1,5 +1,5 @@ diff --git a/resources/assets/js/home/main.js b/resources/assets/js/home/main.js index be6f29eb3..e9fcd5913 100644 --- a/resources/assets/js/home/main.js +++ b/resources/assets/js/home/main.js @@ -12,6 +12,9 @@ import 'bootstrap-vue/dist/bootstrap-vue.css' import Home from "./Home"; +import VueSplit from 'vue-split-panel' +Vue.use(VueSplit); + Vue.use(VueRouter); Vue.use(VueSidebarMenu); Vue.use(BootstrapVue); From 991e3ede348fd277d68a598922d5e9a459e2cbdb Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 21 Jan 2021 20:15:23 +0000 Subject: [PATCH 6/7] update --- resources/assets/js/api/Cases.js | 8 ++++++++ resources/assets/js/home/main.js | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 625b75c9a..7730aa0d6 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -200,6 +200,10 @@ export let cases = { }, }) }, + /** + * Get debug Vars in ajax service + * @param {*} data + */ debugVars(data) { var params; if (data.filter === "all") { @@ -214,6 +218,10 @@ export let cases = { `cases/debug_vars`, params); } }, + /** + * Get triggers debug Vars in ajax service + * @param {*} data + */ debugVarsTriggers(data) { let dc = _.random(0, 10000000000), r = _.random(1.0, 100.0); diff --git a/resources/assets/js/home/main.js b/resources/assets/js/home/main.js index e9fcd5913..a03029bde 100644 --- a/resources/assets/js/home/main.js +++ b/resources/assets/js/home/main.js @@ -11,10 +11,6 @@ import 'bootstrap/dist/css/bootstrap.min.css' import 'bootstrap-vue/dist/bootstrap-vue.css' import Home from "./Home"; - -import VueSplit from 'vue-split-panel' -Vue.use(VueSplit); - Vue.use(VueRouter); Vue.use(VueSidebarMenu); Vue.use(BootstrapVue); From 0c5113928f9d03cbfae92e8c9650f420a9191a7e Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 21 Jan 2021 20:48:51 +0000 Subject: [PATCH 7/7] update --- resources/assets/js/api/Cases.js | 2 +- .../js/components/home/debugger/Debugger.vue | 16 ++++++++-------- resources/assets/js/home/XCase.vue | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 7730aa0d6..54b789ebd 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -197,7 +197,7 @@ export let cases = { params: {}, keys: { prj_uid: dt.PRO_UID - }, + } }) }, /** diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 564496221..4a641892a 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -68,11 +68,11 @@ export default { perPage: 200, filterable: true, pagination: { - show: false, + show: false }, headings: { key: this.$i18n.t("ID_NAME"), - value: this.$i18n.t("ID_VALUE"), + value: this.$i18n.t("ID_FIELD_DYNAFORM_TEXT") }, }, optionsDebugVars: { @@ -80,9 +80,9 @@ export default { options: [ { text: this.$i18n.t("ID_OPT_ALL"), value: "all" }, { text: this.$i18n.t("ID_DYNAFORM"), value: "dyn" }, - { text: this.$i18n.t("ID_SYSTEM"), value: "sys" }, - ], - }, + { text: this.$i18n.t("ID_SYSTEM"), value: "sys" } + ] + } }; }, mounted() { @@ -106,7 +106,7 @@ export default { _.forIn(response.data.data[0], function (value, key) { dt.push({ key, - value, + value }); }); this.dataTable = dt; @@ -123,7 +123,7 @@ export default { _.forIn(response.data.data[0], function (value, key) { dt.push({ key, - value, + value }); }); this.dataTableTriggers = dt; @@ -135,7 +135,7 @@ export default { */ changeOption(opt) { this.getDebugVars({ filter: opt }); - }, + } }, }; diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index 6e9c89e83..5bdc05094 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -19,16 +19,16 @@ import api from "../api/index"; export default { name: "XCase", components: { - Debugger, + Debugger }, props: { - data: Object, + data: Object }, mounted() { let that = this; this.height = window.innerHeight - this.diffHeight; this.dataCase = this.$parent.dataCase; - if (this.dataCase.ACTION == "jump") { + if (this.dataCase.ACTION === "jump") { this.path = window.config.SYS_SERVER + window.config.SYS_URI +