@ditojs/admin 2.72.0 → 2.73.1

package/src/types/DitoTypeText.vue

@@ -1,12 +1,21 @@
 <template lang="pug">
-InputField.dito-text(
+DitoInput.dito-text(
   :id="dataPath"
   ref="element"
   v-model="inputValue"
   :type="inputType"
   v-bind="attributes"
 )
-  template(#after)
+  template(#prefix)
+    DitoAffixes(
+      :items="schema.prefix"
+      :parentContext="context"
+    )
+  template(#suffix)
+    DitoAffixes(
+      :items="schema.suffix"
+      :parentContext="context"
+    )
     button.dito-button--clear.dito-button--overlay(
       v-if="showClearButton"
       :disabled="disabled"
@@ -17,7 +26,8 @@ InputField.dito-text(
 <script>
 import DitoTypeComponent from '../DitoTypeComponent.js'
 import TextMixin from '../mixins/TextMixin'
-import { InputField } from '@ditojs/ui/src'
+import DitoAffixes from '../components/DitoAffixes.vue'
+import { DitoInput } from '@ditojs/ui/src'
 
 const maskedPassword = '****************'
 
@@ -35,7 +45,7 @@ export default DitoTypeComponent.register(
   // @vue/component
   {
     mixins: [TextMixin],
-    components: { InputField },
+    components: { DitoInput, DitoAffixes },
     nativeField: true,
     textField: true,
     ignoreMissingValue: ({ schema }) => schema.type === 'password',

package/src/utils/schema.js

@@ -332,7 +332,10 @@ export async function processView(component, api, schema, name, fullPath = '') {
 }
 
 export function processSchemaDefaults(api, schema) {
-  let defaults = api.defaults[schema.type]
+  let defaults = (
+    api.defaults[schema.type] ||
+    api.defaults[camelize(schema.type)]
+  )
   if (defaults) {
     if (isFunction(defaults)) {
       defaults = defaults(schema)

package/src/components/DitoElement.vue

@@ -1,68 +0,0 @@
-<template lang="pug">
-component(
-  v-if="options?.text != null"
-  :is="tagName"
-  :class="classes"
-  :style="styles"
-) {{ options.text }}
-component(
-  v-else-if="options?.html != null"
-  :is="tagName"
-  :class="classes"
-  :style="styles"
-  v-html="options.html"
-)
-</template>
-
-<script>
-import DitoComponent from '../DitoComponent.js'
-import { isObject, isString, asArray } from '@ditojs/utils'
-
-// @vue/component
-export default DitoComponent.component('DitoElement', {
-  props: {
-    as: { type: String, default: 'span' },
-    content: { type: [String, Object], default: null }
-  },
-
-  computed: {
-    options() {
-      const { content } = this
-      return content != null
-        ? isObject(content)
-          ? content
-          : { text: content }
-        : null
-    },
-
-    tagName() {
-      return this.options.as || this.as
-    },
-
-    classes() {
-      return {
-        ...asObject(this.$attrs.class),
-        ...asObject(this.options.class)
-      }
-    },
-
-    styles() {
-      return {
-        ...asObject(this.$attrs.style),
-        ...asObject(this.options.style)
-      }
-    }
-  }
-})
-
-function asObject(value) {
-  return asArray(value).reduce((object, entry) => {
-    if (isString(entry)) {
-      object[entry] = true
-    } else if (isObject(entry)) {
-      Object.assign(object, entry)
-    }
-    return object
-  }, {})
-}
-</script>