af-mobile-client-vue3 1.3.55 → 1.3.58

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.55",
+  "version": "1.3.58",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/public/favicon.svg

@@ -1,4 +1,4 @@
-<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
-  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
-  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
-</svg>
+<svg t="1709866807903" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4913" width="32" height="32">
+  <path d="M512 598.528a111.232 111.232 0 0 0-111.232 111.2064V870.4h222.464v-160.6656c0-61.44-49.792-111.232-111.232-111.232z m0 58.0608c-30.72 0-55.6032 24.9088-55.6032 55.6288v105.0368h111.2064v-105.0368c0-30.72-24.8832-55.6288-55.6032-55.6288z" fill="#FB4D31" p-id="4914"></path>
+  <path d="M542.08 270.208l45.2608-78.5408a24.5248 24.5248 0 0 0 0-25.6A26.4448 26.4448 0 0 0 564.1472 153.6a26.3424 26.3424 0 0 0-22.5792 13.44L512 217.6256l-29.5424-50.5344c-4.5824-8.192-13.184-13.312-22.5536-13.4912a26.4448 26.4448 0 0 0-23.2448 12.4928 24.5248 24.5248 0 0 0 0 25.6l45.2352 78.5152L156.928 832.768a24.4736 24.4736 0 0 0 0.3328 25.088c4.8384 7.8336 13.3888 12.544 22.5792 12.5184h664.3456c9.3184 0 17.92-4.7616 22.6304-12.4672a24.4736 24.4736 0 0 0 0.3072-25.088l-325.0176-562.688v0.0512zM619.52 816.64h-33.3568c-12.3648 0-9.6768 0.1024-65.0496 0H512c-55.3728 0.1024-24.704 0-61.7984 0H225.28L512 322.1248 798.72 816.64h-179.2z" fill="#000000" p-id="4915"></path>
+</svg>

package/scripts/verifyCommit.js

@@ -1,19 +1,19 @@
-import fs from 'node:fs'
-
-// import process from 'node:process'
-
-const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
-
-const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
-// const mergeRe = /^(Merge pull request|Merge branch)/
-
-if (!commitRE.test(msg)) {
-  // if (!mergeRe.test(msg)) {
-  // console.log('git commit unpass')
-  // console.error('git commit error, needs title(scope): desc')
-  // process.exit(1)
-  // }
-}
-else {
-  console.log('git commit pass')
-}
+import fs from 'node:fs'
+
+// import process from 'node:process'
+
+const msg = fs.readFileSync('.git/COMMIT_EDITMSG', 'utf-8').trim()
+
+const commitRE = /^(?:revert: )?(?:feat|fix|docs|dx|style|refactor|perf|test|workflow|build|ci|chore|types|wip|release)(?:\(.+\))?: .{1,50}/
+// const mergeRe = /^(Merge pull request|Merge branch)/
+
+if (!commitRE.test(msg)) {
+  // if (!mergeRe.test(msg)) {
+  // console.log('git commit unpass')
+  // console.error('git commit error, needs title(scope): desc')
+  // process.exit(1)
+  // }
+}
+else {
+  console.log('git commit pass')
+}

package/src/App.vue

@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import type { ConfigProviderThemeVars } from 'vant'
 import NavBar from '@af-mobile-client-vue3/components/core/NavBar/index.vue'
 import Tabbar from '@af-mobile-client-vue3/components/core/Tabbar/index.vue'
 import { isDark, preferredDark } from '@af-mobile-client-vue3/composables/dark'
@@ -8,7 +7,7 @@ import { useHead } from '@unhead/vue'
 import {
   ConfigProvider as VanConfigProvider,
 } from 'vant/es'
-import { computed, reactive } from 'vue'
+import { computed } from 'vue'
 import { appDescription, appName } from './constants'
 
 useHead({
@@ -41,14 +40,10 @@ const keepAliveRouteNames = computed(() => {
 const mode = computed(() => {
   return isDark.value ? 'dark' : 'light'
 })
-
-const themeVars: ConfigProviderThemeVars = reactive({
-  baseFont: 'PingFangSC-Regular-woff2, serif',
-})
 </script>
 
 <template>
-  <VanConfigProvider :theme="mode" :theme-vars="themeVars" theme-vars-scope="global">
+  <VanConfigProvider :theme="mode" theme-vars-scope="global">
     <NavBar />
     <router-view v-slot="{ Component }">
       <section class="app-wrapper">
@@ -63,6 +58,24 @@ const themeVars: ConfigProviderThemeVars = reactive({
 
 <style>
 @import './font-style/font.css';
+body {
+  font-family:
+    Inter,
+    'PingFang SC',
+    'Microsoft YaHei UI',
+    system-ui,
+    -apple-system,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    'Noto Sans',
+    'Apple Color Emoji',
+    'Segoe UI Emoji',
+    'Segoe UI Symbol',
+    'Noto Color Emoji',
+    sans-serif !important;
+}
 input[type='password']::-ms-reveal {
   display: none;
 }

package/src/components/data/UserDetail/types.ts

@@ -23,4 +23,4 @@ export interface ConfigItem {
   format?: (value: string | number) => string
   template?: string
   condition?: (data: any) => boolean
-}
+}

package/src/components/data/XReportGrid/XAddReport/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XAddReport', XAddReport)
   },
-}
+}

package/src/components/data/XReportGrid/XReportDrawer/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XReportDrawer', XReportDrawer)
   },
-}
+}

package/src/components/data/XTag/index.vue

@@ -1,10 +1,10 @@
-<script setup lang="ts">
-</script>
-
-<template>
-  <VanTag />
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+</script>
+
+<template>
+  <VanTag />
+</template>
+
+<style scoped lang="less">
+
+</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/font-style/font.css

@@ -1,4 +1,68 @@
 @font-face {
-  font-family: 'PingFangSC-Regular-woff2';
-  src: url('./PingFangSC-Regular.woff2') format('woff2');
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('./PingFangSC-Regular.subset.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('./PingFangSC-Medium.subset.woff2') format('woff2');
+}
+
+@font-face {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('./PingFangSC-Semibold.subset.woff2') format('woff2');
+}
+
+/* fonts.css */
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('./Inter-Regular.woff2') format('woff2');
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('./Inter-Medium.woff2') format('woff2');
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('./Inter-SemiBold.woff2') format('woff2');
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+@font-face {
+  font-family: 'Inter';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('./Inter-Bold.woff2') format('woff2');
+  unicode-range:
+    U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074,
+    U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

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/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

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