af-mobile-client-vue3 1.2.59 → 1.3.2

package/src/components/data/XReportGrid/XReportJsonRender.vue

@@ -123,7 +123,7 @@ function determineCellStyle(labelFunctionReturn: any, color = '#000', borderWidt
     padding: '8px',
   }
 
-  let result = {}
+  let result: any
   // 判断表头是否有声明的样式
   if (labelFunctionReturn.style !== undefined)
     result = props.noTopBorder ? { ...NoTopBorder, ...labelFunctionReturn.style } : { ...withBorder, ...labelFunctionReturn.style }
@@ -157,10 +157,10 @@ onBeforeMount(() => {
   // 遍历配置，将所有JSON传递的方法保存到一个数组中，并用index来一一对应
   for (let i = 0; i < props.config.content.length; i++) {
     receivedFunction.value.push({
-      // eslint-disable-next-line no-eval
-      labelFunction: eval(`(${props.config.content[i].customFunctionForLabel})`),
-      // eslint-disable-next-line no-eval
-      valueFunction: eval(`(${props.config.content[i].customFunctionForValue})`),
+      // eslint-disable-next-line no-new-func
+      labelFunction: new Function(`return ${props.config.content[i].customFunctionForLabel}`)(),
+      // eslint-disable-next-line no-new-func
+      valueFunction: new Function(`return ${props.config.content[i].customFunctionForValue}`)(),
     })
   }
 })
@@ -188,7 +188,7 @@ onBeforeMount(() => {
               <!--      表头        -->
               <td
                 :class="noTopBorder ? 'tdWithNoTopBorder' : 'tdWithBorder'"
-                :style="determineCellStyle(receivedFunction[rowIndex].labelFunction(config, item))"
+                :style="determineCellStyle(receivedFunction[rowIndex].labelFunction(config, row))"
                 colspan="6"
               >
                 <template v-if="receivedFunction[rowIndex].labelFunction(config).type === 'key'">
@@ -214,13 +214,13 @@ onBeforeMount(() => {
                 </template>
                 <template v-else>
                   <template v-if="receivedFunction[rowIndex].valueFunction(config).originalKey">
-                    <van-input
+                    <van-field
                       :value="config.data[receivedFunction[rowIndex].valueFunction(config).originalKey]"
                       @input="(val) => emit('update:config', { ...config, data: { ...config.data, [receivedFunction[rowIndex].valueFunction(config).originalKey]: val } })"
                     />
                   </template>
                   <template v-else>
-                    <van-input
+                    <van-field
                       :value="config.data[receivedFunction[rowIndex].valueFunction(config).content]"
                       @input="(val) => emit('update:config', { ...config, data: { ...config.data, [receivedFunction[rowIndex].valueFunction(config).content]: val } })"
                     />
@@ -304,14 +304,14 @@ onBeforeMount(() => {
                       />
                     </template>
                     <template v-else>
-                      <van-input
+                      <van-field
                         :value="item[receivedFunction[rowIndex].valueFunction(config, item).originalKey]"
                         @input="(val) => emit('update:config', { ...config, data: { ...config.data, [receivedFunction[rowIndex].valueFunction(config, item).originalKey]: val } })"
                       />
                     </template>
                   </template>
                   <template v-else>
-                    <van-input
+                    <van-field
                       :value="item[receivedFunction[rowIndex].valueFunction(config, item).content]"
                       @input="(val) => emit('update:config', { ...config, data: { ...config.data, [receivedFunction[rowIndex].valueFunction(config, item).content]: val } })"
                     />
@@ -341,7 +341,7 @@ onBeforeMount(() => {
 
 <style scoped lang="less">
 .imgSrc {
-  color: rgb( 24,144,255 );
+  color: rgb(24, 144, 255);
   font-size: 0.9em;
   margin: auto;
 }

package/src/components/data/XReportGrid/XReportTrGroup.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import XFormTable from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 // import { getRealKeyData } from '@af-mobile-client-vue3/utils/util'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
 import {
@@ -7,7 +8,7 @@ import {
   Row as VanRow,
 } from 'vant'
 
-import { computed, defineAsyncComponent, inject, nextTick, onBeforeMount, ref, watch } from 'vue'
+import { computed, inject, nextTick, onBeforeMount, ref, watch } from 'vue'
 
 const props = withDefaults(defineProps<Props>(), {
   showImgInCell: false,
@@ -24,7 +25,7 @@ const emit = defineEmits<{
   (e: 'update:configData', value: any): void
   (e: 'change', value: any): void
   (e: 'updateImg', value: any): void
-  (e: 'selectRow', value: any): void
+  (e: 'selectRow', selectedRowKeys: any[], selectedRows: any[]): void
   (e: 'slotRendered'): void
   (e: 'listClick', value: any): void
 }>()
@@ -36,7 +37,6 @@ const emit = defineEmits<{
 const isInAModal = ref(false)
 
 // 动态导入组件
-const XFormTable = defineAsyncComponent(() => import('@af-mobile-client-vue3/components/data/XCellList/index.vue'))
 // const XAddNativeForm = defineAsyncComponent(() => import('@af-mobile-client-vue3/components/common/XAddNativeForm/XAddNativeForm.vue'))
 // const XFormGroup = defineAsyncComponent(() => import('@af-mobile-client-vue3/components/common/XFormGroup/XFormGroup.vue'))
 // const XTreePro = defineAsyncComponent(() => import('@af-mobile-client-vue3/components/common/XTree/XTreePro.vue'))

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

@@ -5,11 +5,10 @@ import {
   Row as VanRow,
 } from 'vant'
 
-const { title } = withDefaults(defineProps<{
+const { title } = defineProps<{
   // 标题
   title: string
-}>(), {
-})
+}>()
 
 // back
 const onClickLeft = () => history.back()

package/src/config/routes.ts

@@ -1,5 +1,9 @@
-// 定义导航栏和标签栏可见的路由白名单
-export const routeWhiteList: readonly string[] = [
+/**
+ * List of root-level route names.
+ * In the Navbar component, the left arrow is hidden for these routes.
+ * However, the Tabbar is shown on these routes.
+ */
+export const rootRouteList: readonly string[] = [
   'ComponentView', // 首页
   'userProfile', // 个人中心
 ]

package/src/constants/index.ts

@@ -0,0 +1,2 @@
+export const appName = 'Vue3-Client'
+export const appDescription = '基于Vant4的移动端组件库扩展'

package/src/locales/en-US.json

@@ -1,29 +1,46 @@
 {
-  "menus": {
-    "home": "Home",
-    "profile": "My Center",
+  "navbar": {
+    "Home": "Home",
+    "Profile": "Profile",
+    "Mock": "🗂️ Mock",
+    "Charts": "📊 Charts",
+    "UnoCSS": "⚡ UnoCSS",
+    "Counter": "🍍 Persistent State",
+    "KeepAlive": "♻️ Page Cache",
+    "ScrollCache": "📍 Scroll Cache",
+    "Login": "🧑‍💻 Login",
+    "Register": "🧑‍💻 Register",
+    "ForgotPassword": "❓ Forgot Password",
+    "Settings": "⚙️ Settings",
+    "404": "⚠️ Page 404",
+    "Undefined": "🤷 Undefined title"
+  },
+
+  "tabbar": {
+    "home": "HOME",
+    "profile": "PROFILE"
+  },
+
+  "home": {
     "darkMode": "🌗 Dark Mode",
-    "mockGuide": "💿 Mock Guide",
     "language": "📚 Language",
-    "404Demo": "🙅 Page 404 Demo",
-    "echartsDemo": "📊 Echarts Demo",
-    "persistPiniaState": "🍍 Persistent Pinia state",
-    "unocssExample": "🎨 Unocss example",
-    "keepAlive": "🧡 KeepAlive Demo",
-    "scrollCache": "📜 Scroll Cache Demo",
-    "login": "🔒 Login",
-    "register": "Register",
     "settings": "Settings",
-    "basicSettings": "Basic Settings",
-    "exampleComponents": "Example components",
-    "forgot-password": "Forgot Password"
+    "examples": "Examples"
   },
+
+  "profile": {
+    "login": "Login",
+    "settings": "Settings",
+    "docs": "Docs"
+  },
+
   "mock": {
     "fromAsyncData": "Data from asynchronous requests",
     "noData": "No data",
     "pull": "Pull",
     "reset": "Reset"
   },
+
   "charts": {
     "January": "Jan",
     "February": "Feb",
@@ -32,24 +49,28 @@
     "May": "May",
     "June": "Jun"
   },
-  "layouts": {
-    "home": "HOME",
-    "profile": "PROFILE"
+
+  "counter": {
+    "description": "This counter's state is persisted via Pinia. Try refreshing the page to see it in action."
   },
-  "profile": {
-    "login": "Login",
-    "settings": "Settings",
-    "docs": "Docs"
+
+  "unocss": {
+    "title": "Hello, Unocss!",
+    "description": "This is a simple example of Unocss in action.",
+    "button": "Button"
   },
+
   "keepAlive": {
     "label": "The current component will be cached"
   },
+
   "scrollCache": {
     "sectionTitle": "Section title",
     "sectionText": "Section text text text text text text text text text text",
     "finished": "Already at the bottom ~",
     "loading": "Loading..."
   },
+
   "login": {
     "login": "Sign In",
     "logout": "Sign Out",
@@ -57,14 +78,15 @@
     "password": "Password",
     "pleaseEnterEmail": "Please enter email",
     "pleaseEnterPassword": "Please enter password",
-    "sign-up": "Click to sign up",
-    "forgot-password": "Forgot password?"
+    "signUp": "Click to sign up",
+    "forgotPassword": "Forgot password?"
   },
-  "forgot-password": {
+
+  "forgotPassword": {
     "email": "Email",
     "code": "Code",
     "password": "Password",
-    "comfirmPassword": "Password again",
+    "confirmPassword": "Password again",
     "pleaseEnterEmail": "Please enter email",
     "pleaseEnterCode": "Please enter code",
     "pleaseEnterPassword": "Please enter password",
@@ -77,12 +99,13 @@
     "sendCodeSuccess": "Sent, the code is",
     "passwordResetSuccess": "Password reset succeeded"
   },
+
   "register": {
     "email": "Email",
     "code": "Code",
     "nickname": "Nickname",
     "password": "Password",
-    "comfirmPassword": "Password again",
+    "confirmPassword": "Password again",
     "pleaseEnterEmail": "Please enter email",
     "pleaseEnterCode": "Please enter code",
     "pleaseEnterNickname": "Please enter nickname",
@@ -96,9 +119,10 @@
     "sendCodeSuccess": "Sent, the code is",
     "registerSuccess": "Register succeeded"
   },
+
   "settings": {
     "logout": "Sign Out",
     "currentVersion": "Current Version",
-    "comfirmTitle": "Confirm Exit?"
+    "confirmTitle": "Confirm Exit?"
   }
 }

package/src/locales/zh-CN.json

@@ -1,29 +1,46 @@
 {
-  "menus": {
-    "home": "主页",
-    "profile": "个人中心",
-    "darkMode": "🌗 暗黑模式",
-    "mockGuide": "💿 Mock 指南",
-    "language": "📚 语言",
-    "echartsDemo": "📊 Echarts 演示",
-    "persistPiniaState": "🍍 持久化 Pinia 状态",
-    "404Demo": "🙅 404页 演示",
-    "unocssExample": "🎨 Unocss 示例",
-    "keepAlive": "🧡 KeepAlive 演示",
-    "scrollCache": "📜 滚动缓存 演示",
-    "login": "🔒 用户登录",
-    "register": "用户注册",
+  "navbar": {
+    "Home": "主页",
+    "Profile": "我的",
+    "Mock": "🗂️ Mock",
+    "Charts": "📊 图表",
+    "UnoCSS": "⚡ UnoCSS",
+    "Counter": "🍍 状态持久化",
+    "KeepAlive": "♻️ 页面缓存",
+    "ScrollCache": "📍 滚动缓存",
+    "Login": "🧑‍💻 登录",
+    "Register": "🧑‍💻 注册",
+    "ForgotPassword": "❓ 忘记密码",
+    "Settings": "⚙️ 设置",
+    "404": "⚠️ 404 页面",
+    "Undefined": "🤷 未定义标题"
+  },
+
+  "tabbar": {
+    "home": "首页",
+    "profile": "我的"
+  },
+
+  "home": {
+    "darkMode": "🌗 深色模式",
+    "language": "📚 多语言",
+    "settings": "设置",
+    "examples": "示例"
+  },
+
+  "profile": {
+    "login": "登录",
     "settings": "设置",
-    "basicSettings": "基本设置",
-    "exampleComponents": "示例组件",
-    "forgot-password": "忘记密码"
+    "docs": "文档"
   },
+
   "mock": {
     "fromAsyncData": "来自异步请求的数据",
+    "noData": "暂无数据",
     "pull": "请求",
-    "reset": "清空",
-    "noData": "暂无数据"
+    "reset": "清空"
   },
+
   "charts": {
     "January": "1月",
     "February": "2月",
@@ -32,39 +49,44 @@
     "May": "5月",
     "June": "6月"
   },
-  "layouts": {
-    "home": "首页",
-    "profile": "我的"
+
+  "counter": {
+    "description": "该计数器的状态通过 Pinia 持久化。刷新页面试试看！"
   },
-  "profile": {
-    "login": "登录",
-    "settings": "设置",
-    "docs": "文档"
+
+  "unocss": {
+    "title": "你好, Unocss!",
+    "description": "这是一个简单的 Unocss 使用示例。",
+    "button": "按钮"
   },
+
   "keepAlive": {
     "label": "当前组件将会被缓存"
   },
+
   "scrollCache": {
     "sectionTitle": "段落标题",
     "sectionText": "段落内容段落内容段落内容段落内容段落内容段落内容",
     "finished": "已经到底啦 ~",
     "loading": "加载中..."
   },
+
   "login": {
     "login": "登录",
-    "logout": "退出",
+    "logout": "退出登录",
     "email": "邮箱",
     "password": "密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterPassword": "请输入密码",
-    "sign-up": "还没有账号？点击注册",
-    "forgot-password": "忘记密码？"
+    "signUp": "还没有账号？点击注册",
+    "forgotPassword": "忘记密码？"
   },
-  "forgot-password": {
+
+  "forgotPassword": {
     "email": "邮箱",
     "code": "验证码",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterPassword": "请输入密码",
@@ -77,12 +99,13 @@
     "sendCodeSuccess": "已发送，验证码为",
     "passwordResetSuccess": "密码重置成功"
   },
+
   "register": {
     "email": "邮箱",
     "code": "验证码",
     "nickname": "昵称",
     "password": "密码",
-    "comfirmPassword": "再次输入密码",
+    "confirmPassword": "再次输入密码",
     "pleaseEnterEmail": "请输入邮箱",
     "pleaseEnterCode": "请输入验证码",
     "pleaseEnterNickname": "请输入昵称",
@@ -96,9 +119,10 @@
     "sendCodeSuccess": "已发送，验证码为",
     "registerSuccess": "注册成功"
   },
+
   "settings": {
     "logout": "退出登录",
     "currentVersion": "当前版本",
-    "comfirmTitle": "确认退出？"
+    "confirmTitle": "确认退出？"
   }
 }

package/src/main.ts

@@ -10,8 +10,6 @@ import 'virtual:uno.css'
 import '@af-mobile-client-vue3/styles/app.less'
 import '@af-mobile-client-vue3/styles/var.less'
 
-// svg icon
-import 'virtual:svg-icons-register'
 // Vant 桌面端适配
 import '@vant/touch-emulator'
 

package/src/router/routes.ts

@@ -10,7 +10,6 @@ import XCellDetailView from '@af-mobile-client-vue3/views/component/XCellDetailV
 import XCellListView from '@af-mobile-client-vue3/views/component/XCellListView/index.vue'
 import XFormAppraiseView from '@af-mobile-client-vue3/views/component/XFormAppraiseView/index.vue'
 import XFormGroupView from '@af-mobile-client-vue3/views/component/XFormGroupView/index.vue'
-import xformgroup222 from '@af-mobile-client-vue3/views/component/XFormGroupView/xformgroup222.vue'
 import XFormView from '@af-mobile-client-vue3/views/component/XFormView/index.vue'
 import XOlMapView from '@af-mobile-client-vue3/views/component/XOlMapView/index.vue'
 import XLocationPicker from '@af-mobile-client-vue3/views/component/XOlMapView/XLocationPicker/index.vue'
@@ -67,11 +66,6 @@ const routes: Array<RouteRecordRaw> = [
         name: 'XCellDetailView',
         component: XCellDetailView,
       },
-      {
-        path: '/xformgroup222',
-        name: 'xformgroup222',
-        component: xformgroup222,
-      },
       {
         path: '/Component/XFormGroupView',
         name: 'XFormGroupView',

package/src/router/types.ts

@@ -2,8 +2,6 @@ import type { RouteLocationNormalized } from 'vue-router'
 
 export type EnhancedRouteLocation = RouteLocationNormalized & {
   meta: {
-    level?: number | unknown
-    name?: string
     keepAlive?: boolean
   }
 }

package/src/types/vue-router.d.ts

@@ -2,8 +2,6 @@ declare module 'vue-router' {
   interface RouteMeta {
     /** page title */
     title?: string
-    /** i18n key */
-    i18n?: string
     /** keepalive */
     keepAlive?: boolean
   }

package/src/utils/mobileUtil.ts

@@ -21,9 +21,9 @@ export class mobileUtil {
   static execute(locationParam: Param): any {
     locationParam.callBackMethodName = `mobile_func_${Math.random().toString(36).substring(7)}`
     if (window.__MICRO_APP_ENVIRONMENT__) {
-      console.warn('我在微前端环境中')
+      console.warn('我在微前端环境中');
       // 微前端应用中需要绑定函数到真实的window中
-      window.rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
+      (window as any).rawWindow[locationParam.callBackMethodName] = locationParam.callbackFunc
     }
     else {
       console.warn('我不在微前端环境中')

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}

package/src/utils/set-page-title.ts

@@ -1,7 +1,5 @@
-import { pageDefaultTitle } from '@af-mobile-client-vue3/types/settings'
+import { appName } from '../constants'
 
-export default function setPageTitle(routerTitle?: any): void {
-  window.document.title = routerTitle
-    ? `${routerTitle} | ${pageDefaultTitle}`
-    : `${pageDefaultTitle}`
+export default function setPageTitle(title?: string): void {
+  window.document.title = title ? `${title} - ${appName}` : appName
 }

package/src/views/common/LoadError.vue

@@ -1,11 +1,10 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 </script>
 
 <template>
   <div class="load_error_main">
     <div class="container">
-      <SvgIcon name="loadError" class="loadError" />
+      <div class="loadError i-svg:loadError" />
     </div>
     <div class="text">
       似乎出了点问题，下拉再试试

package/src/views/common/NotFound.vue

@@ -1,18 +1,17 @@
 <script setup>
-import SvgIcon from '@af-mobile-client-vue3/components/core/SvgIcon/index.vue'
 import { Button as VanButton } from 'vant'
 </script>
 
 <template>
   <div class="not_found_main">
     <div class="container">
-      <SvgIcon name="notFound" class="notFound" />
+      <div class="notFound i-svg:notFound" />
     </div>
     <div class="text">
       本来无一物，何处惹尘埃
     </div>
     <div class="button_group">
-      <VanButton type="primary" size="small" @click="$router.replace('/home')">
+      <VanButton type="primary" size="small" @click="$router.replace('/')">
         返回首页
       </VanButton>
     </div>