af-mobile-client-vue3 1.2.57 → 1.3.1

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/data/XReportGrid/print.js

@@ -1,184 +1,184 @@
-// print.js
-
-export function printElement(elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement(elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

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?"
   }
 }