resolver-egretimp-plus 0.1.68 → 0.1.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/components/packages-H5/CmiPicker.vue

@@ -2,6 +2,7 @@
 import { computed, defineProps, inject, ref, useAttrs, watch } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 
+const filterKey = ref('')
 const pickerRef = ref(null)
 const selects = inject('selects')
 const rootForm = inject('rootForm')
@@ -36,28 +37,43 @@ const formatValue = computed({
   }
 })
 
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.multiple == '1'
+})
+// 是否开启过滤, todo == 暂时不支持多列
+const isFilter = computed(() => {
+  return props.filterable == '1'
+})
 const calcProps = computed(() => {
   const ret = {
     type: props?.config?.displayType,
     title: lang.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     canceltext: props?.config?.canceltext,
     confirmtext: props?.config?.confirmtext,
-    bottomhidden: props?.config?.bottomhidden == '1',
     forbidmaskclick: props?.config?.forbidmaskclick == '1',
-    fastpick: props?.config?.fastpick == '1',
+    fastpick: isFilter.value ? true : (props?.config?.fastpick == '1'),
+    bottomhidden: props?.config?.bottomhidden == '1',
   }
   return ret
 })
-const getColumns = () => {
+const getColumns = (filterKey) => {
   const selectKeyArr = props.config?.selectKey?.split?.(',') || []
   return selectKeyArr.map((key, idx) => {
-    let index = selects?.value?.[key]?.findIndex(option => option?.columnValue === formatValue.value[idx])
+    const values = selects?.value?.[key]?.map(option => ({
+      label: lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc,
+      value: option.columnValue
+    }))?.filter(item => {
+      if (filterKey) {
+        return item.label?.includes(filterKey)
+      } else {
+        return true
+      }
+    }) || []
+    let index = values.findIndex(option => option?.value === formatValue.value[idx])
     return {
-      defaultIndex: index > -1 ? index : 0,
-      values: selects?.value?.[key]?.map(option => ({
-        label: lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc,
-        value: option.columnValue
-      }))
+      defaultIndex: index > -1 ? index : (isFilter.value ? -1 : 0),
+      values,
     }
   })
 }
@@ -113,12 +129,25 @@ const inputProps = computed(() => {
   }
 })
 
+watch(filterKey, (val) => {
+  pickerRef.value?.setColumns?.(getColumns(val))
+})
+watch(open, (val) => {
+  if (!val) {
+    filterKey.value = ''
+  }
+}, {
+  immediate: true
+})
+function filterChange(e) {
+  filterKey.value = e.detail.value
+}
 </script>
 
 <template>
   <cmi-input :value="modelvalDesc" suffixIcon @focus="onFocus" v-bind="{...attrs, ...inputProps}" >
-    <div slot="suffix" v-if="suffixIcon">
-      <component :is="`cmi-icon-${suffixIcon}`" color="#4E5969"></component>
+    <div slot="suffix" v-if="suffixIcon" class="suffix-wrap">
+      <component @click="() => { ('arrow-down' == suffixIcon) && onFocus();}" :is="`cmi-icon-${suffixIcon}`" color="#4E5969"></component>
     </div>
     <span slot="prefix" v-if="prefixIcon">
       <component :is="`cmi-icon-${prefixIcon}`" color="#4E5969"></component>
@@ -130,5 +159,30 @@ const inputProps = computed(() => {
     :open="open"
     @close="onClose"
     @confirm="onConfirm"
-  />
+  >
+    <div v-if="isFilter" slot="header" class="filter-header-wrap">
+      <span class="filte-title">{{ calcProps.title }}</span>
+      <cmi-input class="filter-input" @change="filterChange" :value="filterKey"></cmi-input>
+    </div>
+  </cmi-picker>
 </template>
+<style lang="scss" scoped>
+.suffix-wrap {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 16px;
+}
+.filter-header-wrap {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .filte-title {
+    max-width: 50%;
+  }
+  .filter-input {
+    max-width: 50%;
+  }
+}
+</style>

package/src/utils/defaultVal.js

@@ -58,7 +58,7 @@ export function formatSelectVal({
   if (!isHidden({config}) || isActive) {
     const valueType = config?.valueType
     const separator = config?.separator
-    if (valueType == VALUE_TYPES.STRING) {
+    if (valueType !== VALUE_TYPES.LIST && valueType !== VALUE_TYPES.OBJECT) {
       if (isPlainObject(val) || isArray(val)) {
         try {
           retValue = Object.values(val).join(separator)