diff --git a/package-lock.json b/package-lock.json index 8c427dc..da02b52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,9 @@ "bootstrap-vue": "^2.19.0", "express": "^4.17.1", "file-saver": "^2.0.5", + "import": "^0.0.6", "jszip": "^3.5.0", + "luxon": "^1.25.0", "mkdirp": "^0.5.5", "multilang-extract-comments": "^0.3.3", "socket.io": "^3.0.3", @@ -27,6 +29,7 @@ "vue-socket.io-extended": "^4.0.5", "vue-sweetalert2": "^4.1.1", "vue-template-compiler": "^2.6.12", + "vue2-datepicker": "^3.8.2", "vuex": "^3.6.0" }, "devDependencies": { @@ -4907,6 +4910,11 @@ "node": ">=0.10" } }, + "node_modules/date-format-parse": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.6.tgz", + "integrity": "sha512-sdxnYAWmLopeb+6Hmw+vo3or4OCJOnh4+YoJ9p+Id3o2EnNP0INpTqx7wr8UregfMpgaSZAH473R/ytiaB3gVg==" + }, "node_modules/de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -7218,6 +7226,20 @@ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" }, + "node_modules/import": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/import/-/import-0.0.6.tgz", + "integrity": "sha1-0Ot534aqJnfG22FXilISswMeYEI=", + "dependencies": { + "optimist": "0.3.x" + }, + "bin": { + "import": "import" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -8201,6 +8223,14 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.25.0.tgz", + "integrity": "sha512-hEgLurSH8kQRjY6i4YLey+mcKVAWXbDNlZRmM6AgWDJ1cY3atl8Ztf5wEY7VBReFbmGnwQPz7KYJblL8B2k0jQ==", + "engines": { + "node": "*" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -9181,6 +9211,14 @@ "node": ">=4" } }, + "node_modules/optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "dependencies": { + "wordwrap": "~0.0.2" + } + }, "node_modules/ora": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", @@ -13243,6 +13281,17 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue2-datepicker": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.8.2.tgz", + "integrity": "sha512-GUoNLyzPl3Xi7ruSQFF59BzMXWuflxzP9yM3P4ARz9GfhzLLFgYVLAEkJi6DNQU7zozBMzz+VNIQDwPaDNMo6Q==", + "dependencies": { + "date-format-parse": "^0.2.6" + }, + "peerDependencies": { + "vue": "^2.5.0" + } + }, "node_modules/vuex": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.0.tgz", @@ -14275,6 +14324,14 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "node_modules/wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/worker-farm": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", @@ -18508,6 +18565,11 @@ "assert-plus": "^1.0.0" } }, + "date-format-parse": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.6.tgz", + "integrity": "sha512-sdxnYAWmLopeb+6Hmw+vo3or4OCJOnh4+YoJ9p+Id3o2EnNP0INpTqx7wr8UregfMpgaSZAH473R/ytiaB3gVg==" + }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -20369,6 +20431,14 @@ "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" }, + "import": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/import/-/import-0.0.6.tgz", + "integrity": "sha1-0Ot534aqJnfG22FXilISswMeYEI=", + "requires": { + "optimist": "0.3.x" + } + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -21142,6 +21212,11 @@ "yallist": "^3.0.2" } }, + "luxon": { + "version": "1.25.0", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.25.0.tgz", + "integrity": "sha512-hEgLurSH8kQRjY6i4YLey+mcKVAWXbDNlZRmM6AgWDJ1cY3atl8Ztf5wEY7VBReFbmGnwQPz7KYJblL8B2k0jQ==" + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -21938,6 +22013,14 @@ } } }, + "optimist": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", + "requires": { + "wordwrap": "~0.0.2" + } + }, "ora": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", @@ -25368,6 +25451,14 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue2-datepicker": { + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.8.2.tgz", + "integrity": "sha512-GUoNLyzPl3Xi7ruSQFF59BzMXWuflxzP9yM3P4ARz9GfhzLLFgYVLAEkJi6DNQU7zozBMzz+VNIQDwPaDNMo6Q==", + "requires": { + "date-format-parse": "^0.2.6" + } + }, "vuex": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.0.tgz", @@ -26186,6 +26277,11 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + }, "worker-farm": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", diff --git a/package.json b/package.json index 0bbf0fd..dbd141b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,9 @@ "bootstrap-vue": "^2.19.0", "express": "^4.17.1", "file-saver": "^2.0.5", + "import": "^0.0.6", "jszip": "^3.5.0", + "luxon": "^1.25.0", "mkdirp": "^0.5.5", "multilang-extract-comments": "^0.3.3", "socket.io": "^3.0.3", @@ -29,6 +31,7 @@ "vue-socket.io-extended": "^4.0.5", "vue-sweetalert2": "^4.1.1", "vue-template-compiler": "^2.6.12", + "vue2-datepicker": "^3.8.2", "vuex": "^3.6.0" }, "devDependencies": { diff --git a/src/components/doclive/AdhocView.vue b/src/components/doclive/AdhocView.vue index 998a116..2718698 100644 --- a/src/components/doclive/AdhocView.vue +++ b/src/components/doclive/AdhocView.vue @@ -441,8 +441,13 @@ export default { // from runLLO this.$root.$on('playground_log_in', (path) => { //this.$nextTick(function () { - var logtmp = store.getters['pipelineLLO/getlog']; - //console.log('logtmp '+ JSON.stringify(logtmp)) + var restapi = store.getters['pipelineLLO/getrestapi']; + if(restapi == "off"){ // rest off ara socket + var logtmp = store.getters['pipelineLLO/getlog']; + }else if(restapi == "on"){ // rest on ara read from rest not from socket + var logtmp = store.getters['pipelineLLO/getmongolog']; + } + console.log('logtmp-roi '+ JSON.stringify(logtmp)) var itemlog = '' this.code = '' itemlog = logtmp.filter(item1 => item1.tailed_path === path); diff --git a/src/components/doclive/runLlo.vue b/src/components/doclive/runLlo.vue index 3c9fbbc..cf15acf 100644 --- a/src/components/doclive/runLlo.vue +++ b/src/components/doclive/runLlo.vue @@ -7,90 +7,142 @@