Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-26 21:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #437 from WebTools-NG/#424

Browse source 
#424 fixed
This commit is contained in:
Tommy Mikkelsen 2022-01-05 01:16:32 +01:00 committed by GitHub
commit 03bd86c8aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -13,6 +13,7 @@
* [#429 Allow setting the LogNumFiles from Settings](https://github.com/WebTools-NG/WebTools-NG/issues/429)
* [#435 Showing Rel Notes should only show current version](https://github.com/WebTools-NG/WebTools-NG/issues/435)
* [#424 Export for severs with special charters in server name](https://github.com/WebTools-NG/WebTools-NG/issues/424)
## V0.3.13 (20220102)

15
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "webtools-ng",
"version": "0.3.13",
"version": "0.3.14",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "webtools-ng",
"version": "0.3.13",
"version": "0.3.14",
"hasInstallScript": true,
"license": "MPL-2.0",
"dependencies": {
@ -34,6 +34,7 @@
"node-sass": "^6.0.0",
"popper.js": "^1.16.1",
"rimraf": "^2.7.1",
"sanitize-filename": "^1.6.3",
"secure-ls": "^1.2.6",
"uuid": "^8.3.1",
"vue": "^2.6.12",
@ -15806,7 +15807,6 @@
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
"integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
"dev": true,
"dependencies": {
"truncate-utf8-bytes": "^1.0.0"
}
@ -18126,7 +18126,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
"integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
"dev": true,
"dependencies": {
"utf8-byte-length": "^1.0.1"
}
@ -18664,8 +18663,7 @@
"node_modules/utf8-byte-length": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
"integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
"dev": true
"integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
},
"node_modules/util": {
"version": "0.11.1",
@ -33956,7 +33954,6 @@
"version": "1.6.3",
"resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
"integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
"dev": true,
"requires": {
"truncate-utf8-bytes": "^1.0.0"
}
@ -35918,7 +35915,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
"integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
"dev": true,
"requires": {
"utf8-byte-length": "^1.0.1"
}
@ -36368,8 +36364,7 @@
"utf8-byte-length": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
"integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
"dev": true
"integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E="
},
"util": {
"version": "0.11.1",

1
package.json
View file

@ -48,6 +48,7 @@
"node-sass": "^6.0.0",
"popper.js": "^1.16.1",
"rimraf": "^2.7.1",
"sanitize-filename": "^1.6.3",
"secure-ls": "^1.2.6",
"uuid": "^8.3.1",
"vue": "^2.6.12",

23
src/components/modules/ExportTools/scripts/ethelper.js
View file

@ -9,6 +9,7 @@ import filesize from 'filesize';
import Excel from 'exceljs';
var path = require("path");
var sanitize = require("sanitize-filename");
const log = require('electron-log');
console.log = log.log;
@ -1090,26 +1091,26 @@ const etHelper = new class ETHELPER {
const OutDir = wtconfig.get('General.ExportPath');
const timeStamp=dateFormat(new Date(), "yyyy.mm.dd_h.MM.ss");
const path = require('path');
let outFile = store.getters.getSelectedServer.name + '_';
outFile += this.Settings.LibName + '_';
outFile += this.Settings.fileMajor + '_';
outFile += this.Settings.fileMinor + '_';
outFile += this.Settings.levelName + '_';
outFile += 'Item ' + this.Settings.startItem + '-' + this.Settings.endItem + '_';
outFile += timeStamp + '.' + Type + '.tmp';
let arrFile = [];
arrFile.push(sanitize(store.getters.getSelectedServer.name));
arrFile.push(sanitize(this.Settings.LibName));
arrFile.push(this.Settings.fileMajor);
arrFile.push(this.Settings.fileMinor);
arrFile.push(this.Settings.levelName);
arrFile.push('Item ' + this.Settings.startItem + '-' + this.Settings.endItem);
arrFile.push(timeStamp + '.' + Type + '.tmp');
this.Settings.outFile = arrFile.join('_');
// Remove unwanted chars from outfile name
outFile = outFile.replaceAll('/', '_');
this.Settings.outFile = outFile;
const targetDir = path.join(
OutDir, wtutils.AppName, i18n.t('Modules.ET.Name'));
const outFileWithPath = path.join(
targetDir, outFile);
targetDir, this.Settings.outFile);
// Make sure target dir exists
const fs = require('fs')
if (!fs.existsSync(targetDir)) {
fs.mkdirSync(targetDir);
}
log.info(`OutFile ET is ${outFileWithPath}`);
log.info(`etHelper (getFileName) OutFile ET is ${outFileWithPath}`);
return outFileWithPath;
}