af-mobile-client-vue3 1.6.29 → 1.6.31

package/package.json

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

package/src/components/core/MessageNotification/MessageNotification.vue

@@ -36,7 +36,7 @@ async function fetchMessages() {
     userId: `${userInfo.id}:phone`, // |phone
     typeList: '\'phone\'', // phone
     pageNo: 1,
-    pageSize: 100,
+    pageSize: 10,
   }
   const res = await post('/af-system/logic/getNotificationListByType', param)
   messages.value = (res || []).map((item: any) => {

package/src/components/core/Signature/AdaptiveSignatureField.vue

@@ -0,0 +1,168 @@
+<script setup lang="ts">
+import type { SignatureComponentExpose, SignatureComponentProps } from './signature'
+import XSignature from '@af-mobile-client-vue3/components/data/XSignature/index.vue'
+import { upload } from '@af-mobile-client-vue3/services/api/common'
+import { detectEnvironment } from '@af-mobile-client-vue3/utils/environment'
+import { showFailToast, Field as VanField } from 'vant'
+import { ref, watch } from 'vue'
+import SignatureComponent from './SignatureComponent.vue'
+
+const props = withDefaults(defineProps<SignatureComponentProps & {
+  serviceName?: string
+}>(), {
+  label: '用户签字',
+  required: false,
+  disabled: false,
+  uploadMode: 'server',
+  imageList: null,
+  formReadonly: false,
+  isAsyncUpload: false,
+  serviceName: undefined,
+})
+
+const emit = defineEmits<{
+  signatureComplete: [data: any]
+}>()
+
+// 仅区分 App / 非 App：原生桥只在 App 可用，其余环境统一走 H5 签名
+const isApp = detectEnvironment().isApp
+
+const nativeSignatureRef = ref<InstanceType<typeof SignatureComponent>>()
+const webSignatureImage = ref('')
+const webSignatureData = ref<any>(null)
+const webUploading = ref(false)
+
+const serviceName = props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME
+
+watch(
+  () => props.imageList,
+  (list) => {
+    if (isApp || !Array.isArray(list) || !list[0]?.url)
+      return
+    webSignatureImage.value = list[0].url
+  },
+  { immediate: true, deep: true },
+)
+
+async function uploadWebSignature(base64Image: string) {
+  const blob = await (await fetch(base64Image)).blob()
+  const filename = `signature_${Date.now()}.png`
+  const file = new File([blob], filename, { type: blob.type || 'image/png' })
+  const formData = new FormData()
+  formData.append('avatar', file)
+  formData.append('resUploadMode', props.uploadMode)
+  formData.append('pathKey', 'Default')
+  formData.append('formType', 'image')
+  formData.append('useType', 'Default')
+  formData.append('resUploadStock', '1')
+  formData.append('filename', filename)
+  formData.append('filesize', (file.size / 1024 / 1024).toFixed(4))
+  formData.append('f_operator', 'server')
+
+  return upload(formData, serviceName, { 'Content-Type': 'multipart/form-data' })
+}
+
+function resetWebSignature() {
+  webSignatureImage.value = ''
+  webSignatureData.value = null
+}
+
+async function handleWebSignatureSave(base64Image: string) {
+  if (props.disabled || props.formReadonly || webUploading.value)
+    return
+
+  webUploading.value = true
+  try {
+    const res: any = await uploadWebSignature(base64Image)
+    if (!res?.data?.id) {
+      showFailToast('签名上传失败')
+      resetWebSignature()
+      return
+    }
+    webSignatureData.value = res.data
+    emit('signatureComplete', { status: 'success', data: res.data })
+  }
+  catch (error) {
+    console.error('签名上传失败:', error)
+    showFailToast('签名上传失败')
+    resetWebSignature()
+  }
+  finally {
+    webUploading.value = false
+  }
+}
+
+function handleWebSignatureClear() {
+  resetWebSignature()
+  emit('signatureComplete', { base64: '', status: 'cleared' })
+}
+
+defineExpose<SignatureComponentExpose>({
+  clearSignature() {
+    if (isApp)
+      nativeSignatureRef.value?.clearSignature()
+    else
+      handleWebSignatureClear()
+  },
+  hasSignature() {
+    if (isApp)
+      return nativeSignatureRef.value?.hasSignature() ?? false
+    return !!webSignatureData.value?.id || !!webSignatureImage.value
+  },
+  getSignatureData() {
+    if (isApp)
+      return nativeSignatureRef.value?.getSignatureData() ?? ''
+    return webSignatureImage.value.replace(/^data:image\/\w+;base64,/, '')
+  },
+  previewSignature() {
+    nativeSignatureRef.value?.previewSignature()
+  },
+  getSignatureList() {
+    if (isApp)
+      return nativeSignatureRef.value?.getSignatureList() ?? []
+    if (!webSignatureData.value)
+      return []
+    return [{
+      photo_name: webSignatureData.value.f_filename,
+      id: webSignatureData.value.id,
+      f_downloadpath: webSignatureData.value.f_downloadpath,
+    }]
+  },
+})
+</script>
+
+<template>
+  <!-- App：原生签字板 -->
+  <SignatureComponent
+    v-if="isApp"
+    ref="nativeSignatureRef"
+    :label="label"
+    :required="required"
+    :disabled="disabled"
+    :upload-mode="uploadMode"
+    :image-list="imageList"
+    :form-readonly="formReadonly"
+    :is-async-upload="isAsyncUpload"
+    @signature-complete="emit('signatureComplete', $event)"
+  />
+  <!-- 非 App：H5 在线签名（浏览器、微信等） -->
+  <VanField
+    v-else
+    center
+    name="signature"
+    :label="label"
+    :required="required"
+  >
+    <template #input>
+      <XSignature
+        v-model="webSignatureImage"
+        button-text="点击签字"
+        :show-button-after-signed="true"
+        :show-sign-button="!formReadonly"
+        :show-preview="true"
+        @save="handleWebSignatureSave"
+        @clear="handleWebSignatureClear"
+      />
+    </template>
+  </VanField>
+</template>

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

@@ -2,7 +2,7 @@
 import type { FieldType } from 'vant'
 import type { Numeric } from 'vant/es/utils'
 import ImageUploader from '@af-mobile-client-vue3/components/core/ImageUploader/index.vue'
-import SignatureComponent from '@af-mobile-client-vue3/components/core/Signature/SignatureComponent.vue'
+import AdaptiveSignatureField from '@af-mobile-client-vue3/components/core/Signature/AdaptiveSignatureField.vue'
 import XDatePicker from '@af-mobile-client-vue3/components/core/XDatePicker/index.vue'
 import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOption/index.vue'
 import XMultiSelect from '@af-mobile-client-vue3/components/core/XMultiSelect/index.vue'
@@ -1275,17 +1275,17 @@ function commChange() {
         />
       </template>
     </VanField>
-    <!-- 手机端签字 -->
-    <SignatureComponent
+    <!-- 签字：App 原生签字板，微信/浏览器 H5 在线签名 -->
+    <AdaptiveSignatureField
       v-if="attr.type === 'signature' && showItem"
       :label="labelData"
       upload-mode="server"
       :image-list="(modelData as any[])"
-      authority="admin"
-      :required="attr.rule?.required"
+      :required="attr.rule?.required === 'true'"
       :disabled="attr.disabled"
       :form-readonly="readonly"
       :is-async-upload="isAsyncUpload"
+      :service-name="serviceName"
       @signature-complete="signatureComplete"
     />
 

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

@@ -63,12 +63,12 @@ const preview = ref(false)
 /** 地图实例 */
 let map: Map | null = null
 /** 当前底图类型 */
-const currentMapType = ref<string>('tianditu')
+const currentMapType = ref<string>('gaode')
 /** 控制图层面板显示状态 */
 const showControls = ref<boolean>(false)
 
 /** 图层选项配置 */
-const layerOptions = [
+let layerOptions = [
   { text: '高德地图', value: 'gaode' },
   { text: '高德卫星', value: 'gaodeSatellite' },
   { text: '天地图', value: 'tianditu' },
@@ -199,7 +199,7 @@ function initializeLayers(tianDiTuKey = ''): void {
     // 高德地图
     baseMaps.gaode = new TileLayer({
       source: new XYZ({
-        url: 'https://wprd04.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
+        url: 'http://webrd02.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}',
         crossOrigin: 'anonymous',
         projection: 'EPSG:3857',
         maxZoom: 18,
@@ -364,7 +364,7 @@ function init(params: InitParams = {}): Promise<void> {
     const {
       center = [116.404, 39.915],
       zoom = 10,
-      maxZoom = 18,
+      maxZoom = 21,
       minZoom = 4,
       isPreview = false,
     } = params
@@ -375,6 +375,14 @@ function init(params: InitParams = {}): Promise<void> {
         const tianDiTuKey = res.tianDiTuKey || 'c16876b28898637c0a1a68b3fa410504'
         const amapKey = res.amapKey || '5ebabc4536d4b42e0dd1e20175cca8ab'
 
+        const initMapOptionConfig = res.mapOptionConfig
+        if (initMapOptionConfig.mapType) {
+          currentMapType.value = initMapOptionConfig.mapType
+        }
+        if (initMapOptionConfig.mapOption) {
+          layerOptions = initMapOptionConfig.mapOption
+        }
+
         tiandityKey.value = tianDiTuKey
         gaodeKey.value = amapKey
         // 初始化所有底图图层
@@ -412,7 +420,7 @@ function init(params: InitParams = {}): Promise<void> {
           if (map) {
             map.updateSize()
             // 确保默认图层正确显示
-            handleMapChange('tianditu')
+            handleMapChange(currentMapType.value)
             // 地图初始化完成后解析 Promise
             resolve()
           }

package/src/components/data/step/person-select.vue

@@ -1,168 +1,168 @@
-<script setup lang="ts">
-import {
-  Field as VanField,
-  Picker as VanPicker,
-  Popup as VanPopup,
-  Search as VanSearch,
-} from 'vant'
-import { computed, inject, onMounted, ref } from 'vue'
-
-const workflowHandleWrap: any = inject('workflowHandleWrap')
-
-const showPicker = ref(false)
-
-const showMultiplePicker = ref(false)
-
-const branchChargePersons = ref({})
-
-const isInit = ref(false)
-
-// 用于 filterOption 的本地输入缓存（vant 不自带 filter）
-const filterKeyword = ref('')
-
-const customFieldName = {
-  text: 'label',
-  value: 'value',
-}
-
-const selectedNode = ref(undefined)
-
-const selectedOptions = computed(() => {
-  if (!selectedNode.value) {
-    return []
-  }
-  return filterOptions(selectedNode.value.chargePersonOptions)
-})
-
-onMounted(() => {
-  isInit.value = false
-  if (workflowHandleWrap.branchNodes.value) {
-    // 初始化初始值
-    for (const node of workflowHandleWrap.branchNodes.value) {
-      branchChargePersons.value[node.stepId] = {
-        handler: '',
-        handlerId: '',
-      }
-    }
-  }
-  isInit.value = true
-})
-
-function setBranchPersonValue(stepId, value, options, selectedOptions) {
-  if (!stepId)
-    return
-  if (!workflowHandleWrap.branchChargePersons.value) {
-    workflowHandleWrap.branchChargePersons.value = {}
-  }
-  if (!workflowHandleWrap.branchChargePersons.value[stepId]) {
-    workflowHandleWrap.branchChargePersons.value[stepId] = {}
-  }
-  if (workflowHandleWrap.branchChargePersons.value[stepId]) {
-    branchChargePersons.value[stepId] = {
-      handler: options.find(item => item.value === value)?.label,
-      handlerId: value,
-    }
-    Object.assign(workflowHandleWrap.branchChargePersons.value[stepId], branchChargePersons.value[stepId])
-  }
-  workflowHandleWrap.checkedNextStepPerson.value = selectedOptions[0].value
-  workflowHandleWrap.checkedNextStepPersonName.value = selectedOptions[0].label
-}
-
-function getBranchSelectionLabel() {
-  if (workflowHandleWrap.needMultipleBranchSelection.value) {
-    return '分支处理人'
-  }
-  else if (workflowHandleWrap.calculatedTargetNode.value) {
-    return `${workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode.value)}处理人`
-  }
-  else {
-    return '处理人'
-  }
-}
-
-// vant 没有原生 filter-option，因此需要本地筛选
-function filterOptions(options) {
-  if (!filterKeyword.value)
-    return options
-  return options.filter(option => option.label.toLowerCase().includes(filterKeyword.value.toLowerCase()))
-}
-
-// 搜索回调函数
-function search(val: string) {
-  filterKeyword.value = val || ''
-}
-</script>
-
-<template>
-  <div v-if="workflowHandleWrap.isNeedSelectPerson.value && isInit">
-    <!-- 多分支选择 -->
-    <template v-if="workflowHandleWrap.needMultipleBranchSelection.value && workflowHandleWrap.branchNodes.value.length > 0">
-      <template v-for="node in workflowHandleWrap.branchNodes.value" :key="node.stepId">
-        <VanField
-          v-model="branchChargePersons[node.stepId].handler"
-          :label="`${node.stepName}处理人`"
-          is-link
-          clickable
-          required
-          placeholder="请选择处理人"
-          @click="selectedNode = node; showMultiplePicker = true;"
-        />
-      </template>
-      <VanPopup v-model:show="showMultiplePicker" position="bottom">
-        <!-- 搜索框 -->
-        <VanSearch
-          v-model="filterKeyword"
-          placeholder="搜索"
-          @clear="() => search('')"
-          @update:model-value="search"
-        />
-        <VanPicker
-          :columns="selectedOptions"
-          :columns-field-names="customFieldName"
-          value-key="label"
-          @confirm="(val) => {
-            setBranchPersonValue(selectedNode.stepId, val.selectedValues[0], selectedNode.chargePersonOptions, val.selectedOptions)
-            showMultiplePicker = false;
-          }"
-          @cancel="showMultiplePicker = false;"
-        />
-      </VanPopup>
-    </template>
-
-    <!-- 单分支选择 -->
-    <template v-else>
-      <VanField
-        v-model="workflowHandleWrap.checkedNextStepPersonName.value"
-        :label="getBranchSelectionLabel()"
-        label-width="auto"
-        is-link
-        clickable
-        required
-        placeholder="请选择处理人"
-        @click="showPicker = true"
-      />
-      <VanPopup v-model:show="showPicker" position="bottom">
-        <!-- 搜索框 -->
-        <VanSearch
-          v-model="filterKeyword"
-          placeholder="搜索"
-          @clear="() => search('')"
-          @update:model-value="search"
-        />
-        <VanPicker
-          :columns="filterOptions(workflowHandleWrap.nextStepPersonOptions.value)"
-          :columns-field-names="customFieldName"
-          @confirm="(val) => {
-            setBranchPersonValue(workflowHandleWrap.calculatedTargetNode.value, val.selectedValues[0], workflowHandleWrap.nextStepPersonOptions.value, val.selectedOptions)
-            showPicker = false;
-          }"
-          @cancel="showPicker = false;"
-        />
-      </VanPopup>
-    </template>
-  </div>
-</template>
-
-<style scoped>
-/* 保持你的样式或根据 vant 移动端自行优化 */
-</style>
+<script setup lang="ts">
+import {
+  Field as VanField,
+  Picker as VanPicker,
+  Popup as VanPopup,
+  Search as VanSearch,
+} from 'vant'
+import { computed, inject, onMounted, ref } from 'vue'
+
+const workflowHandleWrap: any = inject('workflowHandleWrap')
+
+const showPicker = ref(false)
+
+const showMultiplePicker = ref(false)
+
+const branchChargePersons = ref({})
+
+const isInit = ref(false)
+
+// 用于 filterOption 的本地输入缓存（vant 不自带 filter）
+const filterKeyword = ref('')
+
+const customFieldName = {
+  text: 'label',
+  value: 'value',
+}
+
+const selectedNode = ref(undefined)
+
+const selectedOptions = computed(() => {
+  if (!selectedNode.value) {
+    return []
+  }
+  return filterOptions(selectedNode.value.chargePersonOptions)
+})
+
+onMounted(() => {
+  isInit.value = false
+  if (workflowHandleWrap.branchNodes.value) {
+    // 初始化初始值
+    for (const node of workflowHandleWrap.branchNodes.value) {
+      branchChargePersons.value[node.stepId] = {
+        handler: '',
+        handlerId: '',
+      }
+    }
+  }
+  isInit.value = true
+})
+
+function setBranchPersonValue(stepId, value, options, selectedOptions) {
+  if (!stepId)
+    return
+  if (!workflowHandleWrap.branchChargePersons.value) {
+    workflowHandleWrap.branchChargePersons.value = {}
+  }
+  if (!workflowHandleWrap.branchChargePersons.value[stepId]) {
+    workflowHandleWrap.branchChargePersons.value[stepId] = {}
+  }
+  if (workflowHandleWrap.branchChargePersons.value[stepId]) {
+    branchChargePersons.value[stepId] = {
+      handler: options.find(item => item.value === value)?.label,
+      handlerId: value,
+    }
+    Object.assign(workflowHandleWrap.branchChargePersons.value[stepId], branchChargePersons.value[stepId])
+  }
+  workflowHandleWrap.checkedNextStepPerson.value = selectedOptions[0].value
+  workflowHandleWrap.checkedNextStepPersonName.value = selectedOptions[0].label
+}
+
+function getBranchSelectionLabel() {
+  if (workflowHandleWrap.needMultipleBranchSelection.value) {
+    return '分支处理人'
+  }
+  else if (workflowHandleWrap.calculatedTargetNode.value) {
+    return `${workflowHandleWrap.getStepNameByStepId(workflowHandleWrap.calculatedTargetNode.value)}处理人`
+  }
+  else {
+    return '处理人'
+  }
+}
+
+// vant 没有原生 filter-option，因此需要本地筛选
+function filterOptions(options) {
+  if (!filterKeyword.value)
+    return options
+  return options.filter(option => option.label.toLowerCase().includes(filterKeyword.value.toLowerCase()))
+}
+
+// 搜索回调函数
+function search(val: string) {
+  filterKeyword.value = val || ''
+}
+</script>
+
+<template>
+  <div v-if="workflowHandleWrap.isNeedSelectPerson.value && isInit">
+    <!-- 多分支选择 -->
+    <template v-if="workflowHandleWrap.needMultipleBranchSelection.value && workflowHandleWrap.branchNodes.value.length > 0">
+      <template v-for="node in workflowHandleWrap.branchNodes.value" :key="node.stepId">
+        <VanField
+          v-model="branchChargePersons[node.stepId].handler"
+          :label="`${node.stepName}处理人`"
+          is-link
+          clickable
+          required
+          placeholder="请选择处理人"
+          @click="selectedNode = node; showMultiplePicker = true;"
+        />
+      </template>
+      <VanPopup v-model:show="showMultiplePicker" position="bottom">
+        <!-- 搜索框 -->
+        <VanSearch
+          v-model="filterKeyword"
+          placeholder="搜索"
+          @clear="() => search('')"
+          @update:model-value="search"
+        />
+        <VanPicker
+          :columns="selectedOptions"
+          :columns-field-names="customFieldName"
+          value-key="label"
+          @confirm="(val) => {
+            setBranchPersonValue(selectedNode.stepId, val.selectedValues[0], selectedNode.chargePersonOptions, val.selectedOptions)
+            showMultiplePicker = false;
+          }"
+          @cancel="showMultiplePicker = false;"
+        />
+      </VanPopup>
+    </template>
+
+    <!-- 单分支选择 -->
+    <template v-else>
+      <VanField
+        v-model="workflowHandleWrap.checkedNextStepPersonName.value"
+        :label="getBranchSelectionLabel()"
+        label-width="auto"
+        is-link
+        clickable
+        required
+        placeholder="请选择处理人"
+        @click="showPicker = true"
+      />
+      <VanPopup v-model:show="showPicker" position="bottom">
+        <!-- 搜索框 -->
+        <VanSearch
+          v-model="filterKeyword"
+          placeholder="搜索"
+          @clear="() => search('')"
+          @update:model-value="search"
+        />
+        <VanPicker
+          :columns="filterOptions(workflowHandleWrap.nextStepPersonOptions.value)"
+          :columns-field-names="customFieldName"
+          @confirm="(val) => {
+            setBranchPersonValue(workflowHandleWrap.calculatedTargetNode.value, val.selectedValues[0], workflowHandleWrap.nextStepPersonOptions.value, val.selectedOptions)
+            showPicker = false;
+          }"
+          @cancel="showPicker = false;"
+        />
+      </VanPopup>
+    </template>
+  </div>
+</template>
+
+<style scoped>
+/* 保持你的样式或根据 vant 移动端自行优化 */
+</style>

package/src/stores/index.ts

@@ -1,15 +1,15 @@
-import { createPinia } from 'pinia'
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
-
-import useCaptchaStore from './modules/captcha'
-import useHomeAppStore from './modules/homeApp'
-import useRouteCacheStore from './modules/routeCache'
-import useSettingStore from './modules/setting'
-import useStepStore from './modules/step'
-import useUserStore from './modules/user'
-
-const pinia = createPinia()
-pinia.use(piniaPluginPersistedstate)
-
-export { useCaptchaStore, useHomeAppStore, useRouteCacheStore, useSettingStore, useStepStore, useUserStore }
-export default pinia
+import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+
+import useCaptchaStore from './modules/captcha'
+import useHomeAppStore from './modules/homeApp'
+import useRouteCacheStore from './modules/routeCache'
+import useSettingStore from './modules/setting'
+import useStepStore from './modules/step'
+import useUserStore from './modules/user'
+
+const pinia = createPinia()
+pinia.use(piniaPluginPersistedstate)
+
+export { useCaptchaStore, useHomeAppStore, useRouteCacheStore, useSettingStore, useStepStore, useUserStore }
+export default pinia