glib-web 2.3.0 → 2.4.0

package/components/fields/richText.vue

@@ -1,8 +1,8 @@
 <template>
   <div :style="$styles()" :class="$classes()">
     <v-tabs v-model="mode" fixed-tabs>
-      <v-tab>Editor</v-tab>
-      <v-tab>Code</v-tab>
+      <v-tab @click="onRichTextClicked">Editor</v-tab>
+      <v-tab @click="onRawTextClicked">Code</v-tab>
     </v-tabs>
 
     <v-progress-linear v-if="showProgress" v-model="progress.value" />
@@ -11,22 +11,22 @@
     <VueEditor
       v-if="!rawMode"
       id="rich-editor"
-      v-model="htmlValue"
+      v-model="richEditorValue"
       :editor-toolbar="customToolbar"
       use-custom-image-handler
-      @text-change="onEditorChange"
+      @text-change="onRichTextEditorChanged"
       @image-added="uploadImage"
+      :editorOptions="editorSettings"
     />
     <!-- Hide these fields but don't remove them because these are the values that will get submitted. -->
     <div :style="{ display: rawMode ? 'block' : 'none' }">
       <v-textarea
         id="raw-editor"
-        v-model="producedValue"
-        :name="spec.name"
+        v-model="rawEditorValue"
         :style="$styles()"
         :class="$classes()"
         :outlined="$classes().includes('outlined')"
-        @input="onCodeChange"
+        @input="onRawTextEditorChanged"
       ></v-textarea>
       <v-text-field
         v-for="(imageKey, index) in imageKeys"
@@ -39,6 +39,7 @@
         :value="images[imageKey]"
       />
     </div>
+    <input type="hidden" :name="spec.name" :value="producedValue" />
   </div>
 </template>
 
@@ -47,29 +48,156 @@ import Uploader from "../../utils/uploader";
 import { VueEditor, Quill } from "vue2-editor";
 import TurndownService from "turndown";
 import { gfm } from "turndown-plugin-gfm";
+import eventFiltering from "../../utils/eventFiltering";
+import QuillImageDropAndPaste from "quill-image-drop-and-paste";
+import bus from "../../utils/eventBus";
+
+Quill.register("modules/imageDropAndPaste", QuillImageDropAndPaste);
+
+var ImageBlot = Quill.import("formats/image");
+ImageBlot.sanitize = function (url) {
+  return url;
+};
+
+class Parser {
+  static markdownToHtml(data) {
+    return Utils.format.markdownForEditor(data);
+  }
+
+  static htmlToMarkdown(data) {
+    const turndownService = new TurndownService({ headingStyle: "atx" });
+    turndownService.use(gfm);
+    turndownService.addRule("strikethrough", {
+      filter: ["del", "s", "strike"],
+      replacement: function (content) {
+        return "~~" + content + "~~";
+      },
+    });
+
+    turndownService.addRule("codeblock", {
+      filter: ["pre"],
+      replacement: function (content) {
+        return "```\n" + content + "```";
+      },
+    });
+    return turndownService.turndown(data);
+  }
+}
+
+class TextEditor {
+  constructor(context) {
+    this.context = context;
+  }
+
+  // input and output should be either 'html' or 'markdown'
+  producedValue(data, input, output) {
+    if (output == "markdown") {
+      return this.markdownValue(this.replaceWithFakeImage(data), input);
+    } else if (output == "html") {
+      return this.replaceWithFakeImage(this.htmlValue(data, input));
+    }
+  }
+
+  markdownValue(data, input = "html") {
+    if (input == "html") {
+      return Parser.htmlToMarkdown(data);
+    } else if (input == "markdown") {
+      return data;
+    }
+  }
+
+  htmlValue(data, input) {
+    if (input == "html") {
+      return data;
+    } else if (input == "markdown") {
+      return Parser.markdownToHtml(data);
+    }
+  }
+
+  markdownValueWithRealImage(data, input) {
+    return this.markdownValue(this.replaceWithRealImage(data), input);
+  }
+
+  htmlValueWithRealImage(data, input) {
+    return this.htmlValue(this.replaceWithRealImage(data), input);
+  }
+
+  // replace {{image1}} to real image1 url
+  replaceWithRealImage(html) {
+    const vm = this.context;
+    return html.replace(/\{\{image([0-9]+)\}\}/g, function (_, index) {
+      const image = vm.spec.images[index - 1];
+      if (
+        image &&
+        vm.$type.isString(image.value) &&
+        vm.$type.isString(image.fileUrl)
+      ) {
+        const url = image.fileUrl;
+        const key = url.hashCode().toString();
+        vm.images[key] = image.value;
+        return url;
+      }
+      return "{{IMAGE_NOT_FOUND}}";
+    });
+  }
+
+  // replace image1 url with {{image1}}
+  replaceWithFakeImage(html) {
+    const vm = this.context;
+    let index = 0;
+    vm.imageKeys.clear();
+    return html.replace(/src="([^"]+)"|\!\[\]\((.+)\)/g, function (_, g1, g2) {
+      var imageValue = g1 || g2;
+      // It seems that quill encodes '&' in the URL to '&amp;' which would screw up key matching.
+      var decodedValue = imageValue.replace(/&amp;/g, "&");
+      const key = decodedValue.hashCode().toString();
+      vm.imageKeys.push(key);
+      if (g1) {
+        return `src="{{image${++index}}}"`;
+      } else {
+        return `{{image${++index}}}`;
+      }
+    });
+  }
+}
 
 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"],
     ],
-    htmlValue: "",
-    cleanValue: null,
+    editorSettings: {
+      modules: {
+        imageDropAndPaste: {
+          // add an custom image handler
+          handler: function (imageDataUrl, type, imageData) {
+            bus.$emit("richText/dropOrPaste", {
+              file: imageData.toFile(),
+              editor: this.quill,
+              cursorLocation: this.getIndex(),
+            });
+          },
+        },
+      },
+    },
+    richEditorValue: "",
+    rawEditorValue: "",
     producedValue: "",
     images: {},
     imageKeys: [],
     progress: { value: -1 },
     imageUploader: {},
-    produce: null,
+    textEditor: null,
     mode: null,
-    turndownService: new TurndownService({ headingStyle: "atx" })
+    produce: null,
+    accept: null,
   }),
   computed: {
     showProgress() {
@@ -77,88 +205,37 @@ export default {
     },
     rawMode() {
       return this.mode == 1;
-    }
-  },
-  watch: {
-    cleanValue(val, oldVal) {
-      if (oldVal == null) {
-        // Don't update `producedValue` if this is first-time initialization to preserve the original value.
-        return;
-      }
-      switch (this.produce) {
-        case "html":
-          this.producedValue = val;
-          break;
-        case "markdown":
-          this.producedValue = this.turndownService.turndown(val);
-          break;
-        default:
-          console.log(`Unsupported format: ${this.produce}`);
-      }
     },
-    producedValue(val) {
-      switch (this.produce) {
-        case "html":
-          this.htmlValue = val;
-          break;
-        case "markdown":
-          this.htmlValue = this.toHtmlValue(val);
-          break;
-        default:
-          console.log(`Unsupported format: ${this.produce}`);
-      }
-    }
   },
+  watch: {},
   mounted() {
-    this.registerScrollEvent();
+    bus.$on("richText/dropOrPaste", ({ file, editor, cursorLocation }) =>
+      this.uploadImage(file, editor, cursorLocation)
+    );
   },
   methods: {
     $ready() {
       this.produce = this.spec.produce || "markdown";
+      this.accept = this.spec.accept || "markdown";
 
-      this.turndownService.use(gfm);
-      this.turndownService.addRule("strikethrough", {
-        filter: ["del", "s", "strike"],
-        replacement: function(content) {
-          return "~~" + content + "~~";
-        }
-      });
-
-      this.turndownService.addRule("codeblock", {
-        filter: ["pre"],
-        replacement: function(content) {
-          return "```\n" + content + "```";
-        }
-      });
-
+      this.textEditor = new TextEditor(this);
       this.imageUploader = this.spec.imageUploader;
 
-      // Convert initial markdown value to html for displaying.
-      this.producedValue = this.spec.value || "";
-      this.htmlValue = this.toHtmlValue(this.producedValue);
-    },
-    toHtmlValue(producedValue) {
-      const vm = this;
-      var value = producedValue.replace(/\{\{image([0-9]+)\}\}/g, function(
-        _,
-        index
-      ) {
-        const image = vm.spec.images[index - 1];
-        if (
-          image &&
-          vm.$type.isString(image.value) &&
-          vm.$type.isString(image.fileUrl)
-        ) {
-          const url = image.fileUrl;
-          const key = url.hashCode().toString();
-          vm.images[key] = image.value;
-          return url;
-        }
-        return "{{IMAGE_NOT_FOUND}}";
-      });
-      return this.produce == "markdown" ? Utils.format.markdown(value) : value;
+      this.richEditorValue = this.textEditor.htmlValueWithRealImage(
+        this.spec.value,
+        this.accept
+      );
+      this.rawEditorValue = this.textEditor.markdownValueWithRealImage(
+        this.spec.value,
+        this.accept
+      );
+      this.producedValue = this.textEditor.producedValue(
+        this.spec.value,
+        this.accept,
+        this.produce
+      );
     },
-    uploadImage: function(file, editor, cursorLocation) {
+    uploadImage: function (file, editor, cursorLocation) {
       let vm = this;
       const uploaderSpec = this.imageUploader;
       // const input = this.$refs.directUploadFile
@@ -175,6 +252,7 @@ export default {
         upload.start((error, blob) => {
           if (error) {
             // Handle the error
+            console.error(error);
           } else {
             vm.insertImage(file, editor, cursorLocation, blob);
           }
@@ -184,17 +262,43 @@ export default {
         });
       }
     },
-    onEditorChange() {
-      this.separateOutImages();
-      this.onCodeChange();
+    onRichTextClicked() {
+      this.richEditorValue = this.textEditor.htmlValue(
+        this.rawEditorValue,
+        "markdown"
+      );
+    },
+    onRawTextClicked() {
+      this.rawEditorValue = this.textEditor.markdownValue(
+        this.richEditorValue,
+        "html"
+      );
     },
-    onCodeChange() {
-      Utils.type.ifObject(this.spec.onChange, onChange => {
+    onRichTextEditorChanged: eventFiltering.debounce(function () {
+      this.producedValue = this.textEditor.producedValue(
+        this.richEditorValue,
+        "html",
+        this.produce
+      );
+
+      this.onChange(this.producedValue);
+    }),
+    onRawTextEditorChanged: eventFiltering.debounce(function () {
+      this.producedValue = this.textEditor.producedValue(
+        this.rawEditorValue,
+        "markdown",
+        this.produce
+      );
+
+      this.onChange(this.producedValue);
+    }),
+    onChange(producedValue) {
+      Utils.type.ifObject(this.spec.onChange, (onChange) => {
         this.$nextTick(() => {
           const params = {
             [this.spec.paramNameForFormData || "formData"]: {
-              [this.fieldName]: this.fieldModel
-            }
+              [this.fieldName]: producedValue,
+            },
           };
 
           const data = Object.assign({}, onChange, params);
@@ -202,32 +306,16 @@ export default {
         });
       });
     },
-    separateOutImages: function() {
-      const vm = this;
-      var index = 0;
-      vm.imageKeys.clear();
-      // TODO: Fix to avoid replacing <video src="">
-      this.cleanValue = this.htmlValue.replace(/src="([^"]+)"/g, function(
-        _,
-        imageValue
-      ) {
-        // It seems that quill encodes '&' in the URL to '&amp;' which would screw up key matching.
-        var decodedValue = imageValue.replace(/&amp;/g, "&");
-        const key = decodedValue.hashCode().toString();
-        vm.imageKeys.push(key);
-        return `src="{{image${++index}}}"`;
-      });
-    },
-    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 = e.target.result;
+          image.src = URL.createObjectURL(file);
 
-          image.onload = function() {
+          image.onload = function () {
             Editor.insertEmbed(cursorLocation, "image", image.src);
           };
 
@@ -238,7 +326,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`;
@@ -251,7 +339,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");
@@ -264,8 +352,8 @@ export default {
           this.updateToolbar(wrapper, toolbar, container)
         );
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

package/components/fields/select.vue

@@ -24,7 +24,7 @@ export default {
     },
     action_merge(mergedSpec) {
       Object.assign(this.updatedSpec, mergedSpec);
-      this.$refs.delegate.updateData();
+      this.$refs.delegate.updateData(true);
     }
   }
 };

package/components/h4.vue

@@ -17,6 +17,11 @@ export default {
   mixins: [textMixin],
   props: {
     spec: { type: Object, required: true }
+  },
+  methods: {
+    action_merge(mergedSpec) {
+      Object.assign(this.spec, mergedSpec);
+    }
   }
 };
 </script>

package/components/mixins/events.js

@@ -177,6 +177,20 @@ export default {
         this._typingTimer = null;
         GLib.action.execute(this.spec.onTypeEnd, this);
       }, duration);
+    },
+    $executeOnChange(newValue) {
+      Utils.type.ifObject(this.spec.onChange, onChange => {
+        this.$nextTick(() => {
+          const value = newValue || this.fieldModel;
+          const params = {
+            [this.spec.paramNameForFormData || "formData"]: {
+              [this.fieldName]: value
+            }
+          };
+          const data = Object.assign({}, onChange, params);
+          GLib.action.execute(data, this);
+        });
+      });
     }
   }
 };

package/components/mixins/generic.js

@@ -5,7 +5,7 @@ export default {
       while (parent != null) {
         if (
           Utils.type.isObject(parent.spec) &&
-          Utils.app.vueName(parent) == name
+          GLib.component.vueName(parent) == name
         ) {
           return parent;
         }

package/components/mixins/styles.js

@@ -191,7 +191,7 @@ export default {
     },
     _linkFieldModels() {
       const hasCondition = this.spec && this.spec.showIf;
-      const name = Utils.app.vueName(this);
+      const name = GLib.component.vueName(this);
       const isField = name && name.startsWith("fields-");
       if (hasCondition || isField) {
         const form = this.$closest("panels-form");
@@ -205,8 +205,11 @@ export default {
         this.fieldModel = this._sanitizeValue(this.spec.value);
       }
     },
-    $classes(spec) {
-      const properties = spec || this.spec;
+    $classes(spec, defaultViewName) {
+      const properties = Object.assign(
+        { view: defaultViewName },
+        spec || this.spec
+      );
       const componentName = Utils.app.componentName(properties.view);
       const classes = (properties.styleClasses || []).concat(componentName);
 

package/components/panels/horizontal.vue

@@ -6,7 +6,7 @@
     :href="$href()"
     @click="$onClick()"
   >
-    <template v-for="(item, index) in spec.childViews">
+    <template v-for="(item, index) in childViews">
       <glib-component :key="index" :spec="item" />
     </template>
   </component>
@@ -17,6 +17,11 @@ export default {
   props: {
     spec: { type: Object, required: true }
   },
+  data() {
+    return {
+      childViews: null
+    };
+  },
   computed: {
     cssClasses: function() {
       const classes = this.$classes().concat("layouts-horizontal");
@@ -58,8 +63,19 @@ export default {
     }
   },
   methods: {
+    $ready() {
+      this.childViews = this.spec.childViews;
+      console.log("C1", this.childViews);
+    },
     $displayValue() {
       return "flex";
+    },
+    action_merge(mergedSpec) {
+      console.log("mergedSpec1", this.spec, this.spec.childViews);
+      Object.assign(this.spec, mergedSpec);
+      console.log("mergedSpec2", this.spec, this.spec.childViews);
+      // this.$refs.delegate.updateData();
+      this.$ready();
     }
   }
 };

package/components/panels/timeline.vue

@@ -1,35 +1,46 @@
 <template>
-  <v-container :class="$classes()">
+  <!-- Paddings cannot be applied to v-timeline directly -->
+  <div :style="$styles()" :class="$classes()">
     <v-timeline v-if="events" dense align-top>
       <v-timeline-item
         v-for="(item, index) in events"
         :key="index"
-        color="white"
-        fill-dot
-        :small="$classes().includes('small')"
-        :large="$classes().includes('large')"
-        class="my-6"
+        :color="item.backgroundColor || 'white'"
+        :small="itemClasses(item).includes('small')"
+        :large="itemClasses(item).includes('large')"
         :hide-dot="item.hide_dot"
+        fill-dot
       >
         <template v-slot:icon>
-          <div :class="$classes().includes('outlined') ? 'outlined-dots' : ''">
-            <div v-if="item.label" class="number-circle">
-              {{ item.label }}
+          <div
+            :class="
+              itemClasses(item).includes('outlined') ? 'outlined-dots' : ''
+            "
+          >
+            <div
+              v-if="item.text"
+              class="number-circle"
+              :style="{ color: item.color }"
+            >
+              {{ item.text }}
             </div>
             <div v-else class="icon">
               <common-icon
                 :spec="{
-                  material: { name: item.icon, size: iconSize() },
+                  material: { name: item.icon, size: iconSize(item) },
                   color: item.color
                 }"
               />
             </div>
           </div>
         </template>
-        <panels-responsive :spec="{ childViews: [childViews[index]] }" />
+        <panels-responsive
+          v-if="childViews"
+          :spec="{ childViews: [childViews[index]] }"
+        />
       </v-timeline-item>
     </v-timeline>
-  </v-container>
+  </div>
 </template>
 
 <script>
@@ -48,19 +59,38 @@ export default {
       this.events = this.spec.events;
       this.childViews = this.spec.childViews;
     },
-    iconSize() {
-      return this.$classes().includes("small") ? 16 : 24;
+    iconSize(item) {
+      return this.itemClasses(item).includes("small") ? 20 : 24;
+    },
+    itemClasses(item) {
+      return item.styleClasses || [];
+    },
+    action_merge(mergedSpec) {
+      Object.assign(this.spec, mergedSpec);
+      this.$ready();
     }
   }
 };
 </script>
 
+<style lang="scss">
+.v-timeline-item__dot {
+  height: 36px;
+  width: 36px;
+}
+.v-timeline-item__dot--small {
+  height: 20px;
+  width: 20px;
+}
+</style>
+
 <style lang="scss" scoped>
 .v-timeline {
   padding-top: 0px;
 }
 .v-timeline-item {
-  padding-bottom: 0px !important;
+  // Minimum line distance
+  padding-bottom: 10px;
 }
 .container {
   padding-top: 0px;
@@ -73,7 +103,8 @@ export default {
   margin: auto;
   text-align: center;
   font-weight: bold;
-  font-size: 22px;
+  padding: 4px 0;
+  // font-size: 22px;
 }
 .outlined .v-timeline-item {
   ::v-deep .v-timeline-item__dot {

package/extensions/array.js

@@ -22,3 +22,7 @@ Array.prototype.first = function() {
 Array.prototype.last = function() {
   return this[this.length - 1];
 };
+
+Array.prototype.random = function() {
+  return this[Math.floor(Math.random() * this.length)];
+};

package/extensions/string.js

@@ -19,3 +19,7 @@ String.prototype.contains = function(substr) {
 String.prototype.presence = function() {
   return this.length > 0 ? this.toString() : null;
 };
+
+String.prototype.truncate = function(n) {
+  return this.length > n ? this.slice(0, n - 1) + "..." : this.toString();
+};