wui-components-v2 1.1.68 → 1.1.70

package/components/search/search.vue

@@ -1,128 +1,128 @@
-<script setup lang="ts">
-import { defineEmits, defineOptions, defineProps, ref } from 'vue'
-import type { Enums, Fields, Split2TabCriterias } from '../../type'
-import formControl from '../form-control/form-control.vue'
-
-defineOptions({ name: 'Search' })
-const props = defineProps<{
-  criterias: Fields[]
-  primaryCriteria: Fields | null
-  enumColumn?: Enums
-  mainCode?: string
-  split2TabCriterias?: Split2TabCriterias[]
-}>()
-const emits = defineEmits(['submit'])
-const show = ref(false)
-const search = ref('')
-const formControlRef = ref()
-const entity = ref({})
-const filterCriterias = computed(() => {
-  const criteriaSourceIds = props.split2TabCriterias?.map(item => item.sourceId) || []
-  const primarySourceId = props.primaryCriteria?.sourceId
-  if (!primarySourceId)
-    return props.criterias
-  return props.criterias.filter(item => ![primarySourceId, ...criteriaSourceIds].includes(item.sourceId))
-})
-function handleClose() {
-  show.value = false
-}
-function handleSubmit() {
-  if (!formControlRef.value) {
-    if (!props.primaryCriteria?.sourceId)
-      return
-    const data = `c_${props.primaryCriteria.sourceId}=${search.value}`
-    emits('submit', data)
-    handleClose()
-    return
-  }
-  formControlRef.value.submit().then((fdata: any) => {
-    entity.value = {
-      ...fdata,
-      ...(props.primaryCriteria?.sourceId ? { [props.primaryCriteria.sourceId]: search.value } : {}),
-    }
-    let data = ''
-
-    if (props.primaryCriteria?.sourceId) {
-      data = `c_${props.primaryCriteria.sourceId}=${search.value}`
-    }
-
-    filterCriterias.value.forEach((item) => {
-      for (const key in fdata) {
-        if (Object.prototype.hasOwnProperty.call(fdata, key)) {
-          const element = fdata[key]
-          if (item.sourceId === key) {
-            if (item.extControlType === 'relselectvalue') {
-              data = `${data}&c_${item.sourceId}=${element.map((item: string) => {
-                return item.split('@R@')[1]
-              }).join('@,@')}`
-            }
-            else if (item.extControlType === 'multiselect') {
-              element.forEach((subitem: string) => {
-                data = `${data}&c_${item.sourceId}=${subitem}`
-              })
-            }
-            else {
-              data = `${data}&c_${item.sourceId}=${element}`
-            }
-          }
-        }
-      }
-    })
-
-    console.log('查询条件', data)
-
-    emits('submit', data)
-    handleClose()
-  })
-}
-</script>
-
-<template>
-  <view v-if="primaryCriteria?.controlType === 'text'" class="w-full">
-    <wd-search v-model="search" cancel-txt="搜索" :placeholder="`请输入${primaryCriteria?.title || ''}搜索`" @clear="handleSubmit" @cancel="handleSubmit">
-      <template v-if="filterCriterias.length" #prefix>
-        <view class="search-type">
-          <wd-icon name="filter" size="17px" class="text-gray-500" @click="show = true" />
-        </view>
-      </template>
-    </wd-search>
-  </view>
-  <wd-popup v-model="show" position="bottom" custom-class="h-80vh" closable @close="handleClose">
-    <view class="relative box-border h-full p-1 bg-white dark:bg-[var(--wot-dark-background)]">
-      <view class="h-34px flex items-center justify-center">
-        筛选
-      </view>
-      <formControl ref="formControlRef" :field-group="{ fields: filterCriterias, readOnly: false, displayConfig: [], id: '', buttons: [], title: '', type: '', pointSourceId: '', mstrucId: '', relationNames: [] }" :entity="entity" :enum-column="enumColumn" />
-      <view class="h-12" />
-      <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]">
-        <wd-button block custom-class="flex-1" @click="handleSubmit">
-          确定
-        </wd-button>
-      </view>
-    </view>
-  </wd-popup>
-</template>
-
-<style scoped>
-.search-type {
-  position: relative;
-  height: 30px;
-  line-height: 30px;
-  padding: 0 8px 0 16px;
-}
-.search-type::after {
-  position: absolute;
-  content: '';
-  width: 1px;
-  right: 0;
-  top: 5px;
-  bottom: 5px;
-}
-::deep(.icon-arrow) {
-  display: inline-block;
-  font-size: 20px;
-  vertical-align: middle;
-}
-
-
-</style>
+<script setup lang="ts">
+import { computed, defineEmits, defineOptions, defineProps, ref } from 'vue'
+import type { Enums, Fields, Split2TabCriterias } from '../../type'
+import formControl from '../form-control/form-control.vue'
+
+defineOptions({ name: 'Search' })
+const props = defineProps<{
+  criteria: Fields[]
+  primaryCriterion: Fields | null
+  enumColumn?: Enums
+  mainCode?: string
+  split2TabCriterias?: Split2TabCriterias[]
+}>()
+const emits = defineEmits(['submit'])
+const show = ref(false)
+const search = ref('')
+const formControlRef = ref()
+const entity = ref({})
+const filterCriteria = computed(() => {
+  const criteriaSourceIds = props.split2TabCriterias?.map(item => item.sourceId) || []
+  const primarySourceId = props.primaryCriterion?.sourceId
+  if (!primarySourceId)
+    return props.criteria
+  return props.criteria.filter(item => ![primarySourceId, ...criteriaSourceIds].includes(item.sourceId))
+})
+function handleClose() {
+  show.value = false
+}
+function handleSubmit() {
+  if (!formControlRef.value) {
+    if (!props.primaryCriterion?.sourceId)
+      return
+    const data = `c_${props.primaryCriterion.sourceId}=${search.value}`
+    emits('submit', data)
+    handleClose()
+    return
+  }
+  formControlRef.value.submit().then((fdata: any) => {
+    entity.value = {
+      ...fdata,
+      ...(props.primaryCriterion?.sourceId ? { [props.primaryCriterion.sourceId]: search.value } : {}),
+    }
+    let data = ''
+
+    if (props.primaryCriterion?.sourceId) {
+      data = `c_${props.primaryCriterion.sourceId}=${search.value}`
+    }
+
+    filterCriteria.value.forEach((item) => {
+      for (const key in fdata) {
+        if (Object.prototype.hasOwnProperty.call(fdata, key)) {
+          const element = fdata[key]
+          if (item.sourceId === key) {
+            if (item.extControlType === 'relselectvalue') {
+              data = `${data}&c_${item.sourceId}=${element.map((item: string) => {
+                return item.split('@R@')[1]
+              }).join('@,@')}`
+            }
+            else if (item.extControlType === 'multiselect') {
+              element.forEach((subitem: string) => {
+                data = `${data}&c_${item.sourceId}=${subitem}`
+              })
+            }
+            else {
+              data = `${data}&c_${item.sourceId}=${element}`
+            }
+          }
+        }
+      }
+    })
+
+    console.log('查询条件', data)
+
+    emits('submit', data)
+    handleClose()
+  })
+}
+</script>
+
+<template>
+  <view v-if="primaryCriterion?.controlType === 'text'" class="w-full">
+    <wd-search v-model="search" cancel-txt="搜索" :placeholder="`请输入${primaryCriterion?.title || ''}搜索`" @clear="handleSubmit" @cancel="handleSubmit">
+      <template v-if="filterCriteria.length" #prefix>
+        <view class="search-type">
+          <wd-icon name="filter" size="17px" class="text-gray-500" @click="show = true" />
+        </view>
+      </template>
+    </wd-search>
+  </view>
+  <wd-popup v-model="show" position="bottom" custom-class="h-80vh" closable @close="handleClose">
+    <view class="relative box-border h-full p-1 bg-white dark:bg-[var(--wot-dark-background)]">
+      <view class="h-34px flex items-center justify-center">
+        筛选
+      </view>
+      <formControl ref="formControlRef" :field-group="{ fields: filterCriteria, readOnly: false, displayConfig: [], id: '', buttons: [], title: '', type: '', pointSourceId: '', mstrucId: '', relationNames: [] }" :entity="entity" :enum-column="enumColumn" />
+      <view class="h-12" />
+      <view class="fixed bottom-0 left-0 right-0 box-border w-100% flex p-2 bg-white dark:bg-[var(--wot-dark-background)]">
+        <wd-button block custom-class="flex-1" @click="handleSubmit">
+          确定
+        </wd-button>
+      </view>
+    </view>
+  </wd-popup>
+</template>
+
+<style scoped>
+.search-type {
+  position: relative;
+  height: 30px;
+  line-height: 30px;
+  padding: 0 8px 0 16px;
+}
+.search-type::after {
+  position: absolute;
+  content: '';
+  width: 1px;
+  right: 0;
+  top: 5px;
+  bottom: 5px;
+}
+::deep(.icon-arrow) {
+  display: inline-block;
+  font-size: 20px;
+  vertical-align: middle;
+}
+
+
+</style>

package/components/user-choose/user-choose.vue

@@ -70,7 +70,7 @@ const fetchDataById = async (id: string) => {
     const config = await pageConfig(props.sourceId)
     const newConfig=config.ltmplConfig
     const onlyCode=newConfig.extDisplayConfig?.cardShowCols?.[0]?.sourceId //获取回显字段对应参数名
-    const query=`c_${newConfig.secondCriteria?.sourceId}=${requestId}` //构建查询参数
+    const query=`c_${newConfig.secondCriterion?.sourceId}=${requestId}` //构建查询参数
     const res = await pageKey(props.sourceId, '', query)
     const data = await listData(res.key, 1, 10)
     const item = data.entities.find((e: any) => e.code === requestId)as any

package/components/wui-enume-select-control/wui-enume-select-control.vue

@@ -1,92 +1,92 @@
-<script lang="ts" setup>
-import { computed, defineEmits, defineProps, onMounted, ref } from 'vue'
-import { useEnums } from '../../composables/useEnumes'
-import type { Config } from '../../type'
-import { pageConfig } from '../../api/page'
-
-defineOptions({
-  name: 'WuiEnumeSelectControl',
-})
-
-const props = defineProps<{
-  sourceId: string
-  id: string
-  label?: string
-  title?: string
-  modelValue: string
-  placeholder?: string
-  disabled?: boolean
-  required?: boolean
-  rules?: any
-  zIndex?: number
-  type: 'checkbox' | 'radio'
-  labelWidth?: string
-}>()
-const emits = defineEmits(['update:modelValue'])
-
-const config = ref<Config>()
-const { enumColumn, getEnums } = useEnums({ config })
-async function getPageConfig() {
-  try {
-    const res = await pageConfig(props.sourceId)
-
-    if (res.ltmplConfig) {
-      config.value = res.ltmplConfig
-      getEnums()
-    }
-  } catch (error) {
-    console.log(error)
-  }
-}
-
-const comEnums = computed(() => {
-  const mstrucId = config.value?.criterias?.find(item => item.sourceId === props.id)?.mstrucId
-
-  if (mstrucId) {
-    return enumColumn.value[mstrucId]?.map(item => {
-      return {
-        id: item.id,
-        label: item.title,
-        value: `${item.id}-R-${item.value}`,
-      }
-    })
-  }
-
-  return []
-})
-
-onMounted(() => {
-  getPageConfig()
-})
-
-function confirm(event: any) {
-  emits('update:modelValue', event.value)
-}
-</script>
-
-<script lang="ts">
-export default {
-  options: {
-    virtualHost: true,
-    addGlobalClass: true,
-    styleIsolation: 'shared',
-  },
-}
-</script>
-
-<template>
-  <wd-select-picker
-    :label-width="props.labelWidth"
-    :title="props.title"
-    :placeholder="props.placeholder"
-    :disabled="props.disabled"
-    :required="props.required"
-    :rules="props.rules"
-    :z-index="props.zIndex"
-    :type="$props.type"
-    :model-value="modelValue"
-    :label="props.label"
-    :columns="comEnums"
-    @confirm="confirm"
-  />
-</template>
+<script lang="ts" setup>
+import { computed, defineEmits, defineProps, onMounted, ref } from 'vue'
+import { useEnums } from '../../composables/useEnumes'
+import type { Config } from '../../type'
+import { pageConfig } from '../../api/page'
+
+defineOptions({
+  name: 'WuiEnumeSelectControl',
+})
+
+const props = defineProps<{
+  sourceId: string
+  id: string
+  label?: string
+  title?: string
+  modelValue: string
+  placeholder?: string
+  disabled?: boolean
+  required?: boolean
+  rules?: any
+  zIndex?: number
+  type: 'checkbox' | 'radio'
+  labelWidth?: string
+}>()
+const emits = defineEmits(['update:modelValue'])
+
+const config = ref<Config>()
+const { enumColumn, getEnums } = useEnums({ config })
+async function getPageConfig() {
+  try {
+    const res = await pageConfig(props.sourceId)
+
+    if (res.ltmplConfig) {
+      config.value = res.ltmplConfig
+      getEnums()
+    }
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const comEnums = computed(() => {
+  const mstrucId = config.value?.criteria?.find(item => item.sourceId === props.id)?.mstrucId
+
+  if (mstrucId) {
+    return enumColumn.value[mstrucId]?.map(item => {
+      return {
+        id: item.id,
+        label: item.title,
+        value: `${item.id}-R-${item.value}`,
+      }
+    })
+  }
+
+  return []
+})
+
+onMounted(() => {
+  getPageConfig()
+})
+
+function confirm(event: any) {
+  emits('update:modelValue', event.value)
+}
+</script>
+
+<script lang="ts">
+export default {
+  options: {
+    virtualHost: true,
+    addGlobalClass: true,
+    styleIsolation: 'shared',
+  },
+}
+</script>
+
+<template>
+  <wd-select-picker
+    :label-width="props.labelWidth"
+    :title="props.title"
+    :placeholder="props.placeholder"
+    :disabled="props.disabled"
+    :required="props.required"
+    :rules="props.rules"
+    :z-index="props.zIndex"
+    :type="$props.type"
+    :model-value="modelValue"
+    :label="props.label"
+    :columns="comEnums"
+    @confirm="confirm"
+  />
+</template>