af-mobile-client-vue3 1.4.13 → 1.4.15

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/XFormGroup/doc/DeviceForm.vue

@@ -119,4 +119,4 @@ onUnmounted(() => {
     color: #ff976a;
   }
 }
-</style>
+</style>

package/src/components/data/XFormGroup/doc/UserForm.vue

@@ -99,4 +99,4 @@ onUnmounted(() => {
 .user-form {
   padding: 16px;
 }
-</style>
+</style>

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)) {
@@ -620,7 +618,7 @@ function onCalendarConfirm(values) {
 // js 函数作为数据源
 async function updateOptions() {
   if (attr.keyName && (attr.keyName.toString().includes('async ') || attr.keyName.toString().includes('function '))) {
-    option.value = await executeStrFunctionByContext(currInst, attr.keyName, [props.form, runLogic, props.mode, getConfigByNameAsync, post])
+    option.value = await executeStrFunctionByContext(currInst, attr.keyName, [props.form, runLogic, props.mode, getConfigByNameAsync, post, userState.f.resources])
   }
 }
 

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/components/data/XReportGrid/XReportDemo.vue

@@ -1,33 +1,33 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import XReport from './XReport.vue'
-
-const mainRef = ref()
-
-onMounted(() => {
-  // 初始化逻辑
-})
-</script>
-
-<template>
-  <div id="test">
-    <van-card :bordered="false">
-      <XReport
-        ref="mainRef"
-        :use-oss-for-img="false"
-        config-name="nurseWorkstationCover"
-        server-name="af-his"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"
-      />
-    </van-card>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import XReport from './XReport.vue'
+
+const mainRef = ref()
+
+onMounted(() => {
+  // 初始化逻辑
+})
+</script>
+
+<template>
+  <div id="test">
+    <van-card :bordered="false">
+      <XReport
+        ref="mainRef"
+        :use-oss-for-img="false"
+        config-name="nurseWorkstationCover"
+        server-name="af-his"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true"
+      />
+    </van-card>
+  </div>
+</template>
+
+<style scoped>
+
+</style>