From f629de137cd77c4c0bc9001c6d2ed8a91f694be9 Mon Sep 17 00:00:00 2001 From: Michael Matveev Date: Fri, 30 Jul 2021 12:51:44 +0300 Subject: [PATCH] Bugfixes --- package-lock.json | 86 +++++++++---------- package.json | 2 +- .../marko/components/mform/component.js | 3 + .../components/mform/mField/component.js | 22 +++-- 4 files changed, 60 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb39a9a1..67bb6553 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "zoia3", - "version": "3.1.85", + "version": "3.1.86", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "zoia3", - "version": "3.1.85", + "version": "3.1.86", "license": "MIT", "dependencies": { "@node-minify/core": "^6.2.0", @@ -39,7 +39,7 @@ "lodash.clonedeep": "^4.5.0", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", - "marko": "^5.14.2", + "marko": "^5.15.0", "mime-types": "^2.1.32", "mongodb": "^4.0.1", "nodemailer": "^6.6.3", @@ -63,7 +63,7 @@ "@babel/plugin-transform-runtime": "^7.14.5", "@babel/preset-env": "^7.14.8", "@ckeditor/ckeditor5-build-classic": "^29.0.0", - "@marko/compiler": "^5.14.2", + "@marko/compiler": "^5.15.0", "@marko/prettyprint": "^3.0.1", "@marko/webpack": "^9.0.3", "@mdi/font": "^5.9.55", @@ -98,7 +98,7 @@ "webpack": "^5.47.0", "webpack-cli": "^4.7.2", "webpack-fix-style-only-entries": "^0.6.1", - "webpack-sources": "^3.0.2" + "webpack-sources": "^3.0.4" } }, "node_modules/@babel/code-frame": { @@ -2503,9 +2503,9 @@ } }, "node_modules/@marko/babel-utils": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.14.2.tgz", - "integrity": "sha512-Te5164hYDKUSBtF0qz4IfiIh6oHgQhgSrDRilew8zMvkrbjNHl5peYpiJtoSLAONgdfCis88lU9Aoyq62Jh1pQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.15.0.tgz", + "integrity": "sha512-m5kDoaOFk3oON20Igs6LguSmx2mKhF1XvS70EJC2PWFmaWAnpY0m9QtjPjYbOsdV6zGeh0/AYlF2T9RdBDsetA==", "dependencies": { "@babel/runtime": "^7.13.10", "jsesc": "^3.0.2" @@ -2523,9 +2523,9 @@ } }, "node_modules/@marko/compiler": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.14.2.tgz", - "integrity": "sha512-Rp32ozHMLLTn7yNxFpLE1SUgs0vJ9dnbthPRw6BGNzdAKkuaX9EqbvoNV6hJVPnJhGsN+8POjWgKPX6d7D8Ogw==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.15.0.tgz", + "integrity": "sha512-Leco8Ng94pdsYbaV7rNGW6oQB/1k6bk6j9IsTLwHKnLVVtBDRu4QdudLZ3cWG6RdbUTp52q29pvfkPjZcuzLmg==", "dependencies": { "@babel/code-frame": "^7.12.13", "@babel/core": "^7.13.10", @@ -2535,7 +2535,7 @@ "@babel/runtime": "^7.13.10", "@babel/traverse": "^7.13.0", "@babel/types": "^7.13.0", - "@marko/babel-utils": "^5.14.2", + "@marko/babel-utils": "^5.15.0", "complain": "^1.6.0", "enhanced-resolve": "5.7.0", "he": "^1.2.0", @@ -2751,12 +2751,12 @@ } }, "node_modules/@marko/translator-default": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.14.2.tgz", - "integrity": "sha512-yYDq4vWc7Uzfp368QVW9aLcKh19tiStUJzh08It6mZocwn6tuEEuImpMoytBIn89C/80u3STjj/foy4GEbXkZg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.15.0.tgz", + "integrity": "sha512-BUjfy4DNW5oGiXCto4gJVCgMzo2ZiCei2mny5b3Ee2qld7sjBXK4dnL0GnnuYBSIoNYnjBLQt8L1llH/kivAzg==", "dependencies": { "@babel/runtime": "^7.13.10", - "@marko/babel-utils": "^5.14.2", + "@marko/babel-utils": "^5.15.0", "escape-string-regexp": "^4.0.0", "magic-string": "^0.25.7", "self-closing-tags": "^1.0.1" @@ -10315,12 +10315,12 @@ } }, "node_modules/marko": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/marko/-/marko-5.14.2.tgz", - "integrity": "sha512-qZ/Nu5kKA4fCUXeTwOhdpg4Ve2VQuW1l30FCuJgkUhye6K5BTpe5GdyeUERCmhhY1NNnMdqwtd/3VwVYPE4VFg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/marko/-/marko-5.15.0.tgz", + "integrity": "sha512-hGHjgXTBi+isumO3Io9aRYBxKpx4ly2xq7pj7JronccPBpHdlVLrXMuy1JI7KU4chefxZQRg5tlH6VwcRk2VQA==", "dependencies": { - "@marko/compiler": "^5.14.2", - "@marko/translator-default": "^5.14.2", + "@marko/compiler": "^5.15.0", + "@marko/translator-default": "^5.15.0", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -20003,9 +20003,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.0.2.tgz", - "integrity": "sha512-XQ6aGLmqoxZtmpbgwySGhYLNFav1W6+qgMWPGgn6qScxfGrQgMdigkUqZXQ7oB0ydUrvfs9RRyHaSfV153K8Xg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.1.tgz", + "integrity": "sha512-ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ==", "dev": true, "engines": { "node": ">=10.13.0" @@ -22173,9 +22173,9 @@ } }, "@marko/babel-utils": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.14.2.tgz", - "integrity": "sha512-Te5164hYDKUSBtF0qz4IfiIh6oHgQhgSrDRilew8zMvkrbjNHl5peYpiJtoSLAONgdfCis88lU9Aoyq62Jh1pQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/babel-utils/-/babel-utils-5.15.0.tgz", + "integrity": "sha512-m5kDoaOFk3oON20Igs6LguSmx2mKhF1XvS70EJC2PWFmaWAnpY0m9QtjPjYbOsdV6zGeh0/AYlF2T9RdBDsetA==", "requires": { "@babel/runtime": "^7.13.10", "jsesc": "^3.0.2" @@ -22189,9 +22189,9 @@ } }, "@marko/compiler": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.14.2.tgz", - "integrity": "sha512-Rp32ozHMLLTn7yNxFpLE1SUgs0vJ9dnbthPRw6BGNzdAKkuaX9EqbvoNV6hJVPnJhGsN+8POjWgKPX6d7D8Ogw==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/compiler/-/compiler-5.15.0.tgz", + "integrity": "sha512-Leco8Ng94pdsYbaV7rNGW6oQB/1k6bk6j9IsTLwHKnLVVtBDRu4QdudLZ3cWG6RdbUTp52q29pvfkPjZcuzLmg==", "requires": { "@babel/code-frame": "^7.12.13", "@babel/core": "^7.13.10", @@ -22201,7 +22201,7 @@ "@babel/runtime": "^7.13.10", "@babel/traverse": "^7.13.0", "@babel/types": "^7.13.0", - "@marko/babel-utils": "^5.14.2", + "@marko/babel-utils": "^5.15.0", "complain": "^1.6.0", "enhanced-resolve": "5.7.0", "he": "^1.2.0", @@ -22372,12 +22372,12 @@ } }, "@marko/translator-default": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.14.2.tgz", - "integrity": "sha512-yYDq4vWc7Uzfp368QVW9aLcKh19tiStUJzh08It6mZocwn6tuEEuImpMoytBIn89C/80u3STjj/foy4GEbXkZg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/@marko/translator-default/-/translator-default-5.15.0.tgz", + "integrity": "sha512-BUjfy4DNW5oGiXCto4gJVCgMzo2ZiCei2mny5b3Ee2qld7sjBXK4dnL0GnnuYBSIoNYnjBLQt8L1llH/kivAzg==", "requires": { "@babel/runtime": "^7.13.10", - "@marko/babel-utils": "^5.14.2", + "@marko/babel-utils": "^5.15.0", "escape-string-regexp": "^4.0.0", "magic-string": "^0.25.7", "self-closing-tags": "^1.0.1" @@ -28498,12 +28498,12 @@ } }, "marko": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/marko/-/marko-5.14.2.tgz", - "integrity": "sha512-qZ/Nu5kKA4fCUXeTwOhdpg4Ve2VQuW1l30FCuJgkUhye6K5BTpe5GdyeUERCmhhY1NNnMdqwtd/3VwVYPE4VFg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/marko/-/marko-5.15.0.tgz", + "integrity": "sha512-hGHjgXTBi+isumO3Io9aRYBxKpx4ly2xq7pj7JronccPBpHdlVLrXMuy1JI7KU4chefxZQRg5tlH6VwcRk2VQA==", "requires": { - "@marko/compiler": "^5.14.2", - "@marko/translator-default": "^5.14.2", + "@marko/compiler": "^5.15.0", + "@marko/translator-default": "^5.15.0", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -35753,9 +35753,9 @@ } }, "webpack-sources": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.0.2.tgz", - "integrity": "sha512-XQ6aGLmqoxZtmpbgwySGhYLNFav1W6+qgMWPGgn6qScxfGrQgMdigkUqZXQ7oB0ydUrvfs9RRyHaSfV153K8Xg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.1.1.tgz", + "integrity": "sha512-ztUmIWq0LWaw+1YyR3bXtUPjt8vQedtI9WxGn/q1V1ASHsombnaso7MN9S25lzKS/OuC9Q8lEg3GsZexjDbdlQ==", "dev": true }, "whatwg-url": { diff --git a/package.json b/package.json index 1c420821..fe3211d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zoia3", - "version": "3.1.85", + "version": "3.1.86", "description": "ZOIA Content Management System", "scripts": { "config": "node ./dev/bin/config.js", diff --git a/src/shared/marko/components/mform/component.js b/src/shared/marko/components/mform/component.js index 2edc715d..fcdb6514 100644 --- a/src/shared/marko/components/mform/component.js +++ b/src/shared/marko/components/mform/component.js @@ -563,6 +563,9 @@ module.exports = class { if (field.type === "datepicker") { valueProcess = value; } + if (field.tags) { + valueProcess = value && typeof value === "string" ? value.split(",").map(v => v.trim()) : []; + } return valueProcess; } diff --git a/src/shared/marko/components/mform/mField/component.js b/src/shared/marko/components/mform/mField/component.js index db9d99b9..3b98c787 100644 --- a/src/shared/marko/components/mform/mField/component.js +++ b/src/shared/marko/components/mform/mField/component.js @@ -205,15 +205,19 @@ module.exports = class { } updateDatePicker(value) { - this.calendarField.func.setDate(value); - this.setState("calendarValue", value); - const dateObject = typeof value === "string" ? parse(value, "yyyyMMdd", new Date()) : value; - this.setState("calendarValueText", format(dateObject, this.i18n.t("global.dateFormatShort"))); - this.emit("value-change", { - type: "datepicker", - id: this.state.item.id, - value: dateObject, - }); + if (value) { + this.calendarField.func.setDate(value); + this.setState("calendarValue", value); + const dateObject = typeof value === "string" ? parse(value, "yyyyMMdd", new Date()) : value; + this.setState("calendarValueText", format(dateObject, this.i18n.t("global.dateFormatShort"))); + this.emit("value-change", { + type: "datepicker", + id: this.state.item.id, + value: dateObject, + }); + } else { + this.setState("calendarValueText", ""); + } } async onMount() {