af-mobile-client-vue3 1.6.29 → 1.6.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.6.29",
+  "version": "1.6.30",
   "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/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

package/src/stores/modules/captcha.ts

@@ -1,108 +1,108 @@
-import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-// 验证码字符集
-const CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-
-// 生成随机验证码
-function generateCode(length = 4): string {
-  let code = ''
-  for (let i = 0; i < length; i++) {
-    code += CHARS.charAt(Math.floor(Math.random() * CHARS.length))
-  }
-  return code
-}
-
-// 用 canvas 生成验证码图片的 base64
-function generateCaptchaImage(code: string): string {
-  try {
-    const canvas = document.createElement('canvas')
-    canvas.width = 80
-    canvas.height = 32
-    const ctx = canvas.getContext('2d')
-    if (!ctx)
-      return ''
-
-    // 随机浅色背景
-    const bgColors = ['#e8f4ff', '#f0f7ff', '#fff8e1', '#f3e5f5', '#e8f5e9']
-    ctx.fillStyle = bgColors[Math.floor(Math.random() * bgColors.length)]
-    ctx.fillRect(0, 0, canvas.width, canvas.height)
-
-    // 随机文字颜色
-    const textColors = ['#1a73e8', '#e91e63', '#2e7d32', '#6a1b9a', '#1565c0', '#ad1457']
-    const textColor = textColors[Math.floor(Math.random() * textColors.length)]
-
-    // 文字
-    ctx.font = 'bold 22px Arial'
-    ctx.fillStyle = textColor
-    ctx.textAlign = 'center'
-    ctx.textBaseline = 'middle'
-    ctx.fillText(code, canvas.width / 2, canvas.height / 2)
-
-    return canvas.toDataURL('image/png')
-  }
-  catch {
-    return ''
-  }
-}
-
-export const useCaptchaStore = defineStore('captcha', () => {
-  const show = ref(false)
-  const isLoading = ref(false)
-  const captchaImgBase64 = ref('')
-  const captchaUUID = ref('')
-  const captchaCode = ref('')
-
-  async function fetchCaptcha() {
-    if (isLoading.value)
-      return
-    isLoading.value = true
-    try {
-      // 未配置 captchaEnable 或显式为 true 时才显示验证码
-      const setting = useSettingStore().getSetting()
-      if (!setting?.captchaEnable) {
-        show.value = false
-        return
-      }
-
-      // 本地生成验证码
-      const code = generateCode()
-      captchaCode.value = code
-      captchaUUID.value = `local_${Date.now()}`
-      captchaImgBase64.value = generateCaptchaImage(code)
-      show.value = true
-    }
-    catch (e) {
-      console.error('生成验证码失败', e)
-      show.value = false
-    }
-    finally {
-      isLoading.value = false
-    }
-  }
-
-  // 验证验证码
-  function verifyCaptcha(inputCode: string): boolean {
-    return captchaCode.value.toLowerCase() === inputCode.toLowerCase()
-  }
-
-  function resetCaptcha() {
-    captchaUUID.value = ''
-    captchaImgBase64.value = ''
-    captchaCode.value = ''
-    show.value = false
-  }
-
-  return {
-    show,
-    isLoading,
-    captchaImgBase64,
-    captchaUUID,
-    fetchCaptcha,
-    verifyCaptcha,
-    resetCaptcha,
-  }
-})
-
-export default useCaptchaStore
+import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+// 验证码字符集
+const CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+
+// 生成随机验证码
+function generateCode(length = 4): string {
+  let code = ''
+  for (let i = 0; i < length; i++) {
+    code += CHARS.charAt(Math.floor(Math.random() * CHARS.length))
+  }
+  return code
+}
+
+// 用 canvas 生成验证码图片的 base64
+function generateCaptchaImage(code: string): string {
+  try {
+    const canvas = document.createElement('canvas')
+    canvas.width = 80
+    canvas.height = 32
+    const ctx = canvas.getContext('2d')
+    if (!ctx)
+      return ''
+
+    // 随机浅色背景
+    const bgColors = ['#e8f4ff', '#f0f7ff', '#fff8e1', '#f3e5f5', '#e8f5e9']
+    ctx.fillStyle = bgColors[Math.floor(Math.random() * bgColors.length)]
+    ctx.fillRect(0, 0, canvas.width, canvas.height)
+
+    // 随机文字颜色
+    const textColors = ['#1a73e8', '#e91e63', '#2e7d32', '#6a1b9a', '#1565c0', '#ad1457']
+    const textColor = textColors[Math.floor(Math.random() * textColors.length)]
+
+    // 文字
+    ctx.font = 'bold 22px Arial'
+    ctx.fillStyle = textColor
+    ctx.textAlign = 'center'
+    ctx.textBaseline = 'middle'
+    ctx.fillText(code, canvas.width / 2, canvas.height / 2)
+
+    return canvas.toDataURL('image/png')
+  }
+  catch {
+    return ''
+  }
+}
+
+export const useCaptchaStore = defineStore('captcha', () => {
+  const show = ref(false)
+  const isLoading = ref(false)
+  const captchaImgBase64 = ref('')
+  const captchaUUID = ref('')
+  const captchaCode = ref('')
+
+  async function fetchCaptcha() {
+    if (isLoading.value)
+      return
+    isLoading.value = true
+    try {
+      // 未配置 captchaEnable 或显式为 true 时才显示验证码
+      const setting = useSettingStore().getSetting()
+      if (!setting?.captchaEnable) {
+        show.value = false
+        return
+      }
+
+      // 本地生成验证码
+      const code = generateCode()
+      captchaCode.value = code
+      captchaUUID.value = `local_${Date.now()}`
+      captchaImgBase64.value = generateCaptchaImage(code)
+      show.value = true
+    }
+    catch (e) {
+      console.error('生成验证码失败', e)
+      show.value = false
+    }
+    finally {
+      isLoading.value = false
+    }
+  }
+
+  // 验证验证码
+  function verifyCaptcha(inputCode: string): boolean {
+    return captchaCode.value.toLowerCase() === inputCode.toLowerCase()
+  }
+
+  function resetCaptcha() {
+    captchaUUID.value = ''
+    captchaImgBase64.value = ''
+    captchaCode.value = ''
+    show.value = false
+  }
+
+  return {
+    show,
+    isLoading,
+    captchaImgBase64,
+    captchaUUID,
+    fetchCaptcha,
+    verifyCaptcha,
+    resetCaptcha,
+  }
+})
+
+export default useCaptchaStore