glib-web 2.6.1 → 2.6.2

package/actions/forms/submit.js

@@ -1,7 +1,10 @@
 export default class {
   execute(properties, component) {
-    component.$dispatchEvent("forms/directSubmit", {
-      url: properties.overrideUrl
-    });
+    setTimeout(() => {
+      component.$dispatchEvent("forms/directSubmit", {
+        url: properties.overrideUrl
+      });
+    }, 500)
+
   }
 }

package/components/fields/checkGroup.vue

@@ -29,17 +29,17 @@ export default {
   //   "fields-hidden": HiddenField
   // },
   props: {
-    spec: { type: Object, required: true }
+    spec: { type: Object, required: true },
   },
   data() {
     return {
       anyChecked: false,
       errorMessage: null,
       rules: [
-        _v => {
+        (_v) => {
           return this.anyChecked || this.errorMessage || true;
-        }
-      ]
+        },
+      ],
     };
   },
   // computed: {
@@ -51,7 +51,7 @@ export default {
     $ready() {
       const validation = this.spec.validation || {};
 
-      Utils.type.ifObject(validation.required, required => {
+      Utils.type.ifObject(validation.required, (required) => {
         this.errorMessage = required.message;
       });
 
@@ -59,7 +59,7 @@ export default {
       const vm = this;
       this.$el.addEventListener(
         "change",
-        function(e) {
+        function (e) {
           vm.detectChecked();
         },
         false
@@ -70,7 +70,7 @@ export default {
       const vm = this;
       this.$el
         .querySelectorAll("input[type=checkbox]")
-        .forEach(function(checkbox) {
+        .forEach(function (checkbox) {
           if (checkbox.checked) {
             vm.anyChecked = true;
             return;
@@ -79,12 +79,15 @@ export default {
     },
     childSpec(item) {
       if (this.spec.readOnly) {
-        return Object.assign(item, { readOnly: this.spec.readOnly });
+        return Object.assign(item, {
+          readOnly: this.spec.readOnly,
+          onChange: this.spec.onChange,
+        });
       }
 
-      return item;
-    }
-  }
+      return Object.assign(item, { onChange: this.spec.onChange });
+    },
+  },
 };
 </script>
 

package/components/fields/richText.vue

@@ -55,7 +55,7 @@ import bus from "../../utils/eventBus";
 Quill.register("modules/imageDropAndPaste", QuillImageDropAndPaste);
 
 var ImageBlot = Quill.import("formats/image");
-ImageBlot.sanitize = function(url) {
+ImageBlot.sanitize = function (url) {
   return url;
 };
 
@@ -69,16 +69,16 @@ class Parser {
     turndownService.use(gfm);
     turndownService.addRule("strikethrough", {
       filter: ["del", "s", "strike"],
-      replacement: function(content) {
+      replacement: function (content) {
         return "~~" + content + "~~";
-      }
+      },
     });
 
     turndownService.addRule("codeblock", {
       filter: ["pre"],
-      replacement: function(content) {
+      replacement: function (content) {
         return "```\n" + content + "```";
-      }
+      },
     });
     return turndownService.turndown(data);
   }
@@ -124,8 +124,12 @@ class TextEditor {
 
   // replace {{image1}} to real image1 url
   replaceWithRealImage(html) {
+    if (!html) {
+      return "";
+    }
+
     const vm = this.context;
-    return html.replace(/\{\{image([0-9]+)\}\}/g, function(_, index) {
+    return html.replace(/\{\{image([0-9]+)\}\}/g, function (_, index) {
       const image = vm.spec.images[index - 1];
       if (
         image &&
@@ -143,10 +147,14 @@ class TextEditor {
 
   // replace image1 url with {{image1}}
   replaceWithFakeImage(html) {
+    if (!html) {
+      return "";
+    }
+
     const vm = this.context;
     let index = 0;
     vm.imageKeys.clear();
-    return html.replace(/src="([^"]+)"|\!\[\]\((.+)\)/g, function(_, g1, g2) {
+    return html.replace(/src="([^"]+)"|\!\[\]\((.+)\)/g, function (_, g1, g2) {
       var imageValue = g1 || g2;
       // It seems that quill encodes '&' in the URL to '&' which would screw up key matching.
       var decodedValue = imageValue.replace(/&/g, "&");
@@ -164,28 +172,28 @@ class TextEditor {
 export default {
   components: { VueEditor },
   props: {
-    spec: { type: Object, required: true }
+    spec: { type: Object, required: true },
   },
   data: () => ({
     customToolbar: [
       ["bold", "italic", "strike"],
       [{ header: 1 }, { header: 2 }, { header: 3 }],
       [{ list: "ordered" }, { list: "bullet" }],
-      ["image", "link"]
+      ["image", "link"],
     ],
     editorSettings: {
       modules: {
         imageDropAndPaste: {
           // add an custom image handler
-          handler: function(imageDataUrl, type, imageData) {
+          handler: function (imageDataUrl, type, imageData) {
             bus.$emit("richText/dropOrPaste", {
               file: imageData.toFile(),
               editor: this.quill,
-              cursorLocation: this.getIndex()
+              cursorLocation: this.getIndex(),
             });
-          }
-        }
-      }
+          },
+        },
+      },
     },
     richEditorValue: "",
     rawEditorValue: "",
@@ -197,7 +205,7 @@ export default {
     textEditor: null,
     mode: null,
     produce: null,
-    accept: null
+    accept: null,
   }),
   computed: {
     showProgress() {
@@ -205,7 +213,7 @@ export default {
     },
     rawMode() {
       return this.mode == 1;
-    }
+    },
   },
   watch: {},
   mounted() {
@@ -235,7 +243,7 @@ export default {
         this.produce
       );
     },
-    uploadImage: function(file, editor, cursorLocation) {
+    uploadImage: function (file, editor, cursorLocation) {
       let vm = this;
       const uploaderSpec = this.imageUploader;
       // const input = this.$refs.directUploadFile
@@ -274,34 +282,34 @@ export default {
         "html"
       );
     },
-    onRichTextEditorChanged: eventFiltering.debounce(function() {
+    onRichTextEditorChanged: eventFiltering.debounce(function () {
       this.producedValue = this.textEditor.producedValue(
         this.richEditorValue,
         "html",
         this.produce
       );
 
-      this.$executeOnChange();
+      this.$executeOnChange(this.producedValue);
     }),
-    onRawTextEditorChanged: eventFiltering.debounce(function() {
+    onRawTextEditorChanged: eventFiltering.debounce(function () {
       this.producedValue = this.textEditor.producedValue(
         this.rawEditorValue,
         "markdown",
         this.produce
       );
 
-      this.$executeOnChange();
+      this.$executeOnChange(this.producedValue);
     }),
-    insertImage: function(file, Editor, cursorLocation, blob) {
+    insertImage: function (file, Editor, cursorLocation, blob) {
       let vm = this;
       var reader = new FileReader();
-      reader.onload = function(e) {
+      reader.onload = function (e) {
         // vm.fileUrl = e.target.result;
         if (file.type.indexOf("image") !== -1) {
           var image = new Image();
           image.src = URL.createObjectURL(file);
 
-          image.onload = function() {
+          image.onload = function () {
             Editor.insertEmbed(cursorLocation, "image", image.src);
           };
 
@@ -312,7 +320,7 @@ export default {
       reader.readAsDataURL(file);
       vm.progress.value = -1;
     },
-    updateToolbar: function(wrapper, toolbar, container) {
+    updateToolbar: function (wrapper, toolbar, container) {
       if (wrapper.scrollTop >= container.offsetTop) {
         toolbar.classList.add("sticky");
         toolbar.style.top = `${wrapper.offsetTop}px`;
@@ -325,7 +333,7 @@ export default {
         toolbar.style.width = "auto";
       }
     },
-    registerScrollEvent: function() {
+    registerScrollEvent: function () {
       const wrapper = document.querySelector(".v-dialog") || window;
       const toolbar = this.$el.querySelector(".ql-toolbar");
       const container = this.$el.querySelector(".ql-container");
@@ -338,8 +346,8 @@ export default {
           this.updateToolbar(wrapper, toolbar, container)
         );
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glib-web",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -47,4 +47,4 @@
     "prettier": "^1.18.2",
     "typescript": "^4.9.5"
   }
-}
+}