af-mobile-client-vue3 1.1.8 → 1.1.10

package/src/router/guards.ts

@@ -1,59 +1,59 @@
-import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
-import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
-import { showToast } from 'vant'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/XReportFormIframeView', '/invoiceShow'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   */
-  includes(route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  },
-}
-
-/**
- * 登录守卫
- * @param to
- * @param from
- * @param next
- */
-function loginGuard(to, from, next?) {
-  if (!loginIgnore.includes(to) && !useUserStore().getToken()) {
-    showToast({
-      message: '登录态已失效，请重新登录',
-      position: 'bottom',
-    })
-    next({ path: '/login' })
-  }
-  else {
-    if (to.path === '/login' && useUserStore().getToken())
-      next({ path: '/' })
-
-    next()
-  }
-}
-
-/**
- * 权限守卫
- * @param to
- * @param from
- * @param next
- */
-function authorityGuard(to, from, next?) {
-  const permissions = useUserStore().getPermissions()
-  const roles = useUserStore().getRoles()
-  if (!hasAuthority(to, permissions, roles))
-    next({ path: '/' })
-
-  else
-    next()
-}
-
-export default {
-  beforeEach: [loginGuard, authorityGuard],
-  afterEach: [],
-}
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
+import { hasAuthority } from '@af-mobile-client-vue3/utils/authority-utils'
+import { showToast } from 'vant'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/XReportFormIframeView', '/invoiceShow'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   */
+  includes(route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  },
+}
+
+/**
+ * 登录守卫
+ * @param to
+ * @param from
+ * @param next
+ */
+function loginGuard(to, from, next?) {
+  if (!loginIgnore.includes(to) && !useUserStore().getToken()) {
+    showToast({
+      message: '登录态已失效，请重新登录',
+      position: 'bottom',
+    })
+    next({ path: '/login' })
+  }
+  else {
+    if (to.path === '/login' && useUserStore().getToken())
+      next({ path: '/' })
+
+    next()
+  }
+}
+
+/**
+ * 权限守卫
+ * @param to
+ * @param from
+ * @param next
+ */
+function authorityGuard(to, from, next?) {
+  const permissions = useUserStore().getPermissions()
+  const roles = useUserStore().getRoles()
+  if (!hasAuthority(to, permissions, roles))
+    next({ path: '/' })
+
+  else
+    next()
+}
+
+export default {
+  beforeEach: [loginGuard, authorityGuard],
+  afterEach: [],
+}

package/src/router/index.ts

@@ -1,61 +1,61 @@
-import type { RouteLocationNormalized } from 'vue-router'
-import routes from '@af-mobile-client-vue3/router/routes'
-import useCachedViewStore from '@af-mobile-client-vue3/stores/modules/cachedView'
-import useRouteTransitionNameStore from '@af-mobile-client-vue3/stores/modules/routeTransitionName'
-import setPageTitle from '@af-mobile-client-vue3/utils/set-page-title'
-// https://router.vuejs.org/zh/
-import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
-import 'nprogress/nprogress.css'
-
-const baseUrl = import.meta.env.VITE_APP_PUBLIC_PATH
-// 创建路由实例并传递 `routes` 配置
-const router = createRouter({
-  history: import.meta.env.NODE_ENV === 'development' ? createWebHistory(baseUrl) : createWebHashHistory(baseUrl),
-  routes,
-})
-
-export interface toRouteType extends RouteLocationNormalized {
-  meta: {
-    title?: string
-    noCache?: boolean
-    index?: number
-  }
-}
-
-router.beforeEach((to: toRouteType, _from: toRouteType, next) => {
-  const toDepth = to.path.split('/').length
-  const fromDepth = _from.path.split('/').length
-  // 路由过渡动画
-  const routeTransitionNameStore = useRouteTransitionNameStore()
-  let name: string
-  if (toDepth > fromDepth || to.name === '404') {
-    console.warn('in')
-    // 进入动画
-    name = 'slide-fadein-left'
-  }
-  else if (toDepth < fromDepth) {
-    // 返回动画
-    name = 'slide-fadein-right'
-  }
-  else {
-    const toIndex = to.meta.index ? to.meta.index : 0
-    const fromIndex = _from.meta.index ? _from.meta.index : 0
-    if (toIndex > fromIndex)
-      name = 'slide-right'
-    else if (toIndex < fromIndex)
-      name = 'slide-left'
-    else
-      name = ''
-  }
-  routeTransitionNameStore.setName(name)
-  // 路由缓存
-  useCachedViewStore().addCachedView(to)
-  // 页面 title
-  setPageTitle(to.meta.title)
-  next()
-})
-
-router.afterEach(() => {})
-
-// 导出路由实例，并在 `main.ts` 挂载
-export default router
+import type { RouteLocationNormalized } from 'vue-router'
+import routes from '@af-mobile-client-vue3/router/routes'
+import useRouteTransitionNameStore from '@af-mobile-client-vue3/stores/modules/routeTransitionName'
+import setPageTitle from '@af-mobile-client-vue3/utils/set-page-title'
+// https://router.vuejs.org/zh/
+import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
+import 'nprogress/nprogress.css'
+import useRouteCache from "@af-mobile-client-vue3/stores/modules/routeCache";
+
+const baseUrl = import.meta.env.VITE_APP_PUBLIC_PATH
+// 创建路由实例并传递 `routes` 配置
+const router = createRouter({
+  history: import.meta.env.NODE_ENV === 'development' ? createWebHistory(baseUrl) : createWebHashHistory(baseUrl),
+  routes,
+})
+
+export interface toRouteType extends RouteLocationNormalized {
+  meta: {
+    title?: string
+    noCache?: boolean
+    index?: number
+  }
+}
+
+router.beforeEach((to: toRouteType, _from: toRouteType, next) => {
+  const toDepth = to.path.split('/').length
+  const fromDepth = _from.path.split('/').length
+  // 路由过渡动画
+  const routeTransitionNameStore = useRouteTransitionNameStore()
+  let name: string
+  if (toDepth > fromDepth || to.name === '404') {
+    console.warn('in')
+    // 进入动画
+    name = 'slide-fadein-left'
+  }
+  else if (toDepth < fromDepth) {
+    // 返回动画
+    name = 'slide-fadein-right'
+  }
+  else {
+    const toIndex = to.meta.index ? to.meta.index : 0
+    const fromIndex = _from.meta.index ? _from.meta.index : 0
+    if (toIndex > fromIndex)
+      name = 'slide-right'
+    else if (toIndex < fromIndex)
+      name = 'slide-left'
+    else
+      name = ''
+  }
+  routeTransitionNameStore.setName(name)
+  // 路由缓存
+  useRouteCache.addRoute(to)
+  // 页面 title
+  setPageTitle(to.meta.title)
+  next()
+})
+
+router.afterEach(() => {})
+
+// 导出路由实例，并在 `main.ts` 挂载
+export default router

package/src/router/invoiceRoutes.ts

@@ -1,33 +1,33 @@
-import type { RouteRecordRaw } from 'vue-router'
-import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
-import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
-import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
-
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: '/',
-    name: 'root',
-    component: PageLayout,
-    redirect: { name: 'Component' },
-    children: [
-      {
-        path: '/invoiceShow',
-        name: 'invoiceShow',
-        component: invoiceShow,
-      },
-    ],
-  },
-  {
-    path: '/404',
-    name: '404',
-    component: NotFound,
-  },
-  {
-    path: '/:pathMatch(.*)',
-    redirect: {
-      name: '404',
-    },
-  },
-]
-
-export default routes
+import type { RouteRecordRaw } from 'vue-router'
+import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
+import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
+import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
+
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/',
+    name: 'root',
+    component: PageLayout,
+    redirect: { name: 'Component' },
+    children: [
+      {
+        path: '/invoiceShow',
+        name: 'invoiceShow',
+        component: invoiceShow,
+      },
+    ],
+  },
+  {
+    path: '/404',
+    name: '404',
+    component: NotFound,
+  },
+  {
+    path: '/:pathMatch(.*)',
+    redirect: {
+      name: '404',
+    },
+  },
+]
+
+export default routes

package/src/services/api/common.ts

@@ -1,109 +1,109 @@
-import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-
-const commonApi = {
-  // 获取配置
-  getConfig: 'logic/openapi/getLiuliConfiguration',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 编辑前查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-}
-
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- */
-export function getConfigByName(configName: string, callback: Function): void
-export function getConfigByName(configName: string, callback: Function, serviceName: string): void
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- * @param serviceName 服务名
- */
-export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
-  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
-}
-
-export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
-  return new Promise((resolve, reject) => {
-    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
-  })
-}
-
-/**
- * 临时使用
- * 获取琉璃配置，不走indexedDB缓存
- * @param configName
- * @param serviceName
- */
-export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
-}
-
-/**
- * 通用执行业务逻辑
- */
-export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
-  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
-}
-
-/**
- * 通用查询
- */
-export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.query}`, parameter)
-}
-
-/**
- * 编辑前查询
- */
-export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/${tableName}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.delete}`, parameter)
-}
-
-/**
- * @description: 上传
- */
-export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
-  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
-}
-
-/**
- * @description: 删除
- */
-export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return del(`/${serviceName}/entity/t_files`, data)
-}
-
-export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
-}
-export { commonApi }
+import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+
+const commonApi = {
+  // 获取配置
+  getConfig: 'logic/openapi/getLiuliConfiguration',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 编辑前查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+}
+
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ */
+export function getConfigByName(configName: string, callback: Function): void
+export function getConfigByName(configName: string, callback: Function, serviceName: string): void
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ * @param serviceName 服务名
+ */
+export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
+  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
+}
+
+export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
+  return new Promise((resolve, reject) => {
+    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
+  })
+}
+
+/**
+ * 临时使用
+ * 获取琉璃配置，不走indexedDB缓存
+ * @param configName
+ * @param serviceName
+ */
+export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
+}
+
+/**
+ * 通用执行业务逻辑
+ */
+export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
+  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
+}
+
+/**
+ * 通用查询
+ */
+export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.query}`, parameter)
+}
+
+/**
+ * 编辑前查询
+ */
+export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/${tableName}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
+}
+
+/**
+ * 通用删除
+ */
+export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.delete}`, parameter)
+}
+
+/**
+ * @description: 上传
+ */
+export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
+  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
+}
+
+/**
+ * @description: 删除
+ */
+export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return del(`/${serviceName}/entity/t_files`, data)
+}
+
+export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
+}
+export { commonApi }

package/src/services/api/manage.ts

@@ -1,8 +1,8 @@
-const manageApi = {
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
-}
-
-export {
-  manageApi,
-}
+const manageApi = {
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
+}
+
+export {
+  manageApi,
+}

package/src/services/api/search.ts

@@ -1,16 +1,16 @@
-import { post } from '@af-mobile-client-vue3/services/restTools'
-
-export async function getUserPermissions(userid: string) {
-  interface permissions {
-    name: string
-  }
-
-  const res = await post<permissions[]>(`/af-system/search`, {
-    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
-    userid,
-  })
-
-  return res.map((row) => {
-    return row.name
-  })
-}
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+export async function getUserPermissions(userid: string) {
+  interface permissions {
+    name: string
+  }
+
+  const res = await post<permissions[]>(`/af-system/search`, {
+    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+    userid,
+  })
+
+  return res.map((row) => {
+    return row.name
+  })
+}