af-mobile-client-vue3 1.2.59 → 1.3.2-2.1

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

@@ -143,10 +143,7 @@ function isFieldEmpty(value: any): boolean {
   if (Array.isArray(value) && value.length === 0) {
     return true
   }
-  if (typeof value === 'object' && Object.keys(value).length === 0) {
-    return true
-  }
-  return false
+  return typeof value === 'object' && Object.keys(value).length === 0
 }
 
 // 表单校验
@@ -432,16 +429,28 @@ function getConfigAndJoin(config: configDefine, outerLock: getConfigLock): void
   }
 }
 
-function deserializeFunctionAndRun(functionStr, value) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(value, activatedConfig)
+function deserializeFunctionAndRun(functionStr: string, value: any) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('value', 'activatedConfig', `return (${functionStr})(value, activatedConfig)`)
+    return fun(value, activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function:', err)
+    return null
+  }
 }
 
-function deserializeFunctionAndRunWithConfig(functionStr) {
-  // eslint-disable-next-line no-eval
-  const fun = eval(`(${functionStr})`)
-  return fun(activatedConfig)
+function deserializeFunctionAndRunWithConfig(functionStr: string) {
+  try {
+    // eslint-disable-next-line no-new-func
+    const fun = new Function('activatedConfig', `return (${functionStr})(activatedConfig)`)
+    return fun(activatedConfig)
+  }
+  catch (err) {
+    console.error('Failed to deserialize and run function with config:', err)
+    return null
+  }
 }
 
 // 将table配置的表格转换为适合Form展示的格式
@@ -1009,9 +1018,9 @@ function getNow() {
                 <van-cell-group v-else-if="row.type === 'signature'" inset style="margin-top: 4vh">
                   <van-field
                     :label="row.valueText ? `${row.valueText}:` : ''"
-                    readonly
+
                     rows="1"
-                    autosize
+                    autosize readonly
                   >
                     <template #button>
                       <XSignature v-model="activatedConfig.data[row.dataIndex]" />

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

@@ -33,7 +33,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()
@@ -142,7 +142,6 @@ async function onSubmit() {
       if (result?.message) {
         showDialog({
           message: result.message,
-          type: messageType,
         })
       }
 

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

@@ -21,32 +21,33 @@ export default {
 ## 代码演示
 
 ```html
-<x-add-report
-
->
-</x-add-report>
+<x-add-report> </x-add-report>
 ```
 
 ## API
 
-| 参数              | 说明                       | 类型      | 默认值   |
-|-----------------|--------------------------|---------|-------|
-| businessTitle   | 业务标题                     | String  | ''    |
-| businessType    | 业务类型                     | String  | ''    |
-| visible         | 是否显示模态框                  | Boolean | false |
-| jsonData        | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}    |
-| modifyModelData | 修改操作前查询出的业务数据            | Object  | {}    |
-| loading         | 新增或修改业务是否执行中             | Boolean | false |
-| fixedAddForm    | 固定新增表单，会和新增表单合并          | Object  | {}    |
-| getDataParams | 调用logic获取数据源的追加参数 | Object | - |
-| @onSubmit       | 表单的提交事件                  | event   | -     |
+| 参数            | 说明                                      | 类型    | 默认值 |
+| --------------- | ----------------------------------------- | ------- | ------ |
+| businessTitle   | 业务标题                                  | String  | ''     |
+| businessType    | 业务类型                                  | String  | ''     |
+| visible         | 是否显示模态框                            | Boolean | false  |
+| jsonData        | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}     |
+| modifyModelData | 修改操作前查询出的业务数据                | Object  | {}     |
+| loading         | 新增或修改业务是否执行中                  | Boolean | false  |
+| fixedAddForm    | 固定新增表单，会和新增表单合并            | Object  | {}     |
+| getDataParams   | 调用logic获取数据源的追加参数             | Object  | -      |
+| @onSubmit       | 表单的提交事件                            | event   | -      |
 
 ## 例子1
-----
+
+---
+
 参考XFormTable组件
+
 ```
 
 注意事项
 ----
 
 > 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果
+```

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

@@ -295,7 +295,7 @@ function exportData() {
 }
 
 function printDocument() {
-  const printContent = window.rawDocument.getElementById('printReady')
+  const printContent = (window as any).rawDocument.getElementById('printReady')
   // printElement(printContent)
   showDialog({ message: '操作成功！' })
 }
@@ -321,8 +321,8 @@ function configInit() {
   activeConfig.value.columns.forEach((row: any[]) => {
     row.forEach((cell) => {
       if (cell.dynamicDataIndex === true) {
-        // eslint-disable-next-line no-eval
-        const func = eval(`(${cell.customFunctionForDynamicDataIndex})`)
+        // eslint-disable-next-line no-new-func
+        const func = new Function(`return ${cell.customFunctionForDynamicDataIndex}`)()
         cell.dataIndex = func(config.value)
       }
       if (['action', 'click'].includes(cell.eventType) && cell.customFunction && !cell.events) {

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

@@ -151,7 +151,7 @@ onMounted(() => {
 })
 
 // 监听
-watch(() => props.config, (newVal) => {
+watch(() => props.config, () => {
   // 配置变化时的处理
 }, { deep: true })
 
@@ -248,10 +248,10 @@ watch(() => activatedConfig.value, (val) => {
                   <span class="inputsDivItemLabel">{{ displayFormatStartText(item.format) }}</span>
                   <template v-if="!forDisplay">
                     <template v-if="item.inputReadOnly === true">
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" :disabled="true" />
                     </template>
                     <template v-else>
-                      <a-input v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
+                      <van-field v-model="data[item.dataIndex][index]" :style="`width:${item.inputWidth ? item.inputWidth : '100'}%`" />
                     </template>
                   </template>
                   <template v-else>
@@ -446,7 +446,7 @@ watch(() => activatedConfig.value, (val) => {
 </template>
 
 <style lang="less" scoped>
-.img{
+.img {
   width: 95%;
   height: 180px;
   object-fit: cover;
@@ -490,8 +490,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainForDisplay {
@@ -532,8 +532,8 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
 .reportMainNoPadding {
@@ -544,7 +544,7 @@ watch(() => activatedConfig.value, (val) => {
   // background-color: #fff;
   border-radius: 8px;
   height: auto;
-  min-height : 20vh;
+  min-height: 20vh;
   overflow-y: auto;
   overflow-x: hidden;
 
@@ -578,17 +578,17 @@ watch(() => activatedConfig.value, (val) => {
   .reportTable {
     width: 100%;
     border-collapse: collapse;
-    table-layout:fixed;
-    word-break:break-all;
+    table-layout: fixed;
+    word-break: break-all;
   }
 }
-.tools{
+.tools {
   position: fixed;
   right: 2%;
   text-align: right;
   width: 60%;
   cursor: pointer;
-  .toolsItem{
+  .toolsItem {
     width: 15%;
     margin-right: 3%;
     display: inline-block;

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

@@ -31,7 +31,7 @@ const attr = ref({})
 
 // Store
 const userStore = useUserStore()
-const { user: currUser } = storeToRefs(userStore)
+const currUser = storeToRefs(userStore)
 
 // Refs
 const mainRef = ref()

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/index.md

@@ -20,20 +20,24 @@ export default {
 
 ## API
 
-| 参数              | 说明   | 类型    | 默认值       |
-|-----------------|------|-------|-----------|
-| configName | 配置文件名 | String | 无（必填）     |
-| activatedSlotName| 激活插槽名 | String | undefined |
-| files | 文件列表 | Array | []        |
-| authority | 权限控制 | String | user |
-| localConfig | 本地配置 | Object | undefined |
-| dontFormat | 禁止已经格式化后的配置格式化| Boolean | false|
-| configData | 配置中的Data | Object | undefined |
+| 参数              | 说明                         | 类型    | 默认值     |
+| ----------------- | ---------------------------- | ------- | ---------- |
+| configName        | 配置文件名                   | String  | 无（必填） |
+| activatedSlotName | 激活插槽名                   | String  | undefined  |
+| files             | 文件列表                     | Array   | []         |
+| authority         | 权限控制                     | String  | user       |
+| localConfig       | 本地配置                     | Object  | undefined  |
+| dontFormat        | 禁止已经格式化后的配置格式化 | Boolean | false      |
+| configData        | 配置中的Data                 | Object  | undefined  |
+
 ## 例子1
-----
+
+---
+
 ```vue
 <XReport :config-name="'test_tableConfig'" :activated-slot-name="'test_tableConfig_slot'" />
 ```
+
 ## 注意事项
 
 > 在某些情况下，比如手机端，只需要输入表格中一部分的内容。

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

@@ -226,8 +226,7 @@ onBeforeUnmount(() => {
       display: flex;
       justify-content: center;
       align-items: center;
-      padding: env(safe-area-inset-top) env(safe-area-inset-right)
-              env(safe-area-inset-bottom) env(safe-area-inset-left);
+      padding: env(safe-area-inset-top) env(safe-area-inset-right) env(safe-area-inset-bottom) env(safe-area-inset-left);
 
       :deep(.van-signature) {
         // 隐藏原有的底部按钮

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/font-style/font.css

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

package/src/hooks/useBoolean.ts

@@ -0,0 +1,26 @@
+import { ref } from 'vue'
+
+export default function useBoolean(initValue = false) {
+  const bool = ref(initValue)
+
+  function setBool(value: boolean) {
+    bool.value = value
+  }
+  function setTrue() {
+    setBool(true)
+  }
+  function setFalse() {
+    setBool(false)
+  }
+  function toggle() {
+    setBool(!bool.value)
+  }
+
+  return {
+    bool,
+    setBool,
+    setTrue,
+    setFalse,
+    toggle,
+  }
+}

package/src/hooks/useLoading.ts

@@ -0,0 +1,16 @@
+import useBoolean from './useBoolean'
+
+/**
+ * 加载状态管理 Hook
+ * @param initValue 初始加载状态，默认为 false
+ * @returns {object} 包含 loading 状态和控制方法
+ */
+export default function useLoading(initValue = false) {
+  const { bool: loading, setTrue: startLoading, setFalse: endLoading } = useBoolean(initValue)
+
+  return {
+    loading,
+    startLoading,
+    endLoading,
+  }
+}

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