vue3-django 0.1.2 → 0.1.3

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vue3-django",
3
- "version": "0.1.2",
3
+ "version": "0.1.3",
4
4
  "description": "DRF metadata-driven Vue 3 framework",
5
5
  "keywords": [
6
6
  "vue3",
package/src/index.js CHANGED
@@ -10,7 +10,12 @@ export {
10
10
  } from './core/metadata.js'
11
11
  export { createDjango, useDjango } from './composables/context.js'
12
12
  export { createAuth } from './core/auth.js'
13
- export { createDjangoRouter, genModelRouters, safeRedirect } from './router/index.js'
13
+ export {
14
+ createDjangoRouter,
15
+ genModelRouters,
16
+ import_or_use_template,
17
+ safeRedirect,
18
+ } from './router/index.js'
14
19
  export { default as ModelForm } from './components/model/Form.vue'
15
20
  export { default as ModelTable } from './components/model/Table.vue'
16
21
  export { default as ModelListView } from './views/model/list.vue'
@@ -1,6 +1,24 @@
1
1
  import { createRouter, createWebHashHistory } from 'vue-router'
2
- import ModelListView from '../views/model/list.vue'
3
- import ModelEditView from '../views/model/edit.vue'
2
+
3
+ const modelTemplates = import.meta.glob('../views/model/*.vue')
4
+
5
+ // Vite must discover host views at build time; pass the host's import.meta.glob map.
6
+ export function import_or_use_template(path, template, modules = {}, templates = {}) {
7
+ if (!/^[\w-]+(?:\/[\w-]+)*$/.test(path) || !/^[\w-]+$/.test(template)) {
8
+ throw new Error('模型视图路径无效')
9
+ }
10
+ const suffix = `/views/${path}.vue`
11
+ const matches = Object.entries(modules).filter(([key]) => key.endsWith(suffix))
12
+ if (matches.length > 1) throw new Error(`模型视图 ${path} 重复`)
13
+ return async () => {
14
+ const loader =
15
+ matches[0]?.[1] ?? templates[template] ?? modelTemplates[`../views/model/${template}.vue`]
16
+ if (!loader) throw new Error(`模型视图 ${path} 与模板 ${template} 均未找到`)
17
+ // An existing view's runtime/import error must not be swallowed by a fallback.
18
+ const module = typeof loader === 'function' ? await loader() : loader
19
+ return module.default ?? module
20
+ }
21
+ }
4
22
 
5
23
  export function safeRedirect(value, fallback = '/') {
6
24
  return typeof value === 'string' &&
@@ -40,18 +58,14 @@ export function createDjangoRouter({
40
58
  return router
41
59
  }
42
60
 
43
- export function genModelRouters(
44
- apps,
45
- components = {
46
- list: ModelListView,
47
- create: ModelEditView,
48
- edit: ModelEditView,
49
- },
50
- ) {
61
+ export function genModelRouters(apps, components) {
62
+ const options = components?.modules || components?.templates ? components : {}
51
63
  const views =
52
- typeof components === 'object' && components.list
53
- ? components
54
- : { list: components, create: components, edit: components }
64
+ options === components || !components
65
+ ? {}
66
+ : typeof components === 'object' && components.list
67
+ ? components
68
+ : { list: components, create: components, edit: components }
55
69
  return Object.entries(apps).flatMap(([app, definition]) =>
56
70
  definition.hidden === true || definition.hidden === 'true'
57
71
  ? []
@@ -59,25 +73,33 @@ export function genModelRouters(
59
73
  const path = `/${app}/${name}/`,
60
74
  appModel = `${app}.${name}`,
61
75
  title = model.verbose_name ?? name
76
+ const resolveView = (view, template = view) =>
77
+ views[view] ??
78
+ import_or_use_template(
79
+ `${app}/${name}/${view}`,
80
+ template,
81
+ options.modules,
82
+ options.templates,
83
+ )
62
84
  return [
63
85
  {
64
86
  path,
65
87
  name: `${app}-${name}-list`,
66
- component: views.list,
88
+ component: resolveView('list'),
67
89
  props: { appModel, mode: 'list' },
68
90
  meta: { title: `${title}列表`, model },
69
91
  },
70
92
  {
71
93
  path: `${path}add/`,
72
94
  name: `${app}-${name}-add`,
73
- component: views.create ?? views.edit,
95
+ component: views.create ?? views.edit ?? resolveView('edit'),
74
96
  props: { appModel, mode: 'create' },
75
97
  meta: { title: `新增${title}`, model },
76
98
  },
77
99
  {
78
100
  path: `${path}:id/`,
79
101
  name: `${app}-${name}-edit`,
80
- component: views.edit,
102
+ component: resolveView('edit'),
81
103
  props: (route) => ({ appModel, mode: 'edit', id: route.params.id }),
82
104
  meta: { title: `编辑${title}`, model },
83
105
  },