af-mobile-client-vue3 1.1.8 → 1.1.10

package/src/components/layout/NormalDataLayout/index.vue

@@ -1,70 +1,70 @@
-<script setup lang="ts">
-import {
-  Col as VanCol,
-  Icon as VanIcon,
-  Row as VanRow,
-} from 'vant'
-
-const { title } = withDefaults(defineProps<{
-  // 标题
-  title: string
-}>(), {
-})
-
-// back
-const onClickLeft = () => history.back()
-</script>
-
-<template>
-  <!-- 常规数据布局 -->
-  <main class="layout_main">
-    <!-- 布局头部 -->
-    <div class="layout_header">
-      <VanRow class="header_row" justify="space-between">
-        <VanCol class="header_row_left_col">
-          <VanIcon class="header_row_icon" name="arrow-left" @click="onClickLeft" />
-          <span class="header_row_title">{{ title }}</span>
-        </VanCol>
-        <VanCol class="header_row_right_col">
-          <!-- 右侧区域 -->
-          <slot name="layout_header_row_right_col" />
-        </VanCol>
-      </VanRow>
-    </div>
-    <!-- 布局主体 -->
-    <div class="layout_content">
-      <slot name="layout_content" />
-    </div>
-  </main>
-</template>
-
-<style scoped lang="less">
-.layout_main {
-  display: flex;
-  flex-flow: column;
-  width: 100%;
-  height: 100vh;
-  .layout_header {
-    padding: var(--base-interval-1);
-    .header_row {
-      align-items: center;
-      .header_row_left_col {
-        flex-grow: 1;
-        .header_row_title {
-          margin-left: var(--van-padding-xs);
-          font-size: 20px;
-          font-weight: bold;
-        }
-      }
-      .header_row_icon {
-        font-size: 18px;
-      }
-    }
-  }
-  .layout_content {
-    flex: 1;
-    margin-top: var(--van-padding-base);
-    height: 0;
-  }
-}
-</style>
+<script setup lang="ts">
+import {
+  Col as VanCol,
+  Icon as VanIcon,
+  Row as VanRow,
+} from 'vant'
+
+const { title } = withDefaults(defineProps<{
+  // 标题
+  title: string
+}>(), {
+})
+
+// back
+const onClickLeft = () => history.back()
+</script>
+
+<template>
+  <!-- 常规数据布局 -->
+  <main class="layout_main">
+    <!-- 布局头部 -->
+    <div class="layout_header">
+      <VanRow class="header_row" justify="space-between">
+        <VanCol class="header_row_left_col">
+          <VanIcon class="header_row_icon" name="arrow-left" @click="onClickLeft" />
+          <span class="header_row_title">{{ title }}</span>
+        </VanCol>
+        <VanCol class="header_row_right_col">
+          <!-- 右侧区域 -->
+          <slot name="layout_header_row_right_col" />
+        </VanCol>
+      </VanRow>
+    </div>
+    <!-- 布局主体 -->
+    <div class="layout_content">
+      <slot name="layout_content" />
+    </div>
+  </main>
+</template>
+
+<style scoped lang="less">
+.layout_main {
+  display: flex;
+  flex-flow: column;
+  width: 100%;
+  height: 100vh;
+  .layout_header {
+    padding: var(--base-interval-1);
+    .header_row {
+      align-items: center;
+      .header_row_left_col {
+        flex-grow: 1;
+        .header_row_title {
+          margin-left: var(--van-padding-xs);
+          font-size: 20px;
+          font-weight: bold;
+        }
+      }
+      .header_row_icon {
+        font-size: 18px;
+      }
+    }
+  }
+  .layout_content {
+    flex: 1;
+    margin-top: var(--van-padding-base);
+    height: 0;
+  }
+}
+</style>

package/src/components/layout/TabBarLayout/index.vue

@@ -1,40 +1,40 @@
-<script setup lang="ts">
-import {
-  Tabbar as VanTabbar,
-  TabbarItem as VanTabbarItem,
-} from 'vant'
-import { defineProps } from 'vue'
-
-const { barList, callbacks } = defineProps<{
-  barList?: Array<{ icon: string, text: string, method: string }>
-  callbacks?: object
-}>()
-
-function handleClick(index) {
-  const methodName = (barList[index] as any).method
-  callbacks[methodName]()
-}
-</script>
-
-<template>
-  <VanTabbar class="van-bar">
-    <VanTabbarItem v-for="(item, index) in barList" :key="index" :icon="(item as any).icon" @click="handleClick(index)">
-      {{ (item as any).text }}
-    </VanTabbarItem>
-  </VanTabbar>
-</template>
-
-<style scoped lang="less">
-.van-bar {
-  height: 8vh;
-  background-color: #f7f8fa;
-  color: black;
-}
-.van-tabbar-item:hover {
-  color: var(--van-text-color-2);
-}
-:deep(.van-tabbar-item--active) {
-  background-color: #f7f8fa;
-  color: black;
-}
-</style>
+<script setup lang="ts">
+import {
+  Tabbar as VanTabbar,
+  TabbarItem as VanTabbarItem,
+} from 'vant'
+import { defineProps } from 'vue'
+
+const { barList, callbacks } = defineProps<{
+  barList?: Array<{ icon: string, text: string, method: string }>
+  callbacks?: object
+}>()
+
+function handleClick(index) {
+  const methodName = (barList[index] as any).method
+  callbacks[methodName]()
+}
+</script>
+
+<template>
+  <VanTabbar class="van-bar">
+    <VanTabbarItem v-for="(item, index) in barList" :key="index" :icon="(item as any).icon" @click="handleClick(index)">
+      {{ (item as any).text }}
+    </VanTabbarItem>
+  </VanTabbar>
+</template>
+
+<style scoped lang="less">
+.van-bar {
+  height: 8vh;
+  background-color: #f7f8fa;
+  color: black;
+}
+.van-tabbar-item:hover {
+  color: var(--van-text-color-2);
+}
+:deep(.van-tabbar-item--active) {
+  background-color: #f7f8fa;
+  color: black;
+}
+</style>

package/src/components.d.ts

@@ -1,53 +1,53 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
-// Read more: https://github.com/vuejs/core/pull/3399
-export {}
-
-declare module 'vue' {
-  export interface GlobalComponents {
-    BeautifulLoading: typeof import('./components/core/BeautifulLoading/index.vue')['default']
-    MicroAppView: typeof import('./components/core/App/MicroAppView.vue')['default']
-    NavBar: typeof import('./components/core/NavBar/index.vue')['default']
-    NormalDataLayout: typeof import('./components/layout/NormalDataLayout/index.vue')['default']
-    RouterLink: typeof import('vue-router')['RouterLink']
-    RouterView: typeof import('vue-router')['RouterView']
-    SvgIcon: typeof import('./components/core/SvgIcon/index.vue')['default']
-    Tabbar: typeof import('./components/core/Tabbar/index.vue')['default']
-    TabBarLayout: typeof import('./components/layout/TabBarLayout/index.vue')['default']
-    Uploader: typeof import('./components/core/Uploader/index.vue')['default']
-    VanArea: typeof import('vant/es')['Area']
-    VanButton: typeof import('vant/es')['Button']
-    VanCalendar: typeof import('vant/es')['Calendar']
-    VanCell: typeof import('vant/es')['Cell']
-    VanCellGroup: typeof import('vant/es')['CellGroup']
-    VanCheckbox: typeof import('vant/es')['Checkbox']
-    VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
-    VanDatePicker: typeof import('vant/es')['DatePicker']
-    VanField: typeof import('vant/es')['Field']
-    VanForm: typeof import('vant/es')['Form']
-    VanLoading: typeof import('vant/es')['Loading']
-    VanNavBar: typeof import('vant/es')['NavBar']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanRate: typeof import('vant/es')['Rate']
-    VanRow: typeof import('vant/es')['Row']
-    VanSlider: typeof import('vant/es')['Slider']
-    VanSpace: typeof import('vant/es')['Space']
-    VanStepper: typeof import('vant/es')['Stepper']
-    VanSwitch: typeof import('vant/es')['Switch']
-    VanTimePicker: typeof import('vant/es')['TimePicker']
-    XBadge: typeof import('./components/data/XBadge/index.vue')['default']
-    XCellDetail: typeof import('./components/data/XCellDetail/index.vue')['default']
-    XCellList: typeof import('./components/data/XCellList/index.vue')['default']
-    XForm: typeof import('./components/data/XForm/index.vue')['default']
-    XFormItem: typeof import('./components/data/XFormItem/index.vue')['default']
-    XMultiSelect: typeof import('./components/core/XMultiSelect/index.vue')['default']
-    XReportForm: typeof import('./components/data/XReportForm/index.vue')['default']
-    XReportFormJsonRender: typeof import('./components/data/XReportForm/XReportFormJsonRender.vue')['default']
-    XSelect: typeof import('./components/core/XSelect/index.vue')['default']
-  }
-}
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+export {}
+
+declare module 'vue' {
+  export interface GlobalComponents {
+    BeautifulLoading: typeof import('./components/core/BeautifulLoading/index.vue')['default']
+    MicroAppView: typeof import('./components/core/App/MicroAppView.vue')['default']
+    NavBar: typeof import('./components/core/NavBar/index.vue')['default']
+    NormalDataLayout: typeof import('./components/layout/NormalDataLayout/index.vue')['default']
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
+    SvgIcon: typeof import('./components/core/SvgIcon/index.vue')['default']
+    Tabbar: typeof import('./components/core/Tabbar/index.vue')['default']
+    TabBarLayout: typeof import('./components/layout/TabBarLayout/index.vue')['default']
+    Uploader: typeof import('./components/core/Uploader/index.vue')['default']
+    VanArea: typeof import('vant/es')['Area']
+    VanButton: typeof import('vant/es')['Button']
+    VanCalendar: typeof import('vant/es')['Calendar']
+    VanCell: typeof import('vant/es')['Cell']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
+    VanCheckbox: typeof import('vant/es')['Checkbox']
+    VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
+    VanDatePicker: typeof import('vant/es')['DatePicker']
+    VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
+    VanLoading: typeof import('vant/es')['Loading']
+    VanNavBar: typeof import('vant/es')['NavBar']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPopup: typeof import('vant/es')['Popup']
+    VanRadio: typeof import('vant/es')['Radio']
+    VanRadioGroup: typeof import('vant/es')['RadioGroup']
+    VanRate: typeof import('vant/es')['Rate']
+    VanRow: typeof import('vant/es')['Row']
+    VanSlider: typeof import('vant/es')['Slider']
+    VanSpace: typeof import('vant/es')['Space']
+    VanStepper: typeof import('vant/es')['Stepper']
+    VanSwitch: typeof import('vant/es')['Switch']
+    VanTimePicker: typeof import('vant/es')['TimePicker']
+    XBadge: typeof import('./components/data/XBadge/index.vue')['default']
+    XCellDetail: typeof import('./components/data/XCellDetail/index.vue')['default']
+    XCellList: typeof import('./components/data/XCellList/index.vue')['default']
+    XForm: typeof import('./components/data/XForm/index.vue')['default']
+    XFormItem: typeof import('./components/data/XFormItem/index.vue')['default']
+    XMultiSelect: typeof import('./components/core/XMultiSelect/index.vue')['default']
+    XReportForm: typeof import('./components/data/XReportForm/index.vue')['default']
+    XReportFormJsonRender: typeof import('./components/data/XReportForm/XReportFormJsonRender.vue')['default']
+    XSelect: typeof import('./components/core/XSelect/index.vue')['default']
+  }
+}

package/src/env.d.ts

@@ -1,16 +1,16 @@
-/// <reference types="vite/client" />
-
-declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
-
-  // eslint-disable-next-line ts/no-empty-object-type
-  const component: DefineComponent<{}, {}, any>
-  export default component
-}
-
-interface Window {
-  mount: any
-  remount: any
-  unmount: any
-  readonly __MICRO_APP_ENVIRONMENT__: any
-}
+/// <reference types="vite/client" />
+
+declare module '*.vue' {
+  import type { DefineComponent } from 'vue'
+
+  // eslint-disable-next-line ts/no-empty-object-type
+  const component: DefineComponent<{}, {}, any>
+  export default component
+}
+
+interface Window {
+  mount: any
+  remount: any
+  unmount: any
+  readonly __MICRO_APP_ENVIRONMENT__: any
+}

package/src/font-style/font.css

@@ -1,4 +1,4 @@
-@font-face {
-  font-family: 'PingFangSC-Regular-woff2';
-  src: url('./PingFangSC-Regular.woff2') format('woff2');
+@font-face {
+  font-family: 'PingFangSC-Regular-woff2';
+  src: url('./PingFangSC-Regular.woff2') format('woff2');
 }

package/src/hooks/useCommon.ts

@@ -1,9 +1,9 @@
-export function formatDate(date) {
-  const year = date.getFullYear()
-  const month = (date.getMonth() + 1).toString().padStart(2, '0') // 月份加1，并补零
-  const day = date.getDate().toString().padStart(2, '0') // 日期补零
-  const hours = date.getHours().toString().padStart(2, '0') // 小时补零
-  const minutes = date.getMinutes().toString().padStart(2, '0') // 分钟补零
-  const seconds = date.getSeconds().toString().padStart(2, '0') // 秒数补零
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
-}
+export function formatDate(date) {
+  const year = date.getFullYear()
+  const month = (date.getMonth() + 1).toString().padStart(2, '0') // 月份加1，并补零
+  const day = date.getDate().toString().padStart(2, '0') // 日期补零
+  const hours = date.getHours().toString().padStart(2, '0') // 小时补零
+  const minutes = date.getMinutes().toString().padStart(2, '0') // 分钟补零
+  const seconds = date.getSeconds().toString().padStart(2, '0') // 秒数补零
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}

package/src/layout/PageLayout.vue

@@ -1,16 +1,15 @@
 <script setup lang="ts">
 import Tabbar from '@af-mobile-client-vue3/components/core/Tabbar/index.vue'
-import useCachedViewStore from '@af-mobile-client-vue3/stores/modules/cachedView'
+import useRouteCache from '@af-mobile-client-vue3/stores/modules/routeCache'
 import useRouteTransitionNameStore from '@af-mobile-client-vue3/stores/modules/routeTransitionName'
 import { getFunction } from '@af-mobile-client-vue3/utils/common'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 
-const cachedViews = computed(() => {
-  return useCachedViewStore().cachedViewList
+const keepAliveRouteNames = computed(() => {
+  return useRouteCache().routeCaches as string[]
 })
-
 const routeTransitionNameStore = useRouteTransitionNameStore()
 const { routeTransitionName } = storeToRefs(routeTransitionNameStore)
 
@@ -32,7 +31,7 @@ const routeState = useRoute()
     <!--  transition 包裹 router-view 控制台会有警告，router-view在外层会导致动画开始时会闪过一帧上一级页面。先忽略警告这样写 -->
     <transition :name="routeTransitionName">
       <router-view v-slot="{ Component, route }">
-        <keep-alive :include="cachedViews">
+        <keep-alive :include="keepAliveRouteNames">
           <div :key="route.name" class="app-wrapper">
             <component :is="Component" />
           </div>

package/src/layout/SingleLayout.vue

@@ -1,13 +1,12 @@
 <script setup lang="ts">
-import useCachedViewStore from '@af-mobile-client-vue3/stores/modules/cachedView'
+import useRouteCache from '@af-mobile-client-vue3/stores/modules/routeCache'
 import useRouteTransitionNameStore from '@af-mobile-client-vue3/stores/modules/routeTransitionName'
 import { storeToRefs } from 'pinia'
 import { computed } from 'vue'
 
-const cachedViews = computed(() => {
-  return useCachedViewStore().cachedViewList
+const keepAliveRouteNames = computed(() => {
+  return useRouteCache().routeCaches as string[]
 })
-
 const routeTransitionNameStore = useRouteTransitionNameStore()
 const { routeTransitionName } = storeToRefs(routeTransitionNameStore)
 </script>
@@ -16,7 +15,7 @@ const { routeTransitionName } = storeToRefs(routeTransitionNameStore)
   <div class="pageLayout">
     <router-view v-slot="{ Component, route }">
       <transition :name="routeTransitionName">
-        <keep-alive :include="cachedViews">
+        <keep-alive :include="keepAliveRouteNames">
           <div :key="route.name" class="app-wrapper">
             <component :is="Component" />
           </div>

package/src/locales/en-US.json

@@ -1,25 +1,25 @@
-{
-  "home": {
-    "darkMode": "🌗 Dark Mode",
-    "mockGuide": "💿 Mock Guide",
-    "language": "📚 Language",
-    "404Demo": "🙅 Page 404 Demo",
-    "echartsDemo": "📊 Echarts Demo",
-    "persistPiniaState": "🍍 Persistent Pinia state",
-    "unocssExample": "🎨 Unocss example"
-  },
-  "mock": {
-    "fromAsyncData": "Data from asynchronous requests",
-    "noData": "No data",
-    "pull": "Pull",
-    "reset": "Reset"
-  },
-  "charts": {
-    "January": "Jan",
-    "February": "Feb",
-    "March": "Mar",
-    "April": "Apr",
-    "May": "May",
-    "June": "Jun"
-  }
-}
+{
+  "home": {
+    "darkMode": "🌗 Dark Mode",
+    "mockGuide": "💿 Mock Guide",
+    "language": "📚 Language",
+    "404Demo": "🙅 Page 404 Demo",
+    "echartsDemo": "📊 Echarts Demo",
+    "persistPiniaState": "🍍 Persistent Pinia state",
+    "unocssExample": "🎨 Unocss example"
+  },
+  "mock": {
+    "fromAsyncData": "Data from asynchronous requests",
+    "noData": "No data",
+    "pull": "Pull",
+    "reset": "Reset"
+  },
+  "charts": {
+    "January": "Jan",
+    "February": "Feb",
+    "March": "Mar",
+    "April": "Apr",
+    "May": "May",
+    "June": "Jun"
+  }
+}

package/src/locales/zh-CN.json

@@ -1,25 +1,25 @@
-{
-  "home": {
-    "darkMode": "🌗 暗黑模式",
-    "mockGuide": "💿 Mock 指南",
-    "language": "📚 语言",
-    "echartsDemo": "📊 Echarts 演示",
-    "persistPiniaState": "🍍 持久化 Pinia 状态",
-    "404Demo": "🙅 404页 演示",
-    "unocssExample": "🎨 Unocss 示例"
-  },
-  "mock": {
-    "fromAsyncData": "来自异步请求的数据",
-    "pull": "请求",
-    "reset": "清空",
-    "noData": "暂无数据"
-  },
-  "charts": {
-    "January": "1月",
-    "February": "2月",
-    "March": "3月",
-    "April": "4月",
-    "May": "5月",
-    "June": "6月"
-  }
-}
+{
+  "home": {
+    "darkMode": "🌗 暗黑模式",
+    "mockGuide": "💿 Mock 指南",
+    "language": "📚 语言",
+    "echartsDemo": "📊 Echarts 演示",
+    "persistPiniaState": "🍍 持久化 Pinia 状态",
+    "404Demo": "🙅 404页 演示",
+    "unocssExample": "🎨 Unocss 示例"
+  },
+  "mock": {
+    "fromAsyncData": "来自异步请求的数据",
+    "pull": "请求",
+    "reset": "清空",
+    "noData": "暂无数据"
+  },
+  "charts": {
+    "January": "1月",
+    "February": "2月",
+    "March": "3月",
+    "April": "4月",
+    "May": "5月",
+    "June": "6月"
+  }
+}

package/src/plugins/AppData.ts

@@ -1,38 +1,38 @@
-import type { App } from 'vue'
-import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-
-const Storage = createStorage({ storage: localStorage })
-
-export const GetAppDataService = {
-  install(app: App<Element>) {
-    app.provide('$appdata', GetAppDataService)
-  },
-  async load() {
-  },
-  // 返回树形省市区
-  async getDivisionsOhChinaForTree() {
-    // 获取省市区数据
-    return new Promise((resolve, reject) => {
-      try {
-        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
-          resolve(res)
-        }, (processRes) => {
-          return handleTree(processRes, 'code', 'parentcode', null)
-        })
-      }
-      catch (e) {
-        reject(e)
-      }
-    })
-  },
-  getWebConfigByKey(key: string) {
-    const object = Storage.get(APP_WEB_CONFIG_KEY)
-    return object[key]
-  },
-}
-
-export default GetAppDataService
+import type { App } from 'vue'
+import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
+import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+
+const Storage = createStorage({ storage: localStorage })
+
+export const GetAppDataService = {
+  install(app: App<Element>) {
+    app.provide('$appdata', GetAppDataService)
+  },
+  async load() {
+  },
+  // 返回树形省市区
+  async getDivisionsOhChinaForTree() {
+    // 获取省市区数据
+    return new Promise((resolve, reject) => {
+      try {
+        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
+          resolve(res)
+        }, (processRes) => {
+          return handleTree(processRes, 'code', 'parentcode', null)
+        })
+      }
+      catch (e) {
+        reject(e)
+      }
+    })
+  },
+  getWebConfigByKey(key: string) {
+    const object = Storage.get(APP_WEB_CONFIG_KEY)
+    return object[key]
+  },
+}
+
+export default GetAppDataService