resolver-egretimp-plus 0.0.278 → 0.0.280

package/package.json

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

package/src/components/packages-web/CustomComponentTable.jsx

@@ -91,9 +91,13 @@ export default {
         return normalColumnConfig(config)
       })
     })
+    let pageSize = 5
+    if (props.config?.pageSize) {
+      pageSize = parseInt(props.config.pageSize) || 5
+    }
     const page = reactive({
       pageNum: 1,
-      pageSize: 5,
+      pageSize,
       total: 0,
     })
     const isFrontPage = computed(() => {

package/src/components/packages-web/ElSelect.jsx

@@ -135,21 +135,27 @@ export default {
       modelValue.value = ''
     }
 
+    const getRenderSlots = function () {
+      return {
+        ...slots,
+        default: () => options.value?.map(option => {
+          return (
+            <ElOption
+              key={option.columnValue}
+              label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}
+              value={option.columnValue}
+              disabled={option.columnStatus == '0' || option.columnStatus == '2'}
+            />
+          )
+        })
+      }
+    }
+
     return () => {
       return (
         <ElSelect class="custom-self-select" { ...{...attrs, ...selectProps.value }} v-model={value.value} onClear={clear}>
           {
-            {
-              default: () => options.value?.map(option => (
-                <ElOption
-                  key={option.columnValue}
-                  label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}
-                  value={option.columnValue}
-                  disabled={option.columnStatus == '0' || option.columnStatus == '2'}
-                />
-              )),
-              ...slots
-            }
+            getRenderSlots()
           }
         </ElSelect>
       )

package/src/components/packages-web/ElSelect_bak.vue

@@ -0,0 +1,155 @@
+<template>
+  <ElSelect class="custom-self-select" v-bind="{...attrs, ...selectProps }" v-model="value" @clear="clear">
+    <ElOption v-for="option in options"
+      :key="option.columnValue"
+      :label="lang.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc"
+      :value="option.columnValue"
+      :disabled="option.columnStatus == '0' || option.columnStatus == '2'"
+    >
+      <template v-for="(_, key) in optionsSlots" :key="key" v-slot:[key]="scope">
+        <slot :name="key" v-bind="scope"></slot>
+      </template>
+    </ElOption>
+    <template v-for="(_, key) in slots" :key="key" v-slot:[key]="scope">
+      <slot :name="key" v-bind="scope"></slot>
+    </template>
+  </ElSelect>
+</template>
+<script setup>
+import { ElSelect, ElOption } from 'element-plus'
+import { computed, defineProps, inject, useAttrs, useSlots } from 'vue'
+import { commonPropsType, getComponentSolt } from '../../utils/index.js'
+
+const VALUE_TYPES = {
+  LIST: 'list',
+  OBJECT: 'object',
+  STRING: 'string',
+}
+const slots = useSlots()
+const optionsSlots = computed(() => {
+  return getComponentSolt({
+    config: props.config,
+    slotKey: 'optionsSlots'
+  }) || {}
+})
+const modelValue = defineModel()
+const props = defineProps({
+  ...ElSelect.props,
+  ...commonPropsType,
+  multiple: [String, Boolean],
+  filterable: [String, Boolean],
+  multipleLimit: [String, Number],
+  rangeOptions: Array,
+  excludeOptions: Array,
+  // 多选的分割符号
+  separator: {
+    type: [String],
+    default: ','
+  }
+})
+const attrs = useAttrs()
+const separator = computed(() => {
+  return props.separator
+})
+const valueTypes = computed(() => {
+  return props.config?.valueType
+})
+// 值是list 还是,连起来的string
+const isStrVal = computed(() => {
+  // valueType 值为 list 或者 string
+  return valueTypes.value !== VALUE_TYPES.LIST && valueTypes.value !== VALUE_TYPES.OBJECT
+})
+const isObject = computed(() => {
+  return valueTypes.value === VALUE_TYPES.OBJECT
+})
+
+// 是否为多选
+const isMutiple = computed(() => {
+  return props.multiple == '1'
+})
+
+const options = computed(() => {
+  let list = props.options
+  if (props.rangeOptions && props.rangeOptions.length) {
+    list = list?.filter?.(item => props.rangeOptions?.some(subValue => subValue == item.columnValue))
+  }
+  if (props.excludeOptions && props.excludeOptions.length) {
+    list = list?.filter?.(item => !(props.excludeOptions?.some(subValue => subValue == item.columnValue)))
+  }
+  return list
+})
+
+const value = computed({
+  get() {
+    if (isMutiple.value) {
+      const val = modelValue.value || ''
+      return val ? 
+        (
+          isStrVal.value ?
+            val.split(separator.value) :
+            (
+              isObject.value ?
+                Object.values(val || {}) :
+                val
+            )
+        ) :
+        []
+    } else {
+      if (modelValue.value !== null && modelValue.value !== undefined) {
+        if (options.value?.some(item => item.columnValue == modelValue.value)) {
+          props.config.isMatch = true
+          return `${modelValue.value}`
+        } else {
+          props.config.isMatch = false
+          return ''
+        }
+      } else {
+        return ''
+      }
+    }
+  },
+  set(val) {
+    if (isMutiple.value) {
+      modelValue.value = isStrVal.value ? 
+        val.join(separator.value) :
+        (
+          isObject.value ?
+            val?.reduce((ret, item, idx) => {ret[idx] = item; return ret;}, {}) :
+            val
+        )
+    } else {
+      modelValue.value = val
+    }
+  }
+})
+
+const selectProps = computed(() => {
+  const attrs = Object.keys(ElSelect.props).reduce((ret, key) => {
+    ret[key] = props[key]
+    return ret
+  }, {})
+  if (attrs.placeholder === null || attrs.placeholder === undefined) {
+    attrs.placeholder = ''
+  }
+  if (typeof attrs.filterable === 'string') {
+    attrs.filterable = attrs.filterable == '1'
+  }
+  if (typeof attrs.multiple === 'string') {
+    attrs.multiple = attrs.multiple == '1'
+  }
+  if (!attrs['suffix-icon'] && !attrs.suffixIcon) {
+    delete attrs.suffixIcon
+    delete attrs['suffix-icon']
+  }
+  attrs.multipleLimit = Number(parseInt(attrs.multipleLimit || 0))
+  return attrs
+})
+const lang = inject('lang')
+const clear = () => {
+  modelValue.value = ''
+}
+</script>
+<style lang="scss">
+.custom-self-select {
+}
+</style>