diff --git a/src/components/Form/FormBuilder.vue b/src/components/Form/FormBuilder.vue index cac91d0a..afcbfa2d 100644 --- a/src/components/Form/FormBuilder.vue +++ b/src/components/Form/FormBuilder.vue @@ -241,7 +241,7 @@ watch(props.initValue, (newValue: any) => { }) defineExpose({ - resetModel, + reset: resetModel, formValidate, setItemValue, setData diff --git a/src/components/Search/Item.vue b/src/components/Search/Item.vue new file mode 100644 index 00000000..6f44c425 --- /dev/null +++ b/src/components/Search/Item.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue new file mode 100644 index 00000000..a3908588 --- /dev/null +++ b/src/components/Search/Search.vue @@ -0,0 +1,71 @@ + + + + + \ No newline at end of file diff --git a/src/components/Search/index.ts b/src/components/Search/index.ts new file mode 100644 index 00000000..4edb3b21 --- /dev/null +++ b/src/components/Search/index.ts @@ -0,0 +1,3 @@ +import Search from './Search.vue' + +export default Search \ No newline at end of file diff --git a/src/components/Search/util.ts b/src/components/Search/util.ts new file mode 100644 index 00000000..573b0d7d --- /dev/null +++ b/src/components/Search/util.ts @@ -0,0 +1,4 @@ +export const typeOptions = [ + { label: '或者', value: 'or' }, + { label: '并且', value: 'and' }, +] \ No newline at end of file diff --git a/src/components/index.ts b/src/components/index.ts index d3daf534..fb44f790 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -5,6 +5,7 @@ import JTable from './Table/index.vue' import TitleComponent from "./TitleComponent/index.vue"; import Form from './Form'; import CardBox from './CardBox/index.vue'; +import Search from './Search' export default { install(app: App) { @@ -14,5 +15,6 @@ export default { .component('TitleComponent', TitleComponent) .component('Form', Form) .component('CardBox', CardBox) + .component('Search', Search) } } diff --git a/src/router/index.ts b/src/router/index.ts index 2da56030..389b7053 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,9 +8,15 @@ const router = createRouter({ routes: menus }) +const filterPath = [ + '/form', + '/search' +] + router.beforeEach((to, from, next) => { const token = LocalStore.get(TOKEN_KEY) - if (token) { + + if (token || filterPath.includes(to.path)) { next() } else { if (to.path === LoginPath) { diff --git a/src/router/menu.ts b/src/router/menu.ts index 525ac2e8..2fd19758 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -44,6 +44,10 @@ export default [ path: '/form', component: () => import('@/views/demo/Form.vue') }, + { + path: '/search', + component: () => import('@/views/demo/Search.vue') + }, // end: 测试用, 可删除 // link 运维管理 diff --git a/src/views/demo/Form.vue b/src/views/demo/Form.vue index cd585a77..41b6f7e0 100644 --- a/src/views/demo/Form.vue +++ b/src/views/demo/Form.vue @@ -21,7 +21,7 @@ const submit = () => { } const reset = () => { - + form.value.reset() } const setValue =() => { diff --git a/src/views/demo/Search.vue b/src/views/demo/Search.vue new file mode 100644 index 00000000..e7445026 --- /dev/null +++ b/src/views/demo/Search.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file