expressa 2.0.16 → 2.0.18

package/modules/admin/src/components/Hamburger/index.vue

@@ -1,62 +1,62 @@
-<template>
-  <div>
-    <svg
-      :class="{'is-active':isActive}"
-      t="1492500959545"
-      class="hamburger"
-      style=""
-      viewBox="0 0 1024 1024"
-      version="1.1"
-      xmlns="http://www.w3.org/2000/svg"
-      p-id="1691"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      width="64"
-      height="64"
-      @click="toggleClick"
-    >
-      <path
-        d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
-        p-id="1692"
-      />
-      <path
-        d="M966.8023 881.527125 57.196677 881.527125c-31.397081 0-56.850799-25.452695-56.850799-56.849776l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 856.07443 998.200404 881.527125 966.8023 881.527125z"
-        p-id="1693"
-      />
-      <path
-        d="M966.8023 256.17345 57.196677 256.17345c-31.397081 0-56.850799-25.452695-56.850799-56.849776l0 0c0-31.397081 25.452695-56.850799 56.850799-56.850799l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.850799l0 0C1023.653099 230.720755 998.200404 256.17345 966.8023 256.17345z"
-        p-id="1694"
-      />
-    </svg>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Hamburger',
-  props: {
-    isActive: {
-      type: Boolean,
-      default: false
-    },
-    toggleClick: {
-      type: Function,
-      default: null
-    }
-  }
-}
-</script>
-
-<style scoped>
-.hamburger {
-	display: inline-block;
-	cursor: pointer;
-	width: 20px;
-	height: 20px;
-	transform: rotate(90deg);
-	transition: .38s;
-	transform-origin: 50% 50%;
-}
-.hamburger.is-active {
-	transform: rotate(0deg);
-}
-</style>
+<template>
+  <div>
+    <svg
+      :class="{'is-active':isActive}"
+      t="1492500959545"
+      class="hamburger"
+      style=""
+      viewBox="0 0 1024 1024"
+      version="1.1"
+      xmlns="http://www.w3.org/2000/svg"
+      p-id="1691"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="64"
+      height="64"
+      @click="toggleClick"
+    >
+      <path
+        d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
+        p-id="1692"
+      />
+      <path
+        d="M966.8023 881.527125 57.196677 881.527125c-31.397081 0-56.850799-25.452695-56.850799-56.849776l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 856.07443 998.200404 881.527125 966.8023 881.527125z"
+        p-id="1693"
+      />
+      <path
+        d="M966.8023 256.17345 57.196677 256.17345c-31.397081 0-56.850799-25.452695-56.850799-56.849776l0 0c0-31.397081 25.452695-56.850799 56.850799-56.850799l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.850799l0 0C1023.653099 230.720755 998.200404 256.17345 966.8023 256.17345z"
+        p-id="1694"
+      />
+    </svg>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Hamburger',
+  props: {
+    isActive: {
+      type: Boolean,
+      default: false
+    },
+    toggleClick: {
+      type: Function,
+      default: null
+    }
+  }
+}
+</script>
+
+<style scoped>
+.hamburger {
+	display: inline-block;
+	cursor: pointer;
+	width: 20px;
+	height: 20px;
+	transform: rotate(90deg);
+	transition: .38s;
+	transform-origin: 50% 50%;
+}
+.hamburger.is-active {
+	transform: rotate(0deg);
+}
+</style>

package/modules/admin/src/components/JSONEditor.vue

@@ -1,180 +1,180 @@
-<template>
-  <div>
-    <div class="jsoneditor-vue" />
-  </div>
-</template>
-
-<script>
-const { JSONEditor } = require('@json-editor/json-editor/dist/jsoneditor')
-import 'json-schema-editor'
-export default {
-  props: {
-    value: {
-      type: Object,
-      default: () => {}
-    },
-    schema: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  data() {
-    return {
-      editor: null,
-      error: false,
-      json: this.value,
-      internalChange: false
-    }
-  },
-  watch: {
-    /* value: {
-      handler: 'update'
-    } */
-  },
-  mounted() {
-    this.update()
-  },
-  methods: {
-    update() {
-      var options = {
-        schema: this.schema,
-        startval: this.value,
-        theme: 'bootstrap4',
-        iconlib: 'materialicons',
-        required_by_default: true,
-      }
-      if (this.editor) {
-        this.editor.destroy()
-      }
-      this.editor = new JSONEditor(this.$el.querySelector('.jsoneditor-vue'), options)
-      let first = true
-      this.editor.on('change', () => {
-        if (first) {
-          first = false
-          return
-        }
-        this.$emit('input', this.editor.getValue())
-      })
-
-      const makeEditJsonTextAreaExpandable = () => {
-        const textarea = document.querySelector('.je-modal .je-edit-json--textarea')
-        textarea.classList.remove('je-edit-json--textarea') // INFO: Had to remove this class to remove height and width property
-        textarea.classList.add('expandable-textarea')
-      }
-
-      makeEditJsonTextAreaExpandable()
-    },
-    onSave() {
-      this.$emit('json-save', this.json)
-    }
-  }
-}
-
-if (JSONEditor) {
-  JSONEditor.defaults.resolvers.unshift(function(schema) {
-    if (schema.type === 'object' && schema.format === 'schema') {
-      return 'schema'
-    }
-
-    // If no valid editor is returned, the next resolver function will be used
-  })
-
-  JSONEditor.defaults.editors.schema = class schema extends JSONEditor.AbstractEditor {
-    setValue(value, initial) {
-      this.value = value
-      this.schemaeditor.setValue(value)
-      this.onChange()
-    }
-
-    getValue() {
-      if (typeof this.schemaeditor !== 'undefined') { return this.schemaeditor.getValue() } else { return {} }
-    }
-
-    register() {
-      super.register()
-      if (!this.input) return
-      this.input.setAttribute('name', this.formname)
-    }
-    unregister() {
-      super.unregister()
-      if (!this.input) return
-      this.input.removeAttribute('name')
-    }
-    getNumColumns() {
-      return 12
-    }
-    build() {
-      var self = this
-      if (!this.options.compact) {
-        this.label = this.header = this.theme.getFormInputLabel(this.getTitle())
-      }
-      if (this.schema.description) this.description = this.theme.getFormInputDescription(this.schema.description)
-      if (this.options.compact) this.container.className += ' compact'
-
-      this.input = document.createElement('div')
-      this.control = this.theme.getFormControl(this.label, this.input, this.description)
-
-      if (this.schema.readOnly || this.schema.readonly) {
-        this.always_disabled = true
-        this.input.disabled = true
-      }
-
-      this.container.appendChild(this.control)
-
-      this.schemaeditor = new window.JSONSchemaEditor(this.input, {
-        startval: {}
-      })
-      this.schemaeditor.on('change', function() {
-        self.onChange(true)
-      })
-    }
-    enable() {
-      if (!this.always_disabled) {
-        this.input.disabled = false
-      }
-
-      super.enable()
-    }
-    disable() {
-      this.input.disabled = true
-      super.disable()
-    }
-    destroy() {
-      if (this.label && this.label.parentNode) this.label.parentNode.removeChild(this.label)
-      if (this.description && this.description.parentNode) this.description.parentNode.removeChild(this.description)
-      if (this.input && this.input.parentNode) this.input.parentNode.removeChild(this.input)
-      super.destroy()
-    }
-  }
-}
-
-</script>
-
-<style>
-  .expandable-textarea {
-    display: block;
-    min-height: 250px;
-    min-width: 250px;
-    resize: both !important;
-  }
-  .jsoneditor-vue img {
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    padding: 5px;
-    width: 150px;
-  }
-  .jsoneditor-vue img:hover {
-    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
-  }
-  .jsoneditor-vue button.btn {
-    font-size: 14px !important;
-    padding: 3px;
-  }
-  .jsoneditor-vue .form-control-label, label {
-    font-weight: bold;
-  }
-  .jsoneditor-vue input[type="checkbox"] {
-    margin-right: 5px;
-    margin-top: 3px;
-  }
-</style>
+<template>
+  <div>
+    <div class="jsoneditor-vue" />
+  </div>
+</template>
+
+<script>
+const { JSONEditor } = require('@json-editor/json-editor/dist/jsoneditor')
+import 'json-schema-editor'
+export default {
+  props: {
+    value: {
+      type: Object,
+      default: () => {}
+    },
+    schema: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      editor: null,
+      error: false,
+      json: this.value,
+      internalChange: false
+    }
+  },
+  watch: {
+    /* value: {
+      handler: 'update'
+    } */
+  },
+  mounted() {
+    this.update()
+  },
+  methods: {
+    update() {
+      var options = {
+        schema: this.schema,
+        startval: this.value,
+        theme: 'bootstrap4',
+        iconlib: 'materialicons',
+        required_by_default: true,
+      }
+      if (this.editor) {
+        this.editor.destroy()
+      }
+      this.editor = new JSONEditor(this.$el.querySelector('.jsoneditor-vue'), options)
+      let first = true
+      this.editor.on('change', () => {
+        if (first) {
+          first = false
+          return
+        }
+        this.$emit('input', this.editor.getValue())
+      })
+
+      const makeEditJsonTextAreaExpandable = () => {
+        const textarea = document.querySelector('.je-modal .je-edit-json--textarea')
+        textarea.classList.remove('je-edit-json--textarea') // INFO: Had to remove this class to remove height and width property
+        textarea.classList.add('expandable-textarea')
+      }
+
+      makeEditJsonTextAreaExpandable()
+    },
+    onSave() {
+      this.$emit('json-save', this.json)
+    }
+  }
+}
+
+if (JSONEditor) {
+  JSONEditor.defaults.resolvers.unshift(function(schema) {
+    if (schema.type === 'object' && schema.format === 'schema') {
+      return 'schema'
+    }
+
+    // If no valid editor is returned, the next resolver function will be used
+  })
+
+  JSONEditor.defaults.editors.schema = class schema extends JSONEditor.AbstractEditor {
+    setValue(value, initial) {
+      this.value = value
+      this.schemaeditor.setValue(value)
+      this.onChange()
+    }
+
+    getValue() {
+      if (typeof this.schemaeditor !== 'undefined') { return this.schemaeditor.getValue() } else { return {} }
+    }
+
+    register() {
+      super.register()
+      if (!this.input) return
+      this.input.setAttribute('name', this.formname)
+    }
+    unregister() {
+      super.unregister()
+      if (!this.input) return
+      this.input.removeAttribute('name')
+    }
+    getNumColumns() {
+      return 12
+    }
+    build() {
+      var self = this
+      if (!this.options.compact) {
+        this.label = this.header = this.theme.getFormInputLabel(this.getTitle())
+      }
+      if (this.schema.description) this.description = this.theme.getFormInputDescription(this.schema.description)
+      if (this.options.compact) this.container.className += ' compact'
+
+      this.input = document.createElement('div')
+      this.control = this.theme.getFormControl(this.label, this.input, this.description)
+
+      if (this.schema.readOnly || this.schema.readonly) {
+        this.always_disabled = true
+        this.input.disabled = true
+      }
+
+      this.container.appendChild(this.control)
+
+      this.schemaeditor = new window.JSONSchemaEditor(this.input, {
+        startval: {}
+      })
+      this.schemaeditor.on('change', function() {
+        self.onChange(true)
+      })
+    }
+    enable() {
+      if (!this.always_disabled) {
+        this.input.disabled = false
+      }
+
+      super.enable()
+    }
+    disable() {
+      this.input.disabled = true
+      super.disable()
+    }
+    destroy() {
+      if (this.label && this.label.parentNode) this.label.parentNode.removeChild(this.label)
+      if (this.description && this.description.parentNode) this.description.parentNode.removeChild(this.description)
+      if (this.input && this.input.parentNode) this.input.parentNode.removeChild(this.input)
+      super.destroy()
+    }
+  }
+}
+
+</script>
+
+<style>
+  .expandable-textarea {
+    display: block;
+    min-height: 250px;
+    min-width: 250px;
+    resize: both !important;
+  }
+  .jsoneditor-vue img {
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 5px;
+    width: 150px;
+  }
+  .jsoneditor-vue img:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
+  .jsoneditor-vue button.btn {
+    font-size: 14px !important;
+    padding: 3px;
+  }
+  .jsoneditor-vue .form-control-label, label {
+    font-weight: bold;
+  }
+  .jsoneditor-vue input[type="checkbox"] {
+    margin-right: 5px;
+    margin-top: 3px;
+  }
+</style>

package/modules/admin/src/components/SvgIcon/index.vue

@@ -1,43 +1,43 @@
-<template>
-  <svg :class="svgClass" aria-hidden="true">
-    <use :xlink:href="iconName" />
-  </svg>
-</template>
-
-<script>
-export default {
-  name: 'SvgIcon',
-  props: {
-    iconClass: {
-      type: String,
-      required: true
-    },
-    className: {
-      type: String,
-      default: ''
-    }
-  },
-  computed: {
-    iconName() {
-      return `#icon-${this.iconClass}`
-    },
-    svgClass() {
-      if (this.className) {
-        return 'svg-icon ' + this.className
-      } else {
-        return 'svg-icon'
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-</style>
+<template>
+  <svg :class="svgClass" aria-hidden="true">
+    <use :xlink:href="iconName" />
+  </svg>
+</template>
+
+<script>
+export default {
+  name: 'SvgIcon',
+  props: {
+    iconClass: {
+      type: String,
+      required: true
+    },
+    className: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    iconName() {
+      return `#icon-${this.iconClass}`
+    },
+    svgClass() {
+      if (this.className) {
+        return 'svg-icon ' + this.className
+      } else {
+        return 'svg-icon'
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>

package/modules/admin/src/icons/index.js

@@ -1,9 +1,9 @@
-import Vue from 'vue'
-import SvgIcon from '@/components/SvgIcon' // svg组件
-
-// register globally
-Vue.component('svg-icon', SvgIcon)
-
-const requireAll = requireContext => requireContext.keys().map(requireContext)
-const req = require.context('./svg', false, /\.svg$/)
-requireAll(req)
+import Vue from 'vue'
+import SvgIcon from '@/components/SvgIcon' // svg组件
+
+// register globally
+Vue.component('svg-icon', SvgIcon)
+
+const requireAll = requireContext => requireContext.keys().map(requireContext)
+const req = require.context('./svg', false, /\.svg$/)
+requireAll(req)

package/modules/admin/src/icons/svgo.yml

@@ -1,22 +1,22 @@
-# replace default config
-
-# multipass: true
-# full: true
-
-plugins:
-
-  # - name
-  #
-  # or:
-  # - name: false
-  # - name: true
-  #
-  # or:
-  # - name:
-  #     param1: 1
-  #     param2: 2
-
-- removeAttrs:
-    attrs:
-      - 'fill'
-      - 'fill-rule'
+# replace default config
+
+# multipass: true
+# full: true
+
+plugins:
+
+  # - name
+  #
+  # or:
+  # - name: false
+  # - name: true
+  #
+  # or:
+  # - name:
+  #     param1: 1
+  #     param2: 2
+
+- removeAttrs:
+    attrs:
+      - 'fill'
+      - 'fill-rule'