af-mobile-client-vue3 1.2.6 → 1.2.8

package/package.json

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

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

@@ -4,8 +4,8 @@ import { ref } from 'vue'
 
 const { serviceName, dictName, dictValue } = withDefaults(defineProps<{
   serviceName: string
-  dictName: string
-  dictValue: string
+  dictName: string | null | undefined
+  dictValue: string | null | undefined
 }>(), {})
 
 // 字面值

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

@@ -186,8 +186,8 @@ function initComponent() {
           })
         }
       }
-
-      if (item.showTitleBtn)
+      console.log('item===', item)
+      if (item.btnIcon)
         btnList.value.push(item)
 
       if (result.showSortIcon && item.sortable) {
@@ -604,7 +604,7 @@ defineExpose({
               <VanRow gutter="20" class="card_item_details" @click="emit('toDetail', item)">
                 <VanCol v-for="column of detailColumns" :key="`details_${column.dataIndex}`" :span="column.span">
                   <p>
-                    {{ `${column.title}: ` }}
+                    {{ `${column.showLabel ? `${column.title}: ` : ''}` }}
                     <XBadge
                       :style="handleFunctionStyle(column.styleFunctionForValue, item)"
                       :dict-name="column.dictName" :dict-value="item[column.dataIndex]"
@@ -629,7 +629,7 @@ defineExpose({
                         >
                           <div class="tag-content">
                             <VanIcon v-if="column.tagIcon" :name="column.tagIcon" class="tag-icon" />
-                            <span class="tag-title">{{ column.title }}：</span>
+                            <span class="tag-title">{{ `${column.showLabel ? `${column.title}: ` : ''}` }}</span>
                             <XBadge
                               :dict-name="column.dictName"
                               :dict-value="item[column.dataIndex]"
@@ -651,7 +651,7 @@ defineExpose({
                 <VanCol v-for="column of footColumns" :key="`foot_${column.dataIndex}`" :span="12">
                   <p>
                     <span :style="handleFunctionStyle(column.styleFunctionForTitle, item)">
-                      {{ column.title }}:
+                      {{ `${column.showLabel ? `${column.title}: ` : ''}` }}
                     </span>
                     <XBadge
                       :style="handleFunctionStyle(column.styleFunctionForValue, item)"
@@ -718,6 +718,8 @@ defineExpose({
   --van-search-padding: 3px;
   --van-dropdown-menu-title-padding: 3px;
   --van-cell-vertical-padding: 0px;
+  --van-text-color-2: rgb(75, 85, 99);
+  --van-button-normal-font-size: 13px;
   .main {
     flex: 1;
     min-height: 0;
@@ -760,7 +762,7 @@ defineExpose({
             align-items: center;
             .card_item_title {
               font-size: var(--van-font-size-lg);
-              font-weight: 500;
+              font-weight: 700;
               color: var(--van-text-color);
               margin: 0;
             }
@@ -771,9 +773,8 @@ defineExpose({
             align-items: center;
             margin-left: 8px;
             .card_item_subtitle {
-              font-size: var(--van-font-size-xs);
+              font-size: var(--van-font-size-md);
               color: var(--van-text-color-2);
-              margin: 0;
             }
           }
 
@@ -790,7 +791,7 @@ defineExpose({
               color: var(--van-primary-color);
               background-color: rgba(25, 137, 250, 0.1);
               border-radius: 6px;
-              font-size: 18px;
+              font-size: var(--van-font-size-lg);
               display: flex;
               align-items: center;
               justify-content: center;
@@ -821,8 +822,8 @@ defineExpose({
 
           .tag-item {
             width: auto;
-            font-size: var(--van-font-size-xs);
-            margin: 2px 4px;
+            font-size: var(--van-font-size-sm);
+            margin: 4px 4px;
             :deep(.van-tag) {
               width: fit-content;
               display: inline-flex;
@@ -849,9 +850,9 @@ defineExpose({
       }
 
       .card_item_details {
-        font-size: var(--van-font-size-sm);
+        font-size: var(--van-font-size-md);
         color: var(--van-text-color-2);
-        padding: 8px 0;
+        padding: 4px 0;
 
         .van-col {
           margin-bottom: 4px;
@@ -876,9 +877,9 @@ defineExpose({
       }
 
       .card_item_footer {
-        font-size: var(--van-font-size-sm);
+        font-size: var(--van-font-size-md);
         color: var(--van-text-color-2);
-        padding: 8px 0;
+        padding: 4px 0;
         .van-col:last-child {
           text-align: right;
         }
@@ -888,8 +889,8 @@ defineExpose({
       }
 
       .card_item_bottom {
-        margin-top: 12px;
-        padding-top: 12px;
+        margin-top: 8px;
+        padding-top: 10px;
         border-top: 1px solid rgba(0, 0, 0, 0.06);
 
         .more-button {
@@ -900,7 +901,7 @@ defineExpose({
           justify-content: center;
           color: var(--van-text-color-2);
           cursor: pointer;
-          font-size: 18px;
+          font-size: var(--van-font-size-lg);
           background-color: var(--van-background);
           border-radius: 6px;
           transition: all 0.2s ease;
@@ -922,7 +923,7 @@ defineExpose({
           min-width: 76px;
           height: 40px;
           border-radius: 10px;
-          font-size: 1rem;
+          // font-size: var(--van-font-size-md);
           transition: all 0.2s ease;
           &:active {
             transform: scale(0.95);

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

@@ -348,22 +348,22 @@ function handleCloseScanButton() {
                 <VanCol span="10">
                   排序字段
                 </VanCol>
-                <VanCol span="2">
+                <!--                <VanCol span="2">
                   <div class="reset-item" @click.stop="currentOrderVal = undefined">
                     重置
                   </div>
-                </VanCol>
+                </VanCol> -->
               </VanRow>
               <XGridDropOption :columns="props.orderList" :columns-field-names="colFieldNames" />
               <VanRow justify="space-between" class="filter-title">
                 <VanCol span="10">
                   排序规则
                 </VanCol>
-                <VanCol span="2">
+                <!--                <VanCol span="2">
                   <div class="reset-item" @click.stop="currentSortordVal = undefined">
                     重置
                   </div>
-                </VanCol>
+                </VanCol> -->
               </VanRow>
               <XGridDropOption :columns="sortordList" :columns-field-names="colFieldNames" />
             </template>
@@ -372,11 +372,11 @@ function handleCloseScanButton() {
                 <VanCol span="10">
                   {{ item.name }}
                 </VanCol>
-                <VanCol span="2">
+                <!--                <VanCol span="2">
                   <div class="reset-item" @click.stop="resetOptionItem(item.model)">
                     重置
                   </div>
-                </VanCol>
+                </VanCol> -->
               </VanRow>
               <XFormItem v-model="conditionParams[item.model]" :form="conditionParams" :attr="item" :service-name="props.serviceName" :show-label="false" />
             </template>
@@ -400,6 +400,7 @@ function handleCloseScanButton() {
 
 <style scoped lang="less">
 #XCellListFilter {
+  --van-cell-horizontal-padding: 0;
   width: 100%;
   .filter-buttons {
     display: flex;
@@ -490,7 +491,7 @@ function handleCloseScanButton() {
     }
     // 下拉菜单遮罩层
     :deep(.van-overlay) {
-      z-index: 9
+      z-index: 9;
     }
   }
 
@@ -501,7 +502,7 @@ function handleCloseScanButton() {
     width: 40px;
     height: 40px;
     border-radius: 10px;
-    background-color: rgba(245,245,245);
+    background-color: rgba(245, 245, 245);
     cursor: pointer;
     position: relative;
     z-index: 1;

package/src/layout/SingleLayout.vue

@@ -1,34 +1,9 @@
 <script setup lang="ts">
-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 keepAliveRouteNames = computed(() => {
-  return useRouteCache().routeCaches as string[]
-})
-const routeTransitionNameStore = useRouteTransitionNameStore()
-const { routeTransitionName } = storeToRefs(routeTransitionNameStore)
 </script>
 
 <template>
-  <div class="pageLayout">
-    <router-view v-slot="{ Component, route }">
-      <transition :name="routeTransitionName">
-        <keep-alive :include="keepAliveRouteNames">
-          <div :key="route.name" class="app-wrapper">
-            <component :is="Component" />
-          </div>
-        </keep-alive>
-      </transition>
-    </router-view>
-  </div>
+  <div class="pageLayout" />
 </template>
 
 <style lang="less" scoped>
-.app-wrapper {
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-}
 </style>

package/src/utils/secureStorage.ts

@@ -0,0 +1,71 @@
+import { mobileUtil } from './mobileUtil'
+
+/**
+ * 批量安全存储数据到本地
+ * @param storageItems 要存储的数据项数组，每项格式为 {key: string, value: object}
+ */
+export function secureStorageBatchWrite(storageItems: Array<{ key: string, value: any }>) {
+  console.log('storageItems===', storageItems)
+  if (!Array.isArray(storageItems) || storageItems.length === 0)
+    return
+
+  for (const item of storageItems) {
+    try {
+      mobileUtil.execute({
+        funcName: 'secureStorageWrite',
+        param: {
+          key: item.key,
+          value: typeof item.value === 'string' ? item.value : JSON.stringify(item.value),
+        },
+        callbackFunc: () => {},
+      })
+    }
+    catch (e) {
+      console.error(`写入本地缓存失败 [${item.key}]`, e)
+      // 单条失败跳过继续处理下一条
+    }
+  }
+}
+
+/**
+ * 安全存储单个数据到本地
+ * @param key 存储键名
+ * @param value 存储值
+ * @param callback 可选回调函数
+ */
+export function secureStorageWrite(key: string, value: any, callback?: () => void) {
+  try {
+    mobileUtil.execute({
+      funcName: 'secureStorageWrite',
+      param: {
+        key,
+        value: typeof value === 'string' ? value : JSON.stringify(value),
+      },
+      callbackFunc: callback || (() => {}),
+    })
+  }
+  catch (e) {
+    console.error(`写入本地缓存失败 [${key}]`, e)
+  }
+}
+
+/**
+ * 从安全存储读取数据
+ * @param key 存储键名
+ * @param callback 读取结果回调函数
+ */
+export function secureStorageRead(key: string, callback: (result: any) => void) {
+  try {
+    mobileUtil.execute({
+      funcName: 'secureStorageRead',
+      param: { key },
+      callbackFunc: (result: any) => {
+        callback(result)
+      },
+    })
+  }
+  catch (e) {
+    console.error(`读取本地缓存失败 [${key}]`, e)
+    callback({ status: 'error', message: e })
+  }
+}