af-mobile-client-vue3 1.1.33 → 1.1.35

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.33",
+  "version": "1.1.35",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

package/src/components/core/ImageUploader/index.vue

@@ -1,160 +1,160 @@
-<script setup lang="ts">
-import { deleteFile } from '@af-mobile-client-vue3/services/api/common'
-import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
-import {
-  Button as vanButton,
-  Uploader as vanUploader,
-} from 'vant'
-import { ref, watch } from 'vue'
-
-const props = defineProps({
-  imageList: Array<any>,
-  outerIndex: { default: undefined },
-  authority: { default: 'user' },
-  uploadMode: { default: 'server' },
-  attr: { type: Object as () => { addOrEdit?: string }, default: () => ({}) },
-})
-const emit = defineEmits(['updateFileList'])
-
-const imageList = ref<Array<any>>(props.imageList ?? [])
-
-// 同步 props.imageList 到内部 imageList，保证每次变化都响应
-watch(() => props.imageList, (newVal) => {
-  imageList.value = Array.isArray(newVal) ? [...newVal] : []
-}, { immediate: true })
-
-// 触发拍照
-function triggerCamera() {
-  console.log('>>>> uploader 上传111')
-  mobileUtil.execute({
-    funcName: 'takePicture',
-    param: {},
-    callbackFunc: (result: any) => {
-      if (result.status === 'success') {
-        handlePhotoUpload(result.data)
-      }
-    },
-  })
-}
-
-// 处理拍照后的上传
-function handlePhotoUpload(photoData: any) {
-  const formData = new FormData()
-  formData.append('resUploadMode', props.uploadMode)
-  formData.append('pathKey', 'Default')
-  formData.append('formType', 'image')
-  formData.append('useType', 'Default')
-  formData.append('resUploadStock', '1')
-  formData.append('filename', photoData.name)
-  formData.append('filesize', (photoData.size / 1024 / 1024).toFixed(4))
-  formData.append('f_operator', 'server')
-  formData.append('imgPath', photoData.filePath)
-  formData.append('urlPath', `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`)
-
-  // 添加临时预览
-  const tempFile = {
-    uid: Date.now() + Math.random().toString(36).substr(2, 5),
-    name: photoData.name,
-    status: 'uploading',
-    message: '上传中...',
-    url: `data:image/png;base64,${photoData.content}`,
-  }
-
-  if (!imageList.value) {
-    imageList.value = [tempFile]
-  }
-  else {
-    imageList.value.push(tempFile)
-  }
-
-  const param = {
-    resUploadMode: props.uploadMode,
-    pathKey: 'Default',
-    formType: 'image',
-    useType: 'Default',
-    resUploadStock: '1',
-    filename: photoData.name,
-    filesize: photoData.size,
-    f_operator: 'server',
-    imgPath: photoData.filePath,
-    urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
-  }
-  // 上传到服务器
-  mobileUtil.execute({
-    funcName: 'uploadResource',
-    param,
-    callbackFunc: (result: any) => {
-      if (result.status === 'success') {
-        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
-        if (index !== -1) {
-          imageList.value[index].uid = result.data.id
-          imageList.value[index].id = result.data.id
-          delete imageList.value[index].message
-          imageList.value[index].status = 'done'
-          imageList.value[index].url = result.data.f_downloadpath
-        }
-      }
-      else {
-        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
-        if (index !== -1) {
-          imageList.value[index].status = 'failed'
-          imageList.value[index].message = '上传失败'
-        }
-      }
-
-      if (props.outerIndex !== undefined)
-        emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
-      else
-        emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
-    },
-  })
-}
-
-// 删除图片
-function deleteFileFunction(file: any) {
-  if (file.id) {
-    deleteFile({ ids: [file.id], f_state: '删除' }).then((res: any) => {
-      if (res.msg !== undefined) {
-        const targetIndex = imageList.value.findIndex(item => item.id === file.id)
-        if (targetIndex !== -1) {
-          imageList.value.splice(targetIndex, 1)
-          if (props.outerIndex !== undefined)
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
-          else
-            emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
-        }
-      }
-    })
-  }
-}
-</script>
-
-<template>
-  <div class="uploader-container">
-    <van-button
-      v-if="props.attr?.addOrEdit !== 'readonly'"
-      icon="photograph"
-      type="primary"
-      @click="triggerCamera"
-    >
-      拍照
-    </van-button>
-
-    <van-uploader
-      v-model="imageList"
-      :show-upload="false"
-      :deletable="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin'"
-      :multiple="props.authority === 'admin'"
-      :preview-image="true"
-      :before-delete="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
-    />
-  </div>
-</template>
-
-<style scoped lang="less">
-.uploader-container {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-</style>
+<script setup lang="ts">
+import { deleteFile } from '@af-mobile-client-vue3/services/api/common'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import {
+  Button as vanButton,
+  Uploader as vanUploader,
+} from 'vant'
+import { ref, watch } from 'vue'
+
+const props = defineProps({
+  imageList: Array<any>,
+  outerIndex: { default: undefined },
+  authority: { default: 'user' },
+  uploadMode: { default: 'server' },
+  attr: { type: Object as () => { addOrEdit?: string }, default: () => ({}) },
+})
+const emit = defineEmits(['updateFileList'])
+
+const imageList = ref<Array<any>>(props.imageList ?? [])
+
+// 同步 props.imageList 到内部 imageList，保证每次变化都响应
+watch(() => props.imageList, (newVal) => {
+  imageList.value = Array.isArray(newVal) ? [...newVal] : []
+}, { immediate: true })
+
+// 触发拍照
+function triggerCamera() {
+  console.log('>>>> uploader 上传111')
+  mobileUtil.execute({
+    funcName: 'takePicture',
+    param: {},
+    callbackFunc: (result: any) => {
+      if (result.status === 'success') {
+        handlePhotoUpload(result.data)
+      }
+    },
+  })
+}
+
+// 处理拍照后的上传
+function handlePhotoUpload(photoData: any) {
+  const formData = new FormData()
+  formData.append('resUploadMode', props.uploadMode)
+  formData.append('pathKey', 'Default')
+  formData.append('formType', 'image')
+  formData.append('useType', 'Default')
+  formData.append('resUploadStock', '1')
+  formData.append('filename', photoData.name)
+  formData.append('filesize', (photoData.size / 1024 / 1024).toFixed(4))
+  formData.append('f_operator', 'server')
+  formData.append('imgPath', photoData.filePath)
+  formData.append('urlPath', `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`)
+
+  // 添加临时预览
+  const tempFile = {
+    uid: Date.now() + Math.random().toString(36).substr(2, 5),
+    name: photoData.name,
+    status: 'uploading',
+    message: '上传中...',
+    url: `data:image/png;base64,${photoData.content}`,
+  }
+
+  if (!imageList.value) {
+    imageList.value = [tempFile]
+  }
+  else {
+    imageList.value.push(tempFile)
+  }
+
+  const param = {
+    resUploadMode: props.uploadMode,
+    pathKey: 'Default',
+    formType: 'image',
+    useType: 'Default',
+    resUploadStock: '1',
+    filename: photoData.name,
+    filesize: photoData.size,
+    f_operator: 'server',
+    imgPath: photoData.filePath,
+    urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
+  }
+  // 上传到服务器
+  mobileUtil.execute({
+    funcName: 'uploadResource',
+    param,
+    callbackFunc: (result: any) => {
+      if (result.status === 'success') {
+        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+        if (index !== -1) {
+          imageList.value[index].uid = result.data.id
+          imageList.value[index].id = result.data.id
+          delete imageList.value[index].message
+          imageList.value[index].status = 'done'
+          imageList.value[index].url = result.data.f_downloadpath
+        }
+      }
+      else {
+        const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+        if (index !== -1) {
+          imageList.value[index].status = 'failed'
+          imageList.value[index].message = '上传失败'
+        }
+      }
+
+      if (props.outerIndex !== undefined)
+        emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
+      else
+        emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
+    },
+  })
+}
+
+// 删除图片
+function deleteFileFunction(file: any) {
+  if (file.id) {
+    deleteFile({ ids: [file.id], f_state: '删除' }).then((res: any) => {
+      if (res.msg !== undefined) {
+        const targetIndex = imageList.value.findIndex(item => item.id === file.id)
+        if (targetIndex !== -1) {
+          imageList.value.splice(targetIndex, 1)
+          if (props.outerIndex !== undefined)
+            emit('updateFileList', imageList.value.filter(item => item.status === 'done'), props.outerIndex)
+          else
+            emit('updateFileList', imageList.value.filter(item => item.status === 'done'))
+        }
+      }
+    })
+  }
+}
+</script>
+
+<template>
+  <div class="uploader-container">
+    <van-button
+      v-if="props.attr?.addOrEdit !== 'readonly'"
+      icon="photograph"
+      type="primary"
+      @click="triggerCamera"
+    >
+      拍照
+    </van-button>
+
+    <van-uploader
+      v-model="imageList"
+      :show-upload="false"
+      :deletable="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin'"
+      :multiple="props.authority === 'admin'"
+      :preview-image="true"
+      :before-delete="props.attr?.addOrEdit !== 'readonly' && props.authority === 'admin' ? deleteFileFunction : undefined"
+    />
+  </div>
+</template>
+
+<style scoped lang="less">
+.uploader-container {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+</style>

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

@@ -481,21 +481,17 @@ function evaluateCustomFunction(funcString: string | undefined, record: any, ind
   }
 }
 
-// 更新查询条件并刷新
+/**
+ * 函数描述： 传入自定义条件进行查询(传入字段必须在琉璃中配置生成查询项才会生效)
+ * @param {string} params - 查询条件map 例: { os_id:1 }
+ * // 小提示：此处传入的条件会覆盖掉fixQueryForm(固定查询条件参数)
+ */
 function updateConditionAndRefresh(params: any) {
-  // 更新 conditionParams
-  if (!conditionParams.value) {
-    conditionParams.value = {}
-  }
   if (params) {
     // 遍历参数，更新对应的表单值
     Object.entries(params).forEach(([key, value]) => {
       // 找到对应的表单项
-      const formItem = formQueryList.value.find(item => item.model === key)
-      if (formItem) {
-        // 更新表单项的值
-        conditionParams.value[key] = value
-      }
+      conditionParams.value[key] = value
     })
   }
 
@@ -562,7 +558,7 @@ defineExpose({
             v-model:loading="loading"
             class="list_main"
             :finished="finished"
-            finished-text="本来无一物，何处惹尘埃"
+            finished-text="已加载全部内容"
             :immediate-check="isInitQuery"
             @load="onLoad"
           >
@@ -647,7 +643,12 @@ defineExpose({
                   </div>
                 </VanCol>
               </VanRow>
-              <VanRow gutter="20" class="card_item_footer" @click="emit('toDetail', item)">
+              <VanRow
+                v-if="footColumns && footColumns.length > 0"
+                gutter="20"
+                class="card_item_footer"
+                @click="emit('toDetail', item)"
+              >
                 <VanCol v-for="column of footColumns" :key="`foot_${column.dataIndex}`" :span="12">
                   <p>
                     <span :style="handleFunctionStyle(column.styleFunctionForTitle, item)">
@@ -664,6 +665,7 @@ defineExpose({
               <VanRow v-if="allActions.length > 0" gutter="20" class="card_item_bottom">
                 <VanCol span="4">
                   <VanPopover
+                    v-if="otherActions && otherActions.length !== 0 && otherActions.some(action => evaluateCustomFunction(action.customFunction, item, index))"
                     v-model:show="showPopover[index]"
                     placement="bottom-start"
                     :actions="otherActions.filter(action => evaluateCustomFunction(action.customFunction, item, index))"
@@ -671,7 +673,6 @@ defineExpose({
                   >
                     <template #reference>
                       <div
-                        v-show="otherActions && otherActions.length !== 0 && otherActions.some(action => evaluateCustomFunction(action.customFunction, item, index))"
                         class="more-button"
                       >
                         <span>⋯</span>
@@ -733,6 +734,14 @@ defineExpose({
       border-radius: var(--van-radius-lg);
       margin: 0 0 var(--van-padding-xs) 0;
       padding: var(--van-padding-sm);
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.03);
+      transition: all 0.3s ease;
+      border: 1px solid rgba(0, 0, 0, 0.04);
+
+      &:active {
+        transform: scale(0.98);
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.02);
+      }
 
       .card_item_header {
         margin-bottom: var(--van-padding-base);
@@ -740,7 +749,7 @@ defineExpose({
         .title-row {
           display: flex;
           align-items: center;
-          margin-bottom: 8px;
+          margin-bottom: 2px;
           width: 100%;
 
           .main-title {
@@ -748,6 +757,8 @@ defineExpose({
             align-items: center;
             .card_item_title {
               font-size: var(--van-font-size-lg);
+              font-weight: 500;
+              color: var(--van-text-color);
               margin: 0;
             }
           }
@@ -755,7 +766,7 @@ defineExpose({
           .sub-title {
             display: inline-flex;
             align-items: center;
-            margin-left: 4px;
+            margin-left: 8px;
             .card_item_subtitle {
               font-size: var(--van-font-size-xs);
               color: var(--van-text-color-2);
@@ -768,21 +779,23 @@ defineExpose({
             align-items: center;
             margin-left: auto;
             .action-button {
-              margin-left: 4px;
-              width: 36px;
-              height: 36px;
+              margin-left: 6px;
+              width: 32px;
+              height: 32px;
               padding: 0;
               border: none;
               color: var(--van-primary-color);
-              background-color: rgba(25, 137, 250, 0.3);
-              border-radius: 4px;
-              font-size: 20px;
+              background-color: rgba(25, 137, 250, 0.1);
+              border-radius: 6px;
+              font-size: 18px;
               display: flex;
               align-items: center;
               justify-content: center;
+              transition: all 0.2s ease;
               &:active {
                 opacity: 0.7;
-                background-color: rgba(25, 137, 250, 0.5);
+                background-color: rgba(25, 137, 250, 0.2);
+                transform: scale(0.95);
               }
             }
           }
@@ -801,13 +814,13 @@ defineExpose({
           padding: 0 !important;
           align-items: center;
           width: 100%;
-          margin: 0 -8px;
+          margin: 0 -4px;
 
           .tag-col {
             display: flex;
             align-items: center;
-            padding: 0 8px;
-            min-height: 32px;
+            padding: 0 4px;
+            min-height: 28px;
           }
 
           .tag-item {
@@ -816,12 +829,14 @@ defineExpose({
             font-size: var(--van-font-size-xs);
             display: flex;
             align-items: center;
-            margin: 4px 0;
+            margin: 2px 0;
             justify-content: center;
             :deep(.van-tag) {
               width: fit-content;
               display: inline-flex;
               align-items: center;
+              padding: 2px 8px;
+              border-radius: 4px;
             }
             .tag-content {
               display: flex;
@@ -842,19 +857,38 @@ defineExpose({
       }
 
       .card_item_details {
-        margin-bottom: var(--van-padding-base);
         font-size: var(--van-font-size-sm);
-        color: #666;
+        color: var(--van-text-color-2);
+        padding: 8px 0;
 
         .van-col {
-          margin-bottom: 2px;
+          margin-bottom: 4px;
+          p {
+            display: flex;
+            align-items: center;
+            gap: 4px;
+
+            span {
+              flex: 1;
+              min-width: 0;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+
+            :deep(.van-badge) {
+              flex-shrink: 0;
+            }
+          }
         }
       }
 
       .card_item_footer {
         font-size: var(--van-font-size-sm);
         color: var(--van-text-color-2);
-        margin-bottom: 15px;
+        margin-bottom: 12px;
+        padding: 8px 0;
+        border-top: 1px solid rgba(0, 0, 0, 0.04);
 
         .van-col:last-child {
           text-align: right;
@@ -864,6 +898,45 @@ defineExpose({
           text-align: left;
         }
       }
+
+      .card_item_bottom {
+        margin-top: 4px;
+
+        .more-button {
+          width: 28px;
+          height: 28px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: var(--van-text-color-2);
+          cursor: pointer;
+          font-size: 18px;
+          background-color: var(--van-background);
+          border-radius: 6px;
+          transition: all 0.2s ease;
+          border: 1px solid rgba(0, 0, 0, 0.06);
+          span {
+            line-height: 1;
+            margin-top: -2px;
+          }
+          &:active {
+            opacity: 0.7;
+            background-color: var(--van-background-2);
+            transform: scale(0.95);
+          }
+        }
+
+        .action-btn {
+          min-width: 76px;
+          height: 32px;
+          border-radius: 16px;
+          font-size: 14px;
+          transition: all 0.2s ease;
+          &:active {
+            transform: scale(0.95);
+          }
+        }
+      }
     }
   }
 
@@ -872,25 +945,30 @@ defineExpose({
     align-items: center;
     padding: 8px 12px;
     background-color: #fff;
-    gap: 5px;
+    gap: 8px;
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.02);
+    position: sticky;
+    top: 0;
+    z-index: 10;
     :deep(.van-search) {
       width: 100%;
       padding: var(--van-search-padding);
       background-color: transparent;
     }
     :deep(.van-search__content) {
-      border-radius: 5px;
-      background-color: #f5f5f5;
-      padding: 4px 8px;
+      border-radius: 8px;
+      background-color: var(--van-background);
+      padding: 4px 12px;
+      border: 1px solid rgba(0, 0, 0, 0.01);
     }
     :deep(.van-field__left-icon) {
-      color: #999;
+      color: var(--van-text-color-2);
     }
     :deep(.van-cell) {
       background-color: transparent;
     }
     :deep(.van-field__control::placeholder) {
-      color: #999;
+      color: var(--van-text-color-2);
       font-size: 14px;
     }
     .van-col {
@@ -909,48 +987,20 @@ defineExpose({
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 40px;
-      height: 40px;
-      border-radius: 10px;
-      background-color: rgba(245,245,245);
+      width: 36px;
+      height: 36px;
+      border-radius: 8px;
+      background-color: var(--van-background);
       cursor: pointer;
       position: relative;
       z-index: 1;
+      border: 1px solid rgba(0, 0, 0, 0.06);
+      transition: all 0.2s ease;
       &:active {
         opacity: 0.7;
+        transform: scale(0.95);
       }
     }
   }
-
-  .custom-button {
-    border: none !important;
-    box-shadow: none !important;
-  }
-
-  .more-button {
-    width: 24px;
-    height: 24px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: #666;
-    cursor: pointer;
-    font-size: 20px;
-    background-color: #f7f8fa;
-    border-radius: 4px;
-    span {
-      line-height: 1;
-      margin-top: -2px;
-    }
-    &:active {
-      opacity: 0.7;
-      background-color: #ebedf0;
-    }
-  }
-  .action-btn {
-    min-width: 80px;
-    border-radius: 20px;
-    font-size: 14px;
-  }
 }
 </style>

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

@@ -501,7 +501,7 @@ function handleCloseScanButton() {
       font-size: 13px;
       font-weight: 600;
       line-height: 2rem;
-      margin: 5px 5px 1px 8px;
+      margin: 5px 5px 1px 0px;
       color: black;
     }
     .range-picker-list {