@ditojs/admin 2.68.0 → 2.70.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/dito-admin.es.js +65 -63
  2. package/dist/dito-admin.umd.js +3 -3
  3. package/package.json +36 -36
  4. package/src/components/DitoNotifications.vue +2 -2
  5. package/src/mixins/OptionsMixin.js +12 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ditojs/admin",
3
- "version": "2.68.0",
3
+ "version": "2.70.0",
4
4
  "type": "module",
5
5
  "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
6
6
  "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -42,56 +42,56 @@
42
42
  "not ie_mob > 0"
43
43
  ],
44
44
  "dependencies": {
45
- "@ditojs/ui": "^2.68.0",
46
- "@ditojs/utils": "^2.68.0",
45
+ "@ditojs/ui": "^2.70.0",
46
+ "@ditojs/utils": "^2.70.0",
47
47
  "@kyvg/vue3-notification": "^3.4.2",
48
48
  "@lk77/vue3-color": "^3.0.6",
49
- "@tiptap/core": "^3.13.0",
50
- "@tiptap/extension-blockquote": "^3.13.0",
51
- "@tiptap/extension-bold": "^3.13.0",
52
- "@tiptap/extension-bullet-list": "^3.13.0",
53
- "@tiptap/extension-code": "^3.13.0",
54
- "@tiptap/extension-code-block": "^3.13.0",
55
- "@tiptap/extension-document": "^3.13.0",
56
- "@tiptap/extension-hard-break": "^3.13.0",
57
- "@tiptap/extension-heading": "^3.13.0",
58
- "@tiptap/extension-history": "^3.13.0",
59
- "@tiptap/extension-horizontal-rule": "^3.13.0",
60
- "@tiptap/extension-italic": "^3.13.0",
61
- "@tiptap/extension-link": "^3.13.0",
62
- "@tiptap/extension-list": "^3.13.0",
63
- "@tiptap/extension-list-item": "^3.13.0",
64
- "@tiptap/extension-ordered-list": "^3.13.0",
65
- "@tiptap/extension-paragraph": "^3.13.0",
66
- "@tiptap/extension-strike": "^3.13.0",
67
- "@tiptap/extension-subscript": "^3.13.0",
68
- "@tiptap/extension-superscript": "^3.13.0",
69
- "@tiptap/extension-text": "^3.13.0",
70
- "@tiptap/extension-text-style": "^3.13.0",
71
- "@tiptap/extension-underline": "^3.13.0",
72
- "@tiptap/extensions": "^3.13.0",
73
- "@tiptap/pm": "^3.13.0",
74
- "@tiptap/vue-3": "^3.13.0",
49
+ "@tiptap/core": "^3.14.0",
50
+ "@tiptap/extension-blockquote": "^3.14.0",
51
+ "@tiptap/extension-bold": "^3.14.0",
52
+ "@tiptap/extension-bullet-list": "^3.14.0",
53
+ "@tiptap/extension-code": "^3.14.0",
54
+ "@tiptap/extension-code-block": "^3.14.0",
55
+ "@tiptap/extension-document": "^3.14.0",
56
+ "@tiptap/extension-hard-break": "^3.14.0",
57
+ "@tiptap/extension-heading": "^3.14.0",
58
+ "@tiptap/extension-history": "^3.14.0",
59
+ "@tiptap/extension-horizontal-rule": "^3.14.0",
60
+ "@tiptap/extension-italic": "^3.14.0",
61
+ "@tiptap/extension-link": "^3.14.0",
62
+ "@tiptap/extension-list": "^3.14.0",
63
+ "@tiptap/extension-list-item": "^3.14.0",
64
+ "@tiptap/extension-ordered-list": "^3.14.0",
65
+ "@tiptap/extension-paragraph": "^3.14.0",
66
+ "@tiptap/extension-strike": "^3.14.0",
67
+ "@tiptap/extension-subscript": "^3.14.0",
68
+ "@tiptap/extension-superscript": "^3.14.0",
69
+ "@tiptap/extension-text": "^3.14.0",
70
+ "@tiptap/extension-text-style": "^3.14.0",
71
+ "@tiptap/extension-underline": "^3.14.0",
72
+ "@tiptap/extensions": "^3.14.0",
73
+ "@tiptap/pm": "^3.14.0",
74
+ "@tiptap/vue-3": "^3.14.0",
75
75
  "@vueuse/integrations": "^14.1.0",
76
76
  "codeflask": "^1.4.1",
77
77
  "filesize": "^11.0.13",
78
78
  "filesize-parser": "^1.5.1",
79
- "focus-trap": "^7.6.6",
79
+ "focus-trap": "^7.7.0",
80
80
  "nanoid": "^5.1.6",
81
81
  "sortablejs": "^1.15.6",
82
82
  "tinycolor2": "^1.6.0",
83
83
  "tippy.js": "^6.3.7",
84
84
  "tiptap-footnotes": "^3.0.1",
85
- "type-fest": "^5.3.0",
86
- "vue": "^3.5.25",
85
+ "type-fest": "^5.3.1",
86
+ "vue": "^3.5.26",
87
87
  "vue-multiselect": "^3.4.0",
88
- "vue-router": "^4.6.3",
88
+ "vue-router": "^4.6.4",
89
89
  "vue-upload-component": "^3.1.17"
90
90
  },
91
91
  "devDependencies": {
92
- "@ditojs/build": "^2.68.0",
92
+ "@ditojs/build": "^2.70.0",
93
93
  "typescript": "^5.9.3",
94
- "vite": "^7.2.6"
94
+ "vite": "^7.3.0"
95
95
  },
96
- "gitHead": "8dbd4ce3ff84d83e8e4ebd8e90772ae51b25b8ce"
96
+ "gitHead": "2010c0695b5a7296e10c2b6bf2539d552c576fd9"
97
97
  }
package/src/components/DitoNotifications.vue CHANGED
@@ -14,7 +14,7 @@
14
14
 
15
15
  <script>
16
16
  import DitoComponent from '../DitoComponent.js'
17
- import { asArray, stripTags } from '@ditojs/utils'
17
+ import { asArray, stripHtml } from '@ditojs/utils'
18
18
 
19
19
  // @vue/component
20
20
  export default DitoComponent.component('DitoNotifications', {
@@ -48,7 +48,7 @@ export default DitoComponent.component('DitoNotifications', {
48
48
  // eslint-disable-next-line no-console
49
49
  console[log](
50
50
  ...[
51
- stripTags(text),
51
+ stripHtml(text),
52
52
  ...(type === 'error' && error ? [error] : [])
53
53
  ]
54
54
  )
package/src/mixins/OptionsMixin.js CHANGED
@@ -143,6 +143,11 @@ export default {
143
143
  }
144
144
  }),
145
145
 
146
+ optionEquals: getSchemaAccessor('options.equals', {
147
+ type: Function,
148
+ default: null
149
+ }),
150
+
146
151
  // TODO: Consider moving search to `options.search`?
147
152
  searchFilter: getSchemaAccessor('search', {
148
153
  type: [Object, Function],
@@ -237,8 +242,13 @@ export default {
237
242
  if (found) {
238
243
  return found
239
244
  }
240
- } else if (value === this.getValueForOption(option)) {
241
- return option
245
+ } else {
246
+ const matches = this.optionEquals
247
+ ? this.optionEquals(new DitoContext(this, { value, option }))
248
+ : value === this.getValueForOption(option)
249
+ if (matches) {
250
+ return option
251
+ }
242
252
  }
243
253
  }
244
254
  }