diff --git a/src/pages.json b/src/pages.json index a26f2961459fbafe9ec0d950a375ded4b90d5580..9c2b41ed0d8c1921801541e4e87903dc526537ee 100644 --- a/src/pages.json +++ b/src/pages.json @@ -151,10 +151,18 @@ "navigationBarTitleText": "我的信息" } }, + { + "path": "pages/role/edit", + "type": "page" + }, { "path": "pages/role/index", "type": "page" }, + { + "path": "pages/role/show", + "type": "page" + }, { "path": "pages/colab/detail/index", "type": "page", diff --git a/src/pages/role/edit.vue b/src/pages/role/edit.vue new file mode 100644 index 0000000000000000000000000000000000000000..f567109580de86d840ed40bb42f2ea2c8b861783 --- /dev/null +++ b/src/pages/role/edit.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/pages/role/index.vue b/src/pages/role/index.vue index 31f5df996889d4a0c9965165cc65dc876b737c44..f15da07b63ca6aa3d8653adbcb6871d8ff1d3ce3 100644 --- a/src/pages/role/index.vue +++ b/src/pages/role/index.vue @@ -1,39 +1,46 @@ - - + diff --git a/src/pages/role/show.vue b/src/pages/role/show.vue new file mode 100644 index 0000000000000000000000000000000000000000..8873a75b22cf9ade00a8b15fefbb21eaf47fd807 --- /dev/null +++ b/src/pages/role/show.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/src/service/role/RoleApi.ts b/src/service/role/RoleApi.ts index 21da0c55a9c0b5fe261153bad69a836c99282178..a7f71de9db40f6e7e24abbcebc456707b301f8be 100644 --- a/src/service/role/RoleApi.ts +++ b/src/service/role/RoleApi.ts @@ -15,26 +15,48 @@ export interface RoleVO { } const useMock = import.meta.env.VITE_USE_MOCK === 'true' +// 模拟数据类型是数组 +const mockConfig = (type = 'array') => { + if (type === 'array') { + return { + 'data|10': [ + { + 'id|+1': 1, + name: '@name', + code: '@word', + 'sort|1-100': 1, + data_scope: '@word', + data_scope_dept_ids: '@word', + 'status|1-2': 1, + 'type|1-2': '@word', + remark: '@sentence', + createTime: '@datetime' + } + ] + } + } else { + return { + 'data': { + id: 1, + name: '@name', + code: '@word', + 'sort|1-100': 1, + data_scope: '@word', + data_scope_dept_ids: '@word', + 'status|1-2': 1, + 'type|1-2': '@word', + remark: '@sentence', + createTime: '@datetime' + } + } + } + +} export const getList = (query: object) => { if (useMock) { return new Promise((resolve) => { - const data = Mock.mock({ - 'data|10': [ - { - 'id|+1': 1, - name: '@name', - code: '@word', - 'sort|1-100': 1, - data_scope: '@word', - data_scope_dept_ids: '@word', - 'status|1-2': 1, - 'type|1-2': '@word', - remark: '@sentence', - createTime: '@datetime' - } - ] - }) + const data = Mock.mock(mockConfig('array')) resolve({ data: data.data }) }) } else { @@ -42,17 +64,44 @@ export const getList = (query: object) => { } } export const getInfo = (id: number): Promise => { - return httpGet('/system/role/get?id=' + id) + if (useMock) { + return new Promise((resolve) => { + const data = Mock.mock(mockConfig('object')) + resolve({ data: data.data }) + }) + } else { + return httpGet('/system/role/get?id=' + id) + } } export const createRole = (data: object) => { - return httpPost('/system/role/create', data) + if (useMock) { + return new Promise((resolve) => { + const data = Mock.mock(mockConfig('object')) + resolve({ data: data.data }) + }) + } else { + return httpPost('/system/role/create', data) + } } export const updateRole = (data: object) => { - return httpPost('/system/role/update', data) + if (useMock) { + return new Promise((resolve) => { + const data = Mock.mock(mockConfig('object')) + resolve({ data: data.data }) + }) + } else { + return httpPost('/system/role/update', data) + } } export const deleteRole = (id: number) => { - return httpPost('/system/role/delete' + { id }) + if (useMock) { + return new Promise((resolve) => { + resolve({ data: null, code: 200, msg: '删除成功' }) + }) + } else { + return httpPost('/system/role/delete' + { id }) + } } diff --git a/src/types/auto-import.d.ts b/src/types/auto-import.d.ts index b5c1bff877f014e494ae747f7294a66d162849e9..255cb5bea51b9d225f751de2359909feda8eeb3b 100644 --- a/src/types/auto-import.d.ts +++ b/src/types/auto-import.d.ts @@ -94,7 +94,7 @@ declare global { // for type re-export declare global { // @ts-ignore - export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' + export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue' import('vue') } // for vue template auto import @@ -156,7 +156,6 @@ declare module 'vue' { readonly onUnload: UnwrapRef readonly onUnmounted: UnwrapRef readonly onUpdated: UnwrapRef - readonly onWatcherCleanup: UnwrapRef readonly provide: UnwrapRef readonly reactive: UnwrapRef readonly readonly: UnwrapRef @@ -174,11 +173,91 @@ declare module 'vue' { readonly useAttrs: UnwrapRef readonly useCssModule: UnwrapRef readonly useCssVars: UnwrapRef - readonly useId: UnwrapRef - readonly useModel: UnwrapRef readonly useRequest: UnwrapRef readonly useSlots: UnwrapRef - readonly useTemplateRef: UnwrapRef + readonly useUpload: UnwrapRef + readonly watch: UnwrapRef + readonly watchEffect: UnwrapRef + readonly watchPostEffect: UnwrapRef + readonly watchSyncEffect: UnwrapRef + } +} +declare module '@vue/runtime-core' { + interface GlobalComponents {} + interface ComponentCustomProperties { + readonly EffectScope: UnwrapRef + readonly computed: UnwrapRef + readonly createApp: UnwrapRef + readonly customRef: UnwrapRef + readonly defineAsyncComponent: UnwrapRef + readonly defineComponent: UnwrapRef + readonly effectScope: UnwrapRef + readonly getCurrentInstance: UnwrapRef + readonly getCurrentScope: UnwrapRef + readonly h: UnwrapRef + readonly inject: UnwrapRef + readonly isProxy: UnwrapRef + readonly isReactive: UnwrapRef + readonly isReadonly: UnwrapRef + readonly isRef: UnwrapRef + readonly markRaw: UnwrapRef + readonly nextTick: UnwrapRef + readonly onActivated: UnwrapRef + readonly onAddToFavorites: UnwrapRef + readonly onBackPress: UnwrapRef + readonly onBeforeMount: UnwrapRef + readonly onBeforeUnmount: UnwrapRef + readonly onBeforeUpdate: UnwrapRef + readonly onDeactivated: UnwrapRef + readonly onError: UnwrapRef + readonly onErrorCaptured: UnwrapRef + readonly onHide: UnwrapRef + readonly onLaunch: UnwrapRef + readonly onLoad: UnwrapRef + readonly onMounted: UnwrapRef + readonly onNavigationBarButtonTap: UnwrapRef + readonly onNavigationBarSearchInputChanged: UnwrapRef + readonly onNavigationBarSearchInputClicked: UnwrapRef + readonly onNavigationBarSearchInputConfirmed: UnwrapRef + readonly onNavigationBarSearchInputFocusChanged: UnwrapRef + readonly onPageNotFound: UnwrapRef + readonly onPageScroll: UnwrapRef + readonly onPullDownRefresh: UnwrapRef + readonly onReachBottom: UnwrapRef + readonly onReady: UnwrapRef + readonly onRenderTracked: UnwrapRef + readonly onRenderTriggered: UnwrapRef + readonly onResize: UnwrapRef + readonly onScopeDispose: UnwrapRef + readonly onServerPrefetch: UnwrapRef + readonly onShareAppMessage: UnwrapRef + readonly onShareTimeline: UnwrapRef + readonly onShow: UnwrapRef + readonly onTabItemTap: UnwrapRef + readonly onThemeChange: UnwrapRef + readonly onUnhandledRejection: UnwrapRef + readonly onUnload: UnwrapRef + readonly onUnmounted: UnwrapRef + readonly onUpdated: UnwrapRef + readonly provide: UnwrapRef + readonly reactive: UnwrapRef + readonly readonly: UnwrapRef + readonly ref: UnwrapRef + readonly resolveComponent: UnwrapRef + readonly shallowReactive: UnwrapRef + readonly shallowReadonly: UnwrapRef + readonly shallowRef: UnwrapRef + readonly toRaw: UnwrapRef + readonly toRef: UnwrapRef + readonly toRefs: UnwrapRef + readonly toValue: UnwrapRef + readonly triggerRef: UnwrapRef + readonly unref: UnwrapRef + readonly useAttrs: UnwrapRef + readonly useCssModule: UnwrapRef + readonly useCssVars: UnwrapRef + readonly useRequest: UnwrapRef + readonly useSlots: UnwrapRef readonly useUpload: UnwrapRef readonly watch: UnwrapRef readonly watchEffect: UnwrapRef diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index db0a3aa3dc27a5f4582b336066e5d2485795d477..888bc6e0f17b03991ce75455d82517cd3f83f13b 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -16,7 +16,9 @@ interface NavigateToOptions { "/pages/my/index" | "/pages/my-info/index" | "/pages/person-center/index" | + "/pages/role/edit" | "/pages/role/index" | + "/pages/role/show" | "/pages/colab/detail/index"; } interface RedirectToOptions extends NavigateToOptions {}