af-mobile-client-vue3 1.4.14 → 1.4.15

package/package.json

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

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

@@ -0,0 +1,312 @@
+<script setup lang="ts">
+import type { SignatureComponentExpose, SignatureComponentProps } from '@af-mobile-client-vue3/components/core/Signature/signature'
+import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
+import { showImagePreview, showToast } from 'vant'
+import { defineEmits, defineProps, inject, ref } from 'vue'
+
+const props = withDefaults(defineProps<SignatureComponentProps>(), {
+  label: '用户签字',
+  required: false,
+  disabled: false,
+  uploadMode: 'server',
+  imageList: null,
+  formReadonly: false,
+  isAsyncUpload: false,
+})
+
+const emit = defineEmits<{
+  signatureComplete: [data: any]
+}>()
+
+const signatureImage = ref<string>('')
+const rawBase64Data = ref<string>('') // 保存原始base64数据
+const hasSignature = ref(false)
+const parentData: any = inject('provideParent')
+const imageList = ref<Array<any>>(props.imageList ?? [])
+console.log('imageList', imageList.value)
+console.log('props.imageList', props.imageList)
+// 处理签字后的上传
+function getImageMimeType(fileName: string): string {
+  const ext = fileName.split('.').pop()?.toLowerCase()
+  if (ext === 'jpg' || ext === 'jpeg')
+    return 'image/jpeg'
+  if (ext === 'png')
+    return 'image/png'
+  if (ext === 'gif')
+    return 'image/gif'
+  return 'image/png' // 默认
+}
+
+function handleSignature() {
+  if (props.disabled)
+    return
+
+  mobileUtil.execute({
+    funcName: 'showSignaturePad',
+    param: {},
+    callbackFunc: (result: any) => {
+      console.log('签字结果:', result)
+      if (result.status === 'success') {
+        const mimeType = getImageMimeType(result.data.filePath)
+        // 保存原始base64数据
+        rawBase64Data.value = result.data.base64
+        // 添加base64图片前缀用于显示
+        signatureImage.value = `data:${mimeType};base64,${result.data.base64}`
+        hasSignature.value = true
+        const tempFile = {
+          uid: Date.now() + Math.random().toString(36).substr(2, 5),
+          name: result.data.filePath.split('/').pop(),
+          status: 'uploading',
+          message: '上传中...',
+          url: `data:${mimeType};base64,${result.data.base64}`,
+          isImage: true,
+          type: mimeType,
+        }
+        if (imageList.value) {
+          imageList.value = [tempFile]
+        }
+
+        const param = {
+          resUploadMode: props.uploadMode,
+          pathKey: 'Default',
+          formType: 'image',
+          useType: 'Default',
+          resUploadStock: '1',
+          filename: tempFile.name,
+          // 暂无size
+          // filesize: photoData.size,
+          f_operator: 'server',
+          imgPath: result.data.filePath,
+          urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
+          commonId: parentData?.commonId.value ?? '',
+        }
+        if (props.isAsyncUpload) {
+          // 添加上传队列
+          mobileUtil.execute({
+            funcName: 'queueUpload',
+            param,
+            callbackFunc: (res: any) => {
+              console.warn('上传结果', res)
+              let resStatus = 'success'
+              // 成功
+              if (res.data && res.data.enqueued) {
+                const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+                if (index !== -1) {
+                  delete imageList.value[index].message
+                  imageList.value[index].status = 'done'
+                  imageList.value[index].photo_name = tempFile.name
+                  imageList.value[index].type = mimeType
+                }
+              }
+              else {
+                resStatus = 'error'
+                // 上传失败，显示错误提示并清除图片
+                const errorMessage = res.message || res.error || '上传失败，请重试'
+                showToast({
+                  message: errorMessage,
+                  type: 'fail',
+                  duration: 3000,
+                })
+                clearSignature()
+              }
+              emit('signatureComplete', {
+                status: resStatus,
+                data: imageList.value?.length > 0 ? imageList.value[0] : null,
+              })
+            },
+          })
+        }
+        else {
+          // 上传到服务器
+          mobileUtil.execute({
+            funcName: 'uploadResource',
+            param,
+            callbackFunc: (result: any) => {
+              const index = imageList.value.findIndex(item => item.uid === tempFile.uid)
+              if (result.status === 'success') {
+                if (index !== -1) {
+                  imageList.value[index].uid = result.data.id
+                  imageList.value[index].id = result.data.id
+                  imageList.value[index].photo_name = result.data.f_filename
+                  imageList.value[index].f_downloadpath = result.data.f_downloadpath
+                  delete imageList.value[index].message
+                  imageList.value[index].status = 'done'
+                }
+              }
+              else {
+                // 上传失败，显示错误提示并清除图片
+                const errorMessage = result.message || result.error || '上传失败，请重试'
+                showToast({
+                  message: errorMessage,
+                  type: 'fail',
+                  duration: 3000,
+                })
+                clearSignature()
+              }
+              emit('signatureComplete', {
+                status: result.status,
+                data: result.data,
+              })
+            },
+          })
+        }
+      }
+    },
+  })
+}
+
+function clearSignature() {
+  signatureImage.value = ''
+  rawBase64Data.value = ''
+  hasSignature.value = false
+  imageList.value = []
+  emit('signatureComplete', {
+    base64: '',
+    status: 'cleared',
+  })
+}
+
+// 预览签字照片
+function previewSignature() {
+  if (imageList.value) {
+    showImagePreview(imageList.value.map(item => item.url))
+  }
+}
+
+// 暴露方法供父组件调用
+defineExpose<SignatureComponentExpose>({
+  clearSignature,
+  hasSignature: () => hasSignature.value,
+  getSignatureData: () => rawBase64Data.value, // 返回原始base64数据
+  previewSignature,
+  getSignatureList: () => imageList.value.map((item) => { return { photo_name: item.photo_name, id: item.id, f_downloadpath: item.f_downloadpath } }),
+})
+</script>
+
+<template>
+  <van-field
+    center
+    name="signature"
+    :label="label"
+    :required="required"
+  >
+    <template #input>
+      <div class="signature-container">
+        <!-- 签字照片预览 -->
+        <div v-if="imageList.length > 0 || hasSignature" class="signature-preview">
+          <van-image
+            v-for="(item, index) in imageList"
+            :key="`${item}_${index}`"
+            :src="item.url"
+            alt="签字照片"
+            class="signature-image"
+            fit="contain"
+            :show-loading="true"
+            :show-error="true"
+            loading-icon="photo-o"
+            error-icon="warning-o"
+            @click="previewSignature"
+          />
+        </div>
+
+        <!-- 按钮行 -->
+        <div class="button-row">
+          <!-- 签字按钮 -->
+          <van-button
+            v-if="!props.formReadonly"
+            :disabled="disabled"
+            type="default"
+            size="small"
+            class="signature-btn dashed-btn"
+            @click="handleSignature"
+          >
+            <van-icon :name="hasSignature ? 'edit' : 'edit'" class="btn-icon" />
+            {{ imageList.length > 0 || hasSignature ? '重签' : '点击签字' }}
+          </van-button>
+
+          <!-- 清除按钮 -->
+          <van-button
+            v-if="(imageList.length > 0 || hasSignature) && !props.formReadonly"
+            type="default"
+            size="small"
+            class="dashed-btn clear-btn"
+            @click="clearSignature"
+          >
+            <van-icon name="delete" class="btn-icon" />
+            清除
+          </van-button>
+        </div>
+      </div>
+    </template>
+  </van-field>
+</template>
+
+<style scoped lang="less">
+.signature-container {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  width: 100%;
+}
+
+.signature-preview {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+
+  .signature-image {
+    max-width: 200px;
+    max-height: 120px;
+    border: 1px solid #e8e8e8;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+  }
+}
+
+// 按钮行样式
+.button-row {
+  display: flex;
+  gap: 12px;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.signature-btn {
+  flex-shrink: 0;
+  margin-right: auto;
+}
+
+// 虚线按钮样式
+.dashed-btn {
+  border: 1px dashed #1989fa !important;
+  background-color: transparent !important;
+  color: #1989fa !important;
+  border-radius: 4px !important;
+
+  &:hover {
+    border-color: #0570d9 !important;
+    color: #0570d9 !important;
+  }
+
+  &:active {
+    border-color: #0366d6 !important;
+    color: #0366d6 !important;
+    background-color: rgba(25, 137, 250, 0.1) !important;
+  }
+
+  &:disabled {
+    border-color: #c8c9cc !important;
+    color: #c8c9cc !important;
+    background-color: transparent !important;
+  }
+}
+
+// 按钮图标样式
+.btn-icon {
+  margin-right: 4px;
+  font-size: 14px;
+}
+</style>

package/src/components/core/Signature/signature.ts

@@ -0,0 +1,38 @@
+// 签字结果接口
+export interface SignatureResult {
+  status: 'success' | 'failed' | 'cancelled' | 'cleared'
+  base64?: string
+  message?: string
+}
+
+// 签字组件属性接口
+export interface SignatureComponentProps {
+  label?: string
+  required?: boolean
+  disabled?: boolean
+  uploadMode?: string
+  imageList?: Array<any>
+  formReadonly?: boolean
+  isAsyncUpload?: boolean // 是否使用异步上传-异步上传后将不会返回file表的数据，需要通过上传时的文件名去t_files中查询
+}
+
+// 签字完成事件数据接口
+export interface SignatureCompleteData {
+  base64: string
+  status: string
+}
+
+// 签字组件暴露的方法接口
+export interface SignatureComponentExpose {
+  clearSignature: () => void
+  hasSignature: () => boolean
+  getSignatureData: () => string
+  previewSignature: () => void
+  getSignatureList: () => Array<any>
+}
+
+// base64图片工具类型
+export interface Base64ImageData {
+  raw: string // 原始base64数据（不含前缀）
+  full: string // 完整的base64图片URL（含前缀）
+}

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

@@ -1,211 +1,211 @@
-<script setup lang="ts">
-import {
-  Field as VanField,
-  Picker as VanPicker,
-  Popup as VanPopup,
-  Search as VanSearch,
-} from 'vant'
-import { computed, defineEmits, defineModel, defineProps, onBeforeMount, ref, watch } from 'vue'
-
-const props = defineProps({
-  columns: {
-    type: Array,
-    default() {
-      return []
-    },
-  },
-  option: {
-    type: Object,
-    default() {
-      return { text: 'label', value: 'value', children: 'children' }
-    },
-  },
-  offOption: { // 关闭option配置key-value;当数据是非集合的数组的时候，开启
-    type: Boolean,
-    default: false,
-  },
-  border: { // 是否展示边框
-    type: Boolean,
-    default: false,
-  },
-  lazyLoad: { // 是否启用懒加载
-    type: String,
-    default: 'false',
-  },
-  onSearch: { // 懒加载时的搜索函数
-    type: Function,
-    default: null,
-  },
-})
-const emits = defineEmits(['confirm', 'change', 'cancel', 'input'])
-const show = ref(false)
-const resultValue = defineModel()
-const columnsData = ref([])
-const selectedOption = ref([])
-const searchValue = ref('')
-const isLoading = ref(false)
-
-// 转换空children为空字符串
-function transformColumns(data) {
-  return data.map((item) => {
-    if (item.children && item.children.length === 0) {
-      return {
-        ...item,
-        children: '',
-      }
-    }
-    else if (item.children && item.children.length !== 0) {
-      return { ...item, children: transformColumns(item.children) }
-    }
-    else {
-      return { ...item }
-    }
-  })
-}
-const filteredColumns = ref([])
-
-watch(
-  () => searchValue.value,
-  async (newValue) => {
-    if (props.lazyLoad && props.lazyLoad === 'true' && props.onSearch) {
-      if (!newValue) {
-        filteredColumns.value = []
-        return
-      }
-
-      isLoading.value = true
-      try {
-        const results = await props.onSearch(newValue)
-        filteredColumns.value = transformColumns(results || [])
-      }
-      catch (error) {
-        console.error('懒加载搜索失败:', error)
-        filteredColumns.value = []
-      }
-      finally {
-        isLoading.value = false
-      }
-    }
-    else {
-      // 普通搜索模式
-      if (!newValue) {
-        filteredColumns.value = columnsData.value
-        return
-      }
-
-      const searchTextLower = newValue.toLowerCase()
-      filteredColumns.value = columnsData.value.filter((item) => {
-        const text = props.offOption ? item : item[props.option.text]
-        return text?.toString().toLowerCase().includes(searchTextLower)
-      })
-    }
-  },
-  { immediate: true },
-)
-
-onBeforeMount(() => {
-  columnsData.value = transformColumns(props.columns)
-  filteredColumns.value = columnsData.value
-})
-
-const resultLabel = computed({
-  get() {
-    if (!resultValue.value)
-      return ''
-    const res = props.columns.filter((item) => {
-      const data = props.offOption ? item : item[props.option.value]
-      return data === resultValue.value
-    })
-    return res.length ? (props.offOption ? res[0] : res[0][props.option.text]) : ''
-  },
-  set() {
-
-  },
-})
-
-function onConfirm(value, _index) {
-  resultValue.value = props.offOption ? value.selectedValues : value.selectedValues[0]
-  // resultValue.value = value.selectedValues
-  selectedOption.value = value.selectedOptions
-  show.value = !show.value
-  emits('confirm', value.selectedValues[0], value.selectedOptions)
-}
-
-function change(val, index) {
-  emits('change', val, index, resultValue.value)
-}
-
-function cancel(val, index) {
-  show.value = !show.value
-  emits('cancel', val, index, resultValue.value)
-}
-
-function showPopu(disabled) {
-  if (disabled !== undefined && disabled !== false)
-    return false
-  columnsData.value = transformColumns(props.columns)
-  filteredColumns.value = columnsData.value
-  searchValue.value = '' // 重置搜索
-  show.value = !show.value
-}
-
-watch(() => resultValue, (newVal, _oldVal) => {
-  columnsData.value = transformColumns(props.columns)
-  filteredColumns.value = columnsData.value
-  emits('input', newVal)
-})
-
-// 监听 columns 变化
-watch(() => props.columns, () => {
-  columnsData.value = transformColumns(props.columns)
-  filteredColumns.value = columnsData.value
-  searchValue.value = ''
-}, { deep: true })
-</script>
-
-<template>
-  <VanField
-    v-model="resultLabel"
-    v-bind="$attrs"
-    readonly
-    :is-link="true"
-    :border="props.border"
-    @click="showPopu($attrs.readonly)"
-  />
-  <VanPopup v-model:show="show" position="bottom">
-    <div class="x-select-popup">
-      <!-- 搜索框 -->
-      <VanSearch
-        v-model="searchValue"
-        placeholder="搜索"
-      />
-
-      <!-- 选择器 -->
-      <VanPicker
-        :loading="isLoading"
-        v-bind="$attrs"
-        :columns="filteredColumns"
-        :columns-field-names="props.option"
-        show-toolbar
-        :value-key="props.option.text"
-        @cancel="cancel"
-        @confirm="onConfirm"
-        @change="change"
-      />
-    </div>
-  </VanPopup>
-</template>
-
-<style scoped>
-.loading-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 200px;
-}
-
-.loading-text {
-  color: #969799;
-  font-size: 14px;
-}
-</style>
+<script setup lang="ts">
+import {
+  Field as VanField,
+  Picker as VanPicker,
+  Popup as VanPopup,
+  Search as VanSearch,
+} from 'vant'
+import { computed, defineEmits, defineModel, defineProps, onBeforeMount, ref, watch } from 'vue'
+
+const props = defineProps({
+  columns: {
+    type: Array,
+    default() {
+      return []
+    },
+  },
+  option: {
+    type: Object,
+    default() {
+      return { text: 'label', value: 'value', children: 'children' }
+    },
+  },
+  offOption: { // 关闭option配置key-value;当数据是非集合的数组的时候，开启
+    type: Boolean,
+    default: false,
+  },
+  border: { // 是否展示边框
+    type: Boolean,
+    default: false,
+  },
+  lazyLoad: { // 是否启用懒加载
+    type: String,
+    default: 'false',
+  },
+  onSearch: { // 懒加载时的搜索函数
+    type: Function,
+    default: null,
+  },
+})
+const emits = defineEmits(['confirm', 'change', 'cancel', 'input'])
+const show = ref(false)
+const resultValue = defineModel()
+const columnsData = ref([])
+const selectedOption = ref([])
+const searchValue = ref('')
+const isLoading = ref(false)
+
+// 转换空children为空字符串
+function transformColumns(data) {
+  return data.map((item) => {
+    if (item.children && item.children.length === 0) {
+      return {
+        ...item,
+        children: '',
+      }
+    }
+    else if (item.children && item.children.length !== 0) {
+      return { ...item, children: transformColumns(item.children) }
+    }
+    else {
+      return { ...item }
+    }
+  })
+}
+const filteredColumns = ref([])
+
+watch(
+  () => searchValue.value,
+  async (newValue) => {
+    if (props.lazyLoad && props.lazyLoad === 'true' && props.onSearch) {
+      if (!newValue) {
+        filteredColumns.value = []
+        return
+      }
+
+      isLoading.value = true
+      try {
+        const results = await props.onSearch(newValue)
+        filteredColumns.value = transformColumns(results || [])
+      }
+      catch (error) {
+        console.error('懒加载搜索失败:', error)
+        filteredColumns.value = []
+      }
+      finally {
+        isLoading.value = false
+      }
+    }
+    else {
+      // 普通搜索模式
+      if (!newValue) {
+        filteredColumns.value = columnsData.value
+        return
+      }
+
+      const searchTextLower = newValue.toLowerCase()
+      filteredColumns.value = columnsData.value.filter((item) => {
+        const text = props.offOption ? item : item[props.option.text]
+        return text?.toString().toLowerCase().includes(searchTextLower)
+      })
+    }
+  },
+  { immediate: true },
+)
+
+onBeforeMount(() => {
+  columnsData.value = transformColumns(props.columns)
+  filteredColumns.value = columnsData.value
+})
+
+const resultLabel = computed({
+  get() {
+    if (!resultValue.value)
+      return ''
+    const res = props.columns.filter((item) => {
+      const data = props.offOption ? item : item[props.option.value]
+      return data === resultValue.value
+    })
+    return res.length ? (props.offOption ? res[0] : res[0][props.option.text]) : ''
+  },
+  set() {
+
+  },
+})
+
+function onConfirm(value, _index) {
+  resultValue.value = props.offOption ? value.selectedValues : value.selectedValues[0]
+  // resultValue.value = value.selectedValues
+  selectedOption.value = value.selectedOptions
+  show.value = !show.value
+  emits('confirm', value.selectedValues[0], value.selectedOptions)
+}
+
+function change(val, index) {
+  emits('change', val, index, resultValue.value)
+}
+
+function cancel(val, index) {
+  show.value = !show.value
+  emits('cancel', val, index, resultValue.value)
+}
+
+function showPopu(disabled) {
+  if (disabled !== undefined && disabled !== false)
+    return false
+  columnsData.value = transformColumns(props.columns)
+  filteredColumns.value = columnsData.value
+  searchValue.value = '' // 重置搜索
+  show.value = !show.value
+}
+
+watch(() => resultValue, (newVal, _oldVal) => {
+  columnsData.value = transformColumns(props.columns)
+  filteredColumns.value = columnsData.value
+  emits('input', newVal)
+})
+
+// 监听 columns 变化
+watch(() => props.columns, () => {
+  columnsData.value = transformColumns(props.columns)
+  filteredColumns.value = columnsData.value
+  searchValue.value = ''
+}, { deep: true })
+</script>
+
+<template>
+  <VanField
+    v-model="resultLabel"
+    v-bind="$attrs"
+    readonly
+    :is-link="true"
+    :border="props.border"
+    @click="showPopu($attrs.readonly)"
+  />
+  <VanPopup v-model:show="show" position="bottom">
+    <div class="x-select-popup">
+      <!-- 搜索框 -->
+      <VanSearch
+        v-model="searchValue"
+        placeholder="搜索"
+      />
+
+      <!-- 选择器 -->
+      <VanPicker
+        :loading="isLoading"
+        v-bind="$attrs"
+        :columns="filteredColumns"
+        :columns-field-names="props.option"
+        show-toolbar
+        :value-key="props.option.text"
+        @cancel="cancel"
+        @confirm="onConfirm"
+        @change="change"
+      />
+    </div>
+  </VanPopup>
+</template>
+
+<style scoped>
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 200px;
+}
+
+.loading-text {
+  color: #969799;
+  font-size: 14px;
+}
+</style>

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

@@ -4,7 +4,7 @@ import dayjs from 'dayjs/esm/index'
 import { ref } from 'vue'
 
 const { serviceName, dictName, dictValue, dictType } = defineProps<{
-  serviceName: string
+  serviceName?: string
   dictName: string | null | undefined
   dictValue: string | number | null | undefined
   // 用于非字典型的格式化展示：如日期/小数/整数等

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

@@ -225,8 +225,6 @@ function checkModel(val = props.modelValue) {
  */
 function getDefaultValue() {
   const val = props.modelValue
-  console.warn('>>>>>props', props)
-  console.warn('>>>> attr', attr)
   // 如果有有效值，直接返回（datePicker 初始值需按 formValueFormat 归一）
   // 目的：外部通过 formData 传入的初始值在组件挂载即与配置格式一致
   if (checkModel(val)) {

package/src/components/data/XOlMap/types.ts

@@ -188,4 +188,4 @@ export interface PolygonLayerConfig {
   onClick?: (polygon: PolygonData, event: any) => void
   /** 多边形数据提供者 */
   dataProvider?: () => PolygonData[] | Promise<PolygonData[]>
-}
+}

package/src/stores/modules/setting.ts

@@ -22,6 +22,7 @@ export interface WebConfig {
   slideshowList: Array<any>
   registerRequire: boolean
   requestEncrypt: boolean
+  phoneLoginVerification: boolean
 }
 
 //  存放 webConfig 中的 setting 配置

package/src/stores/modules/user.ts

@@ -214,7 +214,7 @@ export const useUserStore = defineStore('app-user', () => {
         setToken(data.access_token)
         // 第三方教培系统鉴权兼容
         const LoginTicket = crypto.AESEncrypt(JSON.stringify(params), '3KMKqvgwR8ULbR8Z')
-        if (data.session && useSettingStore().getSetting()?.requestEncrypt) {
+        if (data.session && useSettingStore().getSetting().requestEncrypt) {
           const k = encryptUtil.RSADecrypt(data.session as string)
           localStorage.setItem('v4-session-key', k)
           secureStorageWrite('v4-session-key', k)

package/src/views/component/XCellListView/index.vue

@@ -9,92 +9,18 @@ const emit = defineEmits(['deleteRow'])
 // 访问路由
 const router = useRouter()
 // 获取默认值
-const idKey = ref('o_id')
+// const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('mobile_instrumentManageCRUD')
-const serviceName = ref('af-revenue')
-
-// 资源权限测试
-// const configName = ref('crud_sources_test')
-// const serviceName = ref('af-system')
-
-// 实际业务测试
-// const configName = ref('lngChargeAuditMobileCRUD')
-// const serviceName = ref('af-gaslink')
-
-// 跳转到详情页面
-// function toDetail(item) {
-//   router.push({
-//     name: 'XCellDetailView',
-//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
-//     query: {
-//       operName: item[operNameKey.value],
-//       method:item[methodKey.value],
-//       requestMethod:item[requestMethodKey.value],
-//       operatorType:item[operatorTypeKey.value],
-//       operUrl:item[operUrlKey.value],
-//       operIp:item[operIpKey.value],
-//       costTime:item[costTimeKey.value],
-//       operTime:item[operTimeKey.value],
-//
-//       title: item[titleKey.value],
-//       businessType: item[businessTypeKey.value],
-//       status:item[statusKey.value]
-//     }
-//   })
-// }
-
-// 跳转到表单——以表单组来渲染纯表单
-// function toDetail(item) {
-//   router.push({
-//     name: 'XFormGroupView',
-//     query: {
-//       id: item[idKey.value],
-//       // id: item.rr_id,
-//       // o_id: item.o_id,
-//     },
-//   })
-// }
-
-// 新增功能
-// function addOption(totalCount) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: totalCount, openid: totalCount },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '新增',
-//     },
-//   })
-// }
-
-// 修改功能
-// function updateRow(result) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
-
-// // 删除功能
-// function deleteRow(result) {
-//   emit('deleteRow', result.o_id)
-// }
+const configName = ref('ceshiCRUD')
+const serviceName = ref('af-linepatrol')
 </script>
 
 <template>
-  <NormalDataLayout id="XCellListView" title="测试">
+  <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
       <XCellList
         :config-name="configName"
-        :service-name="serviceName"
       />
     </template>
   </NormalDataLayout>

package/src/views/component/XFormView/index.vue

@@ -28,7 +28,6 @@ function onSubmit(data: any) {
         ref="formGroupAddConstruction"
         mode="修改"
         :config-name="configName"
-        :service-name="serviceName"
         :form-data="formData"
         @on-submit="onSubmit"
       />

package/src/views/component/XOlMapView/XLocationPicker/index.vue

@@ -1,118 +1,118 @@
-<script setup lang="ts">
-import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
-import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showNotify } from 'vant'
-import { ref } from 'vue'
-
-const selectedLocation = ref<LocationResult>()
-
-// 处理位置选择
-function handleLocationConfirm(location: LocationResult) {
-  // console.log('选择的位置:', location)
-  // selectedLocation.value = location
-  showNotify({ type: 'success', message: '位置已选择' })
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
-    <template #layout_content>
-      <div class="location-picker-demo">
-        <!-- 页面标题 -->
-        <div class="page-header">
-          <div class="title">
-            位置选择
-          </div>
-        </div>
-
-        <!-- 选择结果展示 -->
-        <div v-if="selectedLocation" class="location-result">
-          <div class="label">
-            已选位置:
-          </div>
-          <div class="value">
-            {{ selectedLocation.address }}
-          </div>
-          <div class="coordinates">
-            经度: {{ selectedLocation.longitude.toFixed(6) }},
-            纬度: {{ selectedLocation.latitude.toFixed(6) }}
-          </div>
-        </div>
-
-        <!-- 地图组件 -->
-        <div class="map-container">
-          <LocationPicker
-            v-model="selectedLocation"
-            :default-center="[108.948024, 34.263161]"
-            :default-zoom="12"
-            @confirm="handleLocationConfirm"
-          />
-        </div>
-      </div>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-.location-picker-demo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: #f7f8fa;
-}
-
-.page-header {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: white;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-  position: relative;
-  z-index: 1;
-
-  .title {
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-}
-
-.location-result {
-  background: white;
-  padding: 12px 16px;
-  margin: 10px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-
-  .label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 4px;
-  }
-
-  .value {
-    font-size: 16px;
-    color: #333;
-    margin-bottom: 8px;
-    word-break: break-all;
-  }
-
-  .coordinates {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.map-container {
-  flex: 1;
-  position: relative;
-  margin: 0 10px 10px 10px;
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-</style>
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  // console.log('选择的位置:', location)
+  // selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>

package/src/views/user/login/LoginForm.vue

@@ -2,7 +2,7 @@
 import type { FormInstance } from 'vant'
 import { LoginStateEnum, useFormRules, useLoginState } from '@af-mobile-client-vue3/hooks/useLogin'
 import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
-import { getConfigByNameAsync, runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { runLogic } from '@af-mobile-client-vue3/services/api/common'
 import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
@@ -107,15 +107,11 @@ function handleSubmit() {
       try {
         loading.value = true
         showLoadingToast('登录中...')
-        let username = formData.username
-        let password = formData.password
-        const webConfig = await getConfigByNameAsync('webConfig')
-        const verification = webConfig.setting?.phoneLoginVerification || false
-        if (verification) {
+        const username = formData.username
+        const password = formData.password
+        if (setting.getSetting()?.phoneLoginVerification) {
           try {
-            const res = await runLogic('openapi/loginVerification', { username, password }) as any
-            username = res.username
-            password = res.password
+            await runLogic('openapi/loginVerification', { username, password: bcrypt.hashSync(password, 10) }) as any
           }
           catch (e) {
             console.error('验证登录失败: ', e)

package/vite.config.ts

@@ -11,8 +11,8 @@ export default ({ mode }: ConfigEnv): UserConfig => {
 
   const appProxys = {}
 
-  const v4Server = 'http://117.35.109.162:31577'
-  const v3Server = 'http://117.35.109.162:31577'
+  const v4Server = 'http://192.168.50.67:31567'
+  const v3Server = 'http://192.168.50.67:31567'
   const OSSServerDev = 'http://192.168.50.67:30351'
   const geoserver = 'http://39.104.49.8:30372'
   const mockServer = 'http://127.0.0.1:8086'
@@ -64,13 +64,6 @@ export default ({ mode }: ConfigEnv): UserConfig => {
           changeOrigin: true,
           rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
         },
-        // '/api/af-revenue': {
-        //   // target: v4Server,
-        //   rewrite: (path: string) => path.replace(/^\/api\/af-revenue\//, '/'),
-        //   target: 'http://127.0.0.1:9026',
-        //   ws: false,
-        //   changeOrigin: true,
-        // },
         '/api': {
           // v3用
           // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),