af-mobile-client-vue3 1.1.40 → 1.1.42

package/package.json

@@ -1,111 +1,115 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.1.40",
-  "description": "Vue + Vite component lib",
-  "license": "MIT",
-  "engines": {
-    "node": ">=18.12.0",
-    "pnpm": ">=8.15.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
-    "preview": "vite preview",
-    "lint": "eslint . && vue-tsc --noEmit",
-    "lint:fix": "eslint . --fix",
-    "test": "vitest",
-    "release": "bumpp --commit --push --tag"
-  },
-  "dependencies": {
-    "@micro-zoe/micro-app": "1.0.0-rc.24",
-    "@vant/area-data": "^2.0.0",
-    "@unhead/vue": "^2.0.5",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.1.0",
-    "@iconify/vue": "4.3.0",
-    "animate.css": "^4.1.1",
-    "axios": "^1.8.4",
-    "crypto-js": "^4.2.0",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.2",
-    "pinia-plugin-persistedstate": "^4.2.0",
-    "qs": "^6.14.0",
-    "resize-detector": "^0.3.0",
-    "store": "^2.0.12",
-    "vant": "^4.9.18",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.13",
-    "vue-router": "^4.5.0"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "^4.12.0",
-    "@iconify/json": "2.2.318",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
-    "@types/nprogress": "^0.2.3",
-    "@types/store": "^2.0.5",
-    "@unocss/eslint-plugin": "^66.1.0-beta.11",
-    "@unocss/preset-rem-to-px": "66.1.0-beta.11",
-    "@vitejs/plugin-legacy": "^6.0.2",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.1.0",
-    "commitizen": "^4.3.1",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "cz-emoji-chinese": "^0.3.1",
-    "eslint": "^9.24.0",
-    "eslint-ts-patch": "^8.57.0-0",
-    "husky": "^9.1.7",
-    "less": "^4.3.0",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.40.0",
-    "terser": "^5.39.0",
-    "typescript": "^5.8.3",
-    "unocss": "^66.1.0-beta.11",
-    "unplugin-auto-import": "^19.1.2",
-    "unplugin-vue-components": "^28.4.1",
-    "unplugin-vue-router": "^0.12.0",
-    "vite": "^6.2.6",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.8.5",
-    "vite-plugin-pwa": "^1.0.0",
-    "vite-plugin-sitemap": "^0.7.1",
-    "vite-plugin-svg-icons": "^2.0.1",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.2",
-    "vite-plugin-vue-layouts": "^0.11.0",
-    "vitest": "^3.1.1",
-    "vue-tsc": "^2.2.8"
-  },
-  "pnpm": {
-    "peerDependencyRules": {
-      "ignoreMissing": [
-        "postcss",
-        "esbuild"
-      ],
-      "allowedVersions": {
-        "rollup": "^4.x"
-      }
-    }
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-emoji-chinese"
-    },
-    "cz-emoji-chinese": {
-      "skipQuestions": [
-        "body",
-        "scope"
-      ]
-    }
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.1.42",
+  "description": "Vue + Vite component lib",
+  "license": "MIT",
+  "engines": {
+    "node": ">=18.12.0",
+    "pnpm": ">=8.15.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
+    "preview": "vite preview",
+    "lint": "eslint . && vue-tsc --noEmit",
+    "lint:fix": "eslint . --fix",
+    "test": "vitest",
+    "release": "bumpp --commit --push --tag"
+  },
+  "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^6.7.2",
+    "@fortawesome/free-solid-svg-icons": "^6.7.2",
+    "@fortawesome/vue-fontawesome": "^3.0.8",
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.24",
+    "@unhead/vue": "^2.0.5",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.1.0",
+    "animate.css": "^4.1.1",
+    "axios": "^1.8.4",
+    "crypto-js": "^4.2.0",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.2",
+    "pinia-plugin-persistedstate": "^4.2.0",
+    "qs": "^6.14.0",
+    "resize-detector": "^0.3.0",
+    "store": "^2.0.12",
+    "vant": "^4.9.18",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0",
+    "vue3-hash-calendar": "^1.1.3"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^4.12.0",
+    "@iconify/json": "2.2.318",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.14.1",
+    "@types/nprogress": "^0.2.3",
+    "@types/store": "^2.0.5",
+    "@unocss/eslint-plugin": "^66.1.0-beta.11",
+    "@unocss/preset-rem-to-px": "66.1.0-beta.11",
+    "@vitejs/plugin-legacy": "^6.0.2",
+    "@vitejs/plugin-vue": "^5.2.3",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.1.0",
+    "commitizen": "^4.3.1",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "cz-emoji-chinese": "^0.3.1",
+    "eslint": "^9.24.0",
+    "eslint-ts-patch": "^8.57.0-0",
+    "husky": "^9.1.7",
+    "less": "^4.3.0",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.40.0",
+    "terser": "^5.39.0",
+    "typescript": "^5.8.3",
+    "unocss": "^66.1.0-beta.11",
+    "unplugin-auto-import": "^19.1.2",
+    "unplugin-vue-components": "^28.4.1",
+    "unplugin-vue-router": "^0.12.0",
+    "vite": "^6.2.6",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.8.5",
+    "vite-plugin-pwa": "^1.0.0",
+    "vite-plugin-sitemap": "^0.7.1",
+    "vite-plugin-svg-icons": "^2.0.1",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.2",
+    "vite-plugin-vue-layouts": "^0.11.0",
+    "vitest": "^3.1.1",
+    "vue-tsc": "^2.2.8"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "ignoreMissing": [
+        "postcss",
+        "esbuild"
+      ],
+      "allowedVersions": {
+        "rollup": "^4.x"
+      }
+    }
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-emoji-chinese"
+    },
+    "cz-emoji-chinese": {
+      "skipQuestions": [
+        "body",
+        "scope"
+      ]
+    }
+  }
+}

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

@@ -710,7 +710,7 @@ defineExpose({
                         v-for="button in getActionGroups(item, index).main"
                         :key="button.func"
                         type="primary"
-                        size="small"
+                        size="normal"
                         class="action-btn"
                         @click="onSelectMenu(item, button)"
                       >
@@ -953,9 +953,8 @@ defineExpose({
 
         .action-btn {
           min-width: 76px;
-          height: 32px;
-          border-radius: 16px;
-          font-size: 14px;
+          border-radius: 10px;
+          font-size: 1rem;
           transition: all 0.2s ease;
           &:active {
             transform: scale(0.95);
@@ -970,7 +969,7 @@ defineExpose({
     align-items: center;
     padding: 8px 12px;
     background-color: #fff;
-    gap: 8px;
+    gap: 1px;
     box-shadow: 0 1px 4px rgba(0, 0, 0, 0.02);
     position: sticky;
     top: 0;
@@ -985,6 +984,7 @@ defineExpose({
       background-color: var(--van-background);
       padding: 4px 12px;
       border: 1px solid rgba(0, 0, 0, 0.01);
+      height: 40px;
     }
     :deep(.van-field__left-icon) {
       color: var(--van-text-color-2);