af-mobile-client-vue3 1.3.97 → 1.3.98

package/package.json

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

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

@@ -225,7 +225,7 @@ function handlePhotoUpload(photoData: any) {
     f_operator: 'server',
     imgPath: photoData.filePath,
     urlPath: `/api/${import.meta.env.VITE_APP_SYSTEM_NAME}/resource/upload`,
-    commonId: parentData.commonId.value ?? '',
+    commonId: parentData?.commonId?.value ?? '',
   }
   if (props.isAsyncUpload) {
     // 添加上传队列

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

@@ -1,238 +1,238 @@
-<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 filteredColumns = 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 }
-    }
-  })
-}
-
-// 搜索过滤函数
-function handleSearch(value) {
-  // 确保 value 是字符串
-  const searchText = typeof value === 'string' ? value : value?.target?.value || ''
-  searchValue.value = searchText
-
-  // 如果是懒加载模式
-  if (props.lazyLoad && props.lazyLoad === 'true' && props.onSearch) {
-    if (!searchText) {
-      filteredColumns.value = []
-      return
-    }
-
-    isLoading.value = true
-    // 调用父组件传递的搜索函数
-    props.onSearch(searchText).then((results) => {
-      filteredColumns.value = transformColumns(results || [])
-      isLoading.value = false
-    }).catch((error) => {
-      console.error('懒加载搜索失败:', error)
-      filteredColumns.value = []
-      isLoading.value = false
-    })
-    return
-  }
-
-  // 普通搜索模式
-  if (!searchText) {
-    filteredColumns.value = columnsData.value
-    return
-  }
-
-  const searchTextLower = searchText.toLowerCase()
-
-  filteredColumns.value = columnsData.value.filter((item) => {
-    const text = props.offOption ? item : item[props.option.text]
-    return text?.toString().toLowerCase().includes(searchTextLower)
-  })
-}
-
-// 清空搜索
-function handleSearchClear() {
-  searchValue.value = ''
-  if (props.lazyLoad) {
-    // 懒加载模式：清空搜索时重新获取初始数据
-    if (props.onSearch) {
-      props.onSearch('').then((results) => {
-        filteredColumns.value = transformColumns(results || [])
-      }).catch((error) => {
-        console.error('清空搜索后数据加载失败:', error)
-        filteredColumns.value = []
-      })
-    }
-  }
-  else {
-    filteredColumns.value = columnsData.value
-  }
-}
-
-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="搜索"
-        @clear="handleSearchClear"
-        @input="handleSearch"
-      />
-
-      <!-- 选择器 -->
-      <div v-if="isLoading" class="loading-container">
-        <div class="loading-text">
-          搜索中...
-        </div>
-      </div>
-      <VanPicker
-        v-else
-        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 filteredColumns = 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 }
+    }
+  })
+}
+
+// 搜索过滤函数
+function handleSearch(value) {
+  // 确保 value 是字符串
+  const searchText = typeof value === 'string' ? value : value?.target?.value || ''
+  searchValue.value = searchText
+
+  // 如果是懒加载模式
+  if (props.lazyLoad && props.lazyLoad === 'true' && props.onSearch) {
+    if (!searchText) {
+      filteredColumns.value = []
+      return
+    }
+
+    isLoading.value = true
+    // 调用父组件传递的搜索函数
+    props.onSearch(searchText).then((results) => {
+      filteredColumns.value = transformColumns(results || [])
+      isLoading.value = false
+    }).catch((error) => {
+      console.error('懒加载搜索失败:', error)
+      filteredColumns.value = []
+      isLoading.value = false
+    })
+    return
+  }
+
+  // 普通搜索模式
+  if (!searchText) {
+    filteredColumns.value = columnsData.value
+    return
+  }
+
+  const searchTextLower = searchText.toLowerCase()
+
+  filteredColumns.value = columnsData.value.filter((item) => {
+    const text = props.offOption ? item : item[props.option.text]
+    return text?.toString().toLowerCase().includes(searchTextLower)
+  })
+}
+
+// 清空搜索
+function handleSearchClear() {
+  searchValue.value = ''
+  if (props.lazyLoad) {
+    // 懒加载模式：清空搜索时重新获取初始数据
+    if (props.onSearch) {
+      props.onSearch('').then((results) => {
+        filteredColumns.value = transformColumns(results || [])
+      }).catch((error) => {
+        console.error('清空搜索后数据加载失败:', error)
+        filteredColumns.value = []
+      })
+    }
+  }
+  else {
+    filteredColumns.value = columnsData.value
+  }
+}
+
+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="搜索"
+        @clear="handleSearchClear"
+        @input="handleSearch"
+      />
+
+      <!-- 选择器 -->
+      <div v-if="isLoading" class="loading-container">
+        <div class="loading-text">
+          搜索中...
+        </div>
+      </div>
+      <VanPicker
+        v-else
+        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/XFormItem/index.vue

@@ -170,7 +170,7 @@ const errorMessage = ref('')
 const showTreeSelect = ref(false)
 const treeValue = ref('')
 // 懒加载 最后检索版本
-let lastFetchId = ref(0)
+const lastFetchId = ref(0)
 
 // 登录信息 (可以在配置的动态函数中使用 this.setupState 获取到当前组件内的全部函数和变量 例：this.setupState.userState)
 const userState = useUserStore().getLogin()
@@ -979,7 +979,7 @@ async function handleLazySearch(searchText: string) {
         Object.assign(value, getDataParams[attr.model])
       }
 
-      lastFetchId.value ++
+      lastFetchId.value++
       const fetchId = this.lastFetchId
       // 根据搜索关键词过滤结果
       const results = await runLogic(logicName, value, serviceName) as any

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/views/component/XCellListView/index.vue

@@ -13,7 +13,83 @@ const router = useRouter()
 
 // 简易crud表单测试
 const configName = ref('ceshiCRUD')
-const serviceName = ref('af-linepatrol')
+const serviceName = ref('af-safecheck')
+
+// 资源权限测试
+// 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 fixQueryForm = ref({
+//   f_operator_id: '487184754014158848',
+// })
 </script>
 
 <template>

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>