wui-components-v2 1.1.69 → 1.1.71

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/select-col-picker/select-col-picker.vue

@@ -1,168 +1,168 @@
-<script setup lang="ts">
-import { computed, defineEmits, defineOptions, defineProps, reactive, ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { treeConfigApi, treeDataApi, treeNodeDataApi } from '../../api/tree'
-import { pageConfig } from '../../api/page'
-
-defineOptions({
-  name: 'SelectColPicker',
-})
-const props = defineProps<Props>()
-
-const emits = defineEmits<{
-  (e: 'update:modelValue', value: string[]): void
-}>()
-
-// 定义 props 类型
-interface Props {
-  sourceId: string
-  label?: string
-  labelWidth: string
-  prop: string
-  readonly: boolean
-  clearable: boolean
-  placeholder: string
-  modelValue: Array<string>
-}
-
-const dataValue = computed(() => {
-  return props.modelValue
-})
-const sourceId = ref('')
-const columns = ref<any[]>([])
-const treeConfigs = reactive({
-  branchRatmplId: '',
-  branchTitle: '',
-  id: '',
-  rootGtmplId: '',
-  primaryColumnId1: '',
-  primaryColumnId2: '',
-  leafRatmplId: '',
-})
-
-// 获取配置1
-async function treeConfig1() {
-  try {
-    const res = await treeConfigApi(sourceId.value)
-    console.log(res)
-    treeConfigs.branchRatmplId = res.ttmplConfig.branchRatmplId
-    treeConfigs.branchTitle = res.ttmplConfig.branchTitle
-    treeConfigs.id = res.ttmplConfig.id
-    treeConfigs.rootGtmplId = res.ttmplConfig.rootGtmplId
-    treeConfigs.leafRatmplId = res.ttmplConfig.leafRatmplId
-    treeConfig2(treeConfigs.branchRatmplId, treeConfigs.leafRatmplId)
-  }
-  catch (error) {
-    console.log('error:', error)
-    // TODO handle the exception
-  }
-}
-
-onLoad((option: any) => {
-  sourceId.value = props.sourceId || option.sourceId
-  treeConfig1()
-})
-
-// 获取配置2
-async function treeConfig2(branchRatmplId: string, leafRatmplId: string) {
-  try {
-    const res1 = await pageConfig(branchRatmplId)
-    const res2 = await pageConfig(leafRatmplId)
-    treeConfigs.primaryColumnId1 = res1.ltmplConfig.primaryColumn.sourceId
-    treeConfigs.primaryColumnId2 = res2.ltmplConfig.primaryColumn.sourceId
-    getTreeData()
-  }
-  catch (error) {
-    console.log('error:', error)
-    // TODO handle the exception
-  }
-}
-
-// 获取数据
-async function getTreeData() {
-  try {
-    const res = await treeDataApi(treeConfigs.id)
-    console.log('res.entities:', res)
-    columns.value = [res.entities.map((item: any) => {
-      return {
-        value: item.code,
-        label: item.fieldMap[treeConfigs.primaryColumnId1],
-      }
-    })]
-  }
-  catch (error) {
-    console.log('error:', error)
-    // TODO handle the exception
-  }
-}
-
-async function columnChange({ selectedItem, resolve, finish }: any) {
-  try {
-    const res2 = treeNodeDataApi(treeConfigs.leafRatmplId, selectedItem.value)
-    const res1 = treeNodeDataApi(treeConfigs.branchRatmplId, selectedItem.value)
-    const res3 = await Promise.all([res1, res2])
-    console.log('res3:', res3)
-    if (res3[0].entities.length || res3[1].entities.length) {
-      resolve(
-        [
-          ...res3[0].entities.map((item: any) => {
-            return {
-              value: item.code,
-              label: item.fieldMap[treeConfigs.primaryColumnId1],
-            }
-          }),
-          ...res3[1].entities.map((item: any) => {
-            return {
-              value: item.code,
-              label: item.fieldMap[treeConfigs.primaryColumnId2],
-            }
-          }),
-        ],
-      )
-    }
-    else {
-      finish()
-    }
-  }
-  catch (error) {
-    console.log('error:', error)
-    finish(false)
-    // TODO handle the exception
-  }
-}
-
-function handleConfirm(selectedItems: any) {
-  console.log(selectedItems)
-  emits('update:modelValue', [selectedItems[selectedItems.length - 1]])
-}
-// 格式化方法
-function displayFormat(selectedItems: Record<string, any>[]) {
-  return selectedItems[selectedItems.length - 1]?.label
-}
-</script>
-
-<template>
-  <view>
-    <wd-col-picker
-      :use-default-slot="true"
-      :model-value="dataValue"
-      :columns="columns"
-      :column-change="columnChange"
-      :display-format="displayFormat"
-      :style="{ pointerEvents: props.readonly ? '' : 'none' }"
-      @confirm="handleConfirm"
-    >
-      <wd-input
-
-        type="text"
-        model-value=""
-        :prop="props.prop"
-        :placeholder="props.placeholder"
-        :label-width="props.labelWidth"
-        :label="props.label"
-        :readonly="true"
-        :clearable="false"
-      />
-    </wd-col-picker>
-  </view>
-</template>
+<script setup lang="ts">
+import { computed, defineEmits, defineOptions, defineProps, reactive, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { treeConfigApi, treeDataApi, treeNodeDataApi } from '../../api/tree'
+import { pageConfig } from '../../api/page'
+
+defineOptions({
+  name: 'SelectColPicker',
+})
+const props = defineProps<Props>()
+
+const emits = defineEmits<{
+  (e: 'update:modelValue', value: string[]): void
+}>()
+
+// 定义 props 类型
+interface Props {
+  sourceId: string
+  label?: string
+  labelWidth: string
+  prop: string
+  readonly: boolean
+  clearable: boolean
+  placeholder: string
+  modelValue: Array<string>
+}
+
+const dataValue = computed(() => {
+  return props.modelValue
+})
+const sourceId = ref('')
+const columns = ref<any[]>([])
+const treeConfigs = reactive({
+  branchRatmplId: '',
+  branchTitle: '',
+  id: '',
+  rootGtmplId: '',
+  primaryColumnId1: '',
+  primaryColumnId2: '',
+  leafRatmplId: '',
+})
+
+// 获取配置1
+async function treeConfig1() {
+  try {
+    const res = await treeConfigApi(sourceId.value)
+    console.log(res)
+    treeConfigs.branchRatmplId = res.ttmplConfig.branchRatmplId
+    treeConfigs.branchTitle = res.ttmplConfig.branchTitle
+    treeConfigs.id = res.ttmplConfig.id
+    treeConfigs.rootGtmplId = res.ttmplConfig.rootGtmplId
+    treeConfigs.leafRatmplId = res.ttmplConfig.leafRatmplId
+    treeConfig2(treeConfigs.branchRatmplId, treeConfigs.leafRatmplId)
+  }
+  catch (error) {
+    console.log('error:', error)
+    // TODO handle the exception
+  }
+}
+
+onLoad((option: any) => {
+  sourceId.value = props.sourceId || option.sourceId
+  treeConfig1()
+})
+
+// 获取配置2
+async function treeConfig2(branchRatmplId: string, leafRatmplId: string) {
+  try {
+    const res1 = await pageConfig(branchRatmplId)
+    const res2 = await pageConfig(leafRatmplId)
+    treeConfigs.primaryColumnId1 = res1.ltmplConfig.primaryColumn.sourceId
+    treeConfigs.primaryColumnId2 = res2.ltmplConfig.primaryColumn.sourceId
+    getTreeData()
+  }
+  catch (error) {
+    console.log('error:', error)
+    // TODO handle the exception
+  }
+}
+
+// 获取数据
+async function getTreeData() {
+  try {
+    const res = await treeDataApi(treeConfigs.id)
+    console.log('res.entities:', res)
+    columns.value = [res.entities.map((item: any) => {
+      return {
+        value: item.code,
+        label: item.fieldMap[treeConfigs.primaryColumnId1],
+      }
+    })]
+  }
+  catch (error) {
+    console.log('error:', error)
+    // TODO handle the exception
+  }
+}
+
+async function columnChange({ selectedItem, resolve, finish }: any) {
+  try {
+    const res2 = treeNodeDataApi(treeConfigs.leafRatmplId, selectedItem.value)
+    const res1 = treeNodeDataApi(treeConfigs.branchRatmplId, selectedItem.value)
+    const res3 = await Promise.all([res1, res2])
+    console.log('res3:', res3)
+    if (res3[0].entities.length || res3[1].entities.length) {
+      resolve(
+        [
+          ...res3[0].entities.map((item: any) => {
+            return {
+              value: item.code,
+              label: item.fieldMap[treeConfigs.primaryColumnId1],
+            }
+          }),
+          ...res3[1].entities.map((item: any) => {
+            return {
+              value: item.code,
+              label: item.fieldMap[treeConfigs.primaryColumnId2],
+            }
+          }),
+        ],
+      )
+    }
+    else {
+      finish()
+    }
+  }
+  catch (error) {
+    console.log('error:', error)
+    finish(false)
+    // TODO handle the exception
+  }
+}
+
+function handleConfirm(selectedItems: any) {
+  console.log(selectedItems)
+  emits('update:modelValue', [selectedItems[selectedItems.length - 1]])
+}
+// 格式化方法
+function displayFormat(selectedItems: Record<string, any>[]) {
+  return selectedItems[selectedItems.length - 1]?.label
+}
+</script>
+
+<template>
+  <view>
+    <wd-col-picker
+      :use-default-slot="true"
+      :model-value="dataValue"
+      :columns="columns"
+      :column-change="columnChange"
+      :display-format="displayFormat"
+      :style="{ pointerEvents: props.readonly ? '' : 'none' }"
+      @confirm="handleConfirm"
+    >
+      <wd-input
+
+        type="text"
+        model-value=""
+        :prop="props.prop"
+        :placeholder="props.placeholder"
+        :label-width="props.labelWidth"
+        :label="props.label"
+        :readonly="true"
+        :clearable="false"
+      />
+    </wd-col-picker>
+  </view>
+</template>