diff --git a/src/components/Detail/index.vue b/src/components/Detail/index.vue index f9a6e13c4..6b16e54d4 100644 --- a/src/components/Detail/index.vue +++ b/src/components/Detail/index.vue @@ -37,7 +37,7 @@
- +
@@ -195,12 +195,15 @@ export default defineComponent({ height: 100%; } .content__item--label { + font-size: 14px; padding: 8px 16px; } .content__item--message { flex: 1; + font-size: 14px; padding: 8px 16px; line-height: 20px; + color: #606266; } } } diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue index 778471562..bacc30b93 100644 --- a/src/components/Dialog/index.vue +++ b/src/components/Dialog/index.vue @@ -40,6 +40,9 @@ export default defineComponent({ diff --git a/src/hooks/useExample.ts b/src/hooks/useExample.ts index 0bfb38b93..fdd032a34 100644 --- a/src/hooks/useExample.ts +++ b/src/hooks/useExample.ts @@ -39,6 +39,9 @@ export function useExample() { // 弹窗标题 const title = ref('') + // 组件名称 + const comName = ref('') + // 表格展示条目改变时候重置基本参数 function sizeChange(val: number) { loading.value = true @@ -72,6 +75,11 @@ export function useExample() { selectionData.value = selection } + // 改变弹窗dialogVisible + function toggleVisible(val = false) { + dialogVisible.value = val + } + return { defalutParams, tableData, @@ -80,9 +88,11 @@ export function useExample() { total, dialogVisible, title, + comName, sizeChange, currentChange, delData, - handleSelectionChange + handleSelectionChange, + toggleVisible } } diff --git a/src/pages/index/router/index.ts b/src/pages/index/router/index.ts index 9ba946688..ea145ac63 100644 --- a/src/pages/index/router/index.ts +++ b/src/pages/index/router/index.ts @@ -557,6 +557,19 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ showMainRoute: true, activeMenu: '/example-demo/example-page' } + }, + { + path: 'example-detail', + component: () => import('_p/index/views/example-demo/example-page/example-detail.vue'), + name: 'ExampleDetail', + meta: { + title: '列表综合实例-详情', + noTagsView: true, + noCache: true, + hidden: true, + showMainRoute: true, + activeMenu: '/example-demo/example-page' + } } ] } diff --git a/src/pages/index/views/example-demo/example-dialog/api.ts b/src/pages/index/views/example-demo/example-dialog/api.ts index f07d7e32e..43fd6720d 100644 --- a/src/pages/index/views/example-demo/example-dialog/api.ts +++ b/src/pages/index/views/example-demo/example-dialog/api.ts @@ -13,7 +13,7 @@ export const delsExampApi = ({ data }: PropsData): any => { return fetch({ url: '/example/delete', method: 'post', data }) } -export const saveExampApi = ({ data }: PropsData): any => { +export const setExampApi = ({ data }: PropsData): any => { return fetch({ url: '/example/save', method: 'post', data }) } diff --git a/src/pages/index/views/example-demo/example-dialog/components/Detail.vue b/src/pages/index/views/example-demo/example-dialog/components/Detail.vue new file mode 100644 index 000000000..07ac13ca6 --- /dev/null +++ b/src/pages/index/views/example-demo/example-dialog/components/Detail.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/src/pages/index/views/example-demo/example-dialog/components/IfnoWrite.vue b/src/pages/index/views/example-demo/example-dialog/components/InfoWrite.vue similarity index 98% rename from src/pages/index/views/example-demo/example-dialog/components/IfnoWrite.vue rename to src/pages/index/views/example-demo/example-dialog/components/InfoWrite.vue index 5b5edcf24..c4074580b 100644 --- a/src/pages/index/views/example-demo/example-dialog/components/IfnoWrite.vue +++ b/src/pages/index/views/example-demo/example-dialog/components/InfoWrite.vue @@ -66,7 +66,7 @@ import Editor from '_c/Editor/index.vue' import { Message } from '_c/Message' import { formatTime } from '@/utils' import { InfoWriteParams, InfoWriteRules } from './types' -import { saveExampApi, getExampDetApi } from '../api' +import { setExampApi, getExampDetApi } from '../api' const requiredRule = { required: true, @@ -145,7 +145,7 @@ export default defineComponent({ if (valid) { const formData = unref(form) formData.display_time = formatTime(formData.display_time, 'yyyy-MM-dd HH:mm:ss') - const res = await saveExampApi({ + const res = await setExampApi({ data: formData }) if (res.code === '0000') { diff --git a/src/pages/index/views/example-demo/example-dialog/index.vue b/src/pages/index/views/example-demo/example-dialog/index.vue index b5303d826..994cef990 100644 --- a/src/pages/index/views/example-demo/example-dialog/index.vue +++ b/src/pages/index/views/example-demo/example-dialog/index.vue @@ -9,7 +9,7 @@
- 新增 + 新增 - + +
+ + diff --git a/src/pages/index/views/example-demo/example-page/components/IfnoWrite.vue b/src/pages/index/views/example-demo/example-page/components/InfoWrite.vue similarity index 98% rename from src/pages/index/views/example-demo/example-page/components/IfnoWrite.vue rename to src/pages/index/views/example-demo/example-page/components/InfoWrite.vue index 7c5905df5..71d541540 100644 --- a/src/pages/index/views/example-demo/example-page/components/IfnoWrite.vue +++ b/src/pages/index/views/example-demo/example-page/components/InfoWrite.vue @@ -67,7 +67,7 @@ import Editor from '_c/Editor/index.vue' import { Message } from '_c/Message' import { formatTime } from '@/utils' import { InfoWriteParams, InfoWriteRules } from './types' -import { saveExampApi, getExampDetApi } from '../api' +import { setExampApi, getExampDetApi } from '../api' const requiredRule = { required: true, @@ -148,7 +148,7 @@ export default defineComponent({ if (valid) { const formData = unref(form) formData.display_time = formatTime(formData.display_time, 'yyyy-MM-dd HH:mm:ss') - const res = await saveExampApi({ + const res = await setExampApi({ data: formData }) if (res.code === '0000') { diff --git a/src/pages/index/views/example-demo/example-page/example-add.vue b/src/pages/index/views/example-demo/example-page/example-add.vue index e1dd3aa7a..201ed7116 100644 --- a/src/pages/index/views/example-demo/example-page/example-add.vue +++ b/src/pages/index/views/example-demo/example-page/example-add.vue @@ -1,16 +1,16 @@ + + diff --git a/src/pages/index/views/example-demo/example-page/example-edit.vue b/src/pages/index/views/example-demo/example-page/example-edit.vue index 8e0998748..a6a9c933b 100644 --- a/src/pages/index/views/example-demo/example-page/example-edit.vue +++ b/src/pages/index/views/example-demo/example-page/example-edit.vue @@ -1,17 +1,17 @@