NewLife/NewLife.QuickVue

优化路由逻辑等
zk authored at 2023-04-11 17:51:02
98b3c28
Tree
1 Parent(s) 2b2f120
Summary: 6 changed files with 16 additions and 6 deletions.
Modified +3 -1
Modified +2 -0
Modified +1 -1
Added +6 -0
Modified +3 -1
Modified +1 -3
Modified +3 -1
diff --git a/src/components/form/component.ts b/src/components/form/component.ts
index 91ac505..211b2ba 100644
--- a/src/components/form/component.ts
+++ b/src/components/form/component.ts
@@ -2,6 +2,7 @@ import { ElAutocomplete, ElCascader, ElCheckbox, ElColorPicker, ElDatePicker, El
 import Select from '../select/index.vue'
 import CheckboxGroup from '../checkboxGroup/index.vue'
 import RadioGroup from '../radioGroup/index.vue'
+import Editor from '../editor/index.vue'
 export const forms = {
   autocomplete: ElAutocomplete,
   cascader: ElCascader,
@@ -19,5 +20,6 @@ export const forms = {
   switch: ElSwitch,
   timePicker: ElTimePicker,
   timeSelect: ElTimeSelect,
-  upload: ElUpload
+  upload: ElUpload,
+  editor: Editor,
 }
Modified +2 -0
diff --git a/src/components/page/index.vue b/src/components/page/index.vue
index 4a2534e..5871cb1 100644
--- a/src/components/page/index.vue
+++ b/src/components/page/index.vue
@@ -107,9 +107,11 @@ const onTableDelRow = (item: EmptyObjectType) => {
 	getTableData();
 };
 const onTableAdd = () => {
+	isUpdate.value = false
 	editEl.value?.handleAdd();
 }
 const onTableEdit = (item: EmptyObjectType) => {
+	isUpdate.value = true
 	editEl.value?.handleEdit(item.id);
 }
 // 分页改变时回调
Modified +1 -1
diff --git a/src/router/backEnd.ts b/src/router/backEnd.ts
index c49358a..77a4e53 100644
--- a/src/router/backEnd.ts
+++ b/src/router/backEnd.ts
@@ -214,7 +214,7 @@ export function backEndComponent(routes: Menu[]): Array<RouteRecordRaw> {
 			path: url,
 			name: item.name,
 			// component: component || dynamicImport(dynamicViewsModules, 'modules/index') as never,
-			component: component || createCustomComponent(item.name, import('../views/modules/index.vue')),
+			component: createCustomComponent(item.name, component ? component() : modules['../views/modules/index.vue']()),
 			props: { type: url },
 			meta: {
 				title: item.displayName,
Added +6 -0
diff --git a/src/views/modules/admin/department/index.vue b/src/views/modules/admin/department/index.vue
new file mode 100644
index 0000000..11581ac
--- /dev/null
+++ b/src/views/modules/admin/department/index.vue
@@ -0,0 +1,6 @@
+<template>
+  <Page></Page>
+</template>
+
+<script setup lang="ts">
+</script>
Modified +3 -1
diff --git a/src/views/modules/admin/user/index.vue b/src/views/modules/admin/user/index.vue
index dd5ba08..48c0e88 100644
--- a/src/views/modules/admin/user/index.vue
+++ b/src/views/modules/admin/user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page v-bind="$attrs" @setting="setting">
+  <Page @setting="setting">
     <template #mail>
       测试
     </template>
@@ -12,6 +12,7 @@ import { ColumnKind, usePageApi } from '/@/api/page';
 const { setting, columns, forms } = usePageSetting({
   columns: [
     {
+      in: ColumnKind.ADD,
       prop: 'sex',
       component: 'radioGroup',
       props: {
@@ -19,6 +20,7 @@ const { setting, columns, forms } = usePageSetting({
       },
     },
     {
+      in: [ColumnKind.SEARCH, ColumnKind.LIST],
       prop: 'mail',
       slot: 'mail',
     },
Modified +1 -3
diff --git a/src/views/modules/index.vue b/src/views/modules/index.vue
index a85ffdc..11581ac 100644
--- a/src/views/modules/index.vue
+++ b/src/views/modules/index.vue
@@ -1,8 +1,6 @@
 <template>
-  <Page :type="route.path"></Page>
+  <Page></Page>
 </template>
 
 <script setup lang="ts">
-import { useRoute } from 'vue-router';
-const route = useRoute();
 </script>