resolver-egretimp-plus 0.1.85 → 0.1.88

package/package.json

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

package/src/bpm/bpmInstance.js

@@ -38,7 +38,12 @@ export let bpmInstance = null
 
 export class Bpm {
   params = {}
-  bpmConfigs = {}
+  bpmConfigs = {
+    // getDetailReq, // 保存成功之后获取详情传递的数据
+    // customValidate, // 提交的时候需要的 额外的校验
+    // saveValidate, // 保存 时候的校验
+    // saveAfter // 保存成功之后的回调
+  }
   eventData = null
   postOptions =  null
   sdkInstance = null
@@ -141,6 +146,7 @@ export class Bpm {
     console.log('submitType==:', submitType)
     console.log('actionType==:', actionType)
     if (MESSAGE_TYPE.GET_FORM_DATA === messageType) {
+      // 如果有传入这个类型操作，就用传递进来的这个操作
       let action = this.actions?.[submitType]?.formAction
       if (!action) {
         action = this.getDefaultAction(eventData)
@@ -168,6 +174,7 @@ export class Bpm {
       let closeFlag = true
       closeFlag = ![SUBMIT_TYPE.PROCESS_SHOW, SUBMIT_TYPE.BACK, SUBMIT_TYPE.DRAFT_HANDLE].includes(submitType)
       
+      // 如果有传入这个类型操作，就用传递进来的这个操作
       let action = this.actions?.[submitType]?.successAction
       if (!action) {
         action = this.getDefaultAction(eventData)

package/src/components/options/OptionsDefault.vue

@@ -0,0 +1,47 @@
+<script setup>
+const props = defineProps({
+  label: {
+    type: String,
+    default: ''
+  }
+})
+</script>
+<template>
+  <div class="option-item">
+    <slot>
+      {{ label }}
+    </slot>
+    <div class="multi-checkbox box-checked">
+      <el-checkbox :checked="true"></el-checkbox>
+      <div class="check-mask"></div>
+    </div>
+    <div class="multi-checkbox box-not-checked">
+      <el-checkbox :checked="false"></el-checkbox>
+      <div class="check-mask"></div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.option-item {
+  .multi-checkbox {
+    position: absolute;
+    top: 50%;
+    right: 4px;
+    transform: translateY(-50%);
+    height: 32px;
+    .check-mask {
+      position: absolute;
+      left: 0;
+      right: 0;
+      top: 0;
+      bottom: 0;
+      z-index: 1;
+    }
+  }
+  .box-checked, .box-not-checked {
+    display: none;
+    margin-right: 0;
+  }
+}
+</style>

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

@@ -1,14 +1,16 @@
-import { ElSelect, ElOption } from 'element-plus'
+import { ElSelect, ElOption, ElSelectV2 } from 'element-plus'
 import { computed, inject, onMounted, watch} from 'vue'
 import { commonPropsType, hasOwn, isArray, isNumber, isPlainObject, isString, VALUE_TYPES } from '../../utils/index.js'
+import OptionsDefault from '../options/optionsDefault.vue'
 
 export default {
   inheritAttrs: false,
   props: {
+    ...ElSelectV2.props,
     ...ElSelect.props,
     ...commonPropsType,
-    multiple: [String, Boolean],
-    filterable: [String, Boolean],
+    multiple: [String, Boolean, Number],
+    filterable: [String, Boolean, Number],
     multipleLimit: [String, Number],
     rangeOptions: Array,
     excludeOptions: Array,
@@ -16,6 +18,10 @@ export default {
     separator: {
       type: [String],
       default: ','
+    },
+    virtualized: {
+      type: [String, Boolean, Number],
+      default: ''
     }
   },
   emits: ['update:modelValue'],
@@ -67,6 +73,9 @@ export default {
 
     // 是否为多选
     const isMutiple = computed(() => {
+      if (typeof props.multiple === 'boolean') {
+        return props.multiple
+      }
       return props.multiple == '1'
     })
 
@@ -81,6 +90,17 @@ export default {
       return list
     })
 
+    const isVirtualized = computed(() => {
+      if (typeof props.virtualized === 'boolean') {
+        return props.virtualized
+      }
+      return props.virtualized == '1'
+    })
+
+    const currentComp = computed(() => {
+      return isVirtualized.value ? ElSelectV2 : ElSelect
+    })
+
     const value = computed({
       get() {
         if (isMutiple.value) {
@@ -130,14 +150,20 @@ export default {
     })
 
     const selectProps = computed(() => {
-      const attrs = Object.keys(ElSelect.props).reduce((ret, key) => {
+      // let props = ElSelect.props
+      // if (isVirtualized.value) {
+      //   props = ElSelectV2.props
+      // }
+      // 不同通过上面注释代码进行赋值，可能是ElSelectV2.props、ElSelect.props不能复制给其他的
+
+      const attrs = Object.keys(isVirtualized.value ? ElSelectV2.props : 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') {
+      if (typeof attrs.filterable !== 'boolean') {
         attrs.filterable = attrs.filterable == '1'
       }
       if (typeof attrs.multiple === 'string') {
@@ -148,13 +174,23 @@ export default {
         delete attrs['suffix-icon']
       }
       attrs.multipleLimit = Number(parseInt(attrs.multipleLimit || 0))
+      if (isVirtualized.value) {
+        // 返回虚拟select需要的options
+        attrs.options = options.value?.map(option => {
+          return {
+            ...option,
+            value: option.columnValue,
+            label: lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc,
+            disabled: option.columnStatus == '0' || option.columnStatus == '2'
+          }
+        })
+      }
       return attrs
     })
     const lang = inject('lang')
     const clear = () => {
       modelValue.value = ''
     }
-
     const getRenderSlots = function () {
       const optionsSlotKeys = {
         optionDefault: 'default'
@@ -168,9 +204,20 @@ export default {
           selectSlots[key] = slots[key]
         }
       })
-      return {
-        ...selectSlots,
-        default: () => options.value?.map(option => {
+
+      if (isVirtualized.value) {
+        const originDef = selectSlots.default
+        selectSlots.default = ({ item: option }) => {
+          return (
+            <OptionsDefault label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}>
+              {
+                originDef?.(option)
+              }
+            </OptionsDefault>
+          )
+        }
+      } else {
+        selectSlots.default = () => options.value?.map(option => {
           return (
             <ElOption
               key={option.columnValue}
@@ -178,21 +225,24 @@ export default {
               value={option.columnValue}
               disabled={option.columnStatus == '0' || option.columnStatus == '2'}
             >
-              {
-                optionsSlots?.default?.(option)
-              }
+              <OptionsDefault label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}>
+                {
+                  optionsSlots?.default?.(option)
+                }
+              </OptionsDefault>
             </ElOption>
           )
         })
       }
+      return selectSlots
     }
     return () => {
       return (
-        <ElSelect class="custom-self-select" { ...{...attrs, ...selectProps.value }} v-model={value.value} onClear={clear}>
+        <currentComp.value class="custom-self-select" { ...{...attrs, ...selectProps.value }} v-model={value.value} onClear={clear}>
           {
             getRenderSlots()
           }
-        </ElSelect>
+        </currentComp.value>
       )
     }
   }

package/src/index.jsx

@@ -157,20 +157,33 @@ export default {
       default: false
     },
     bpmMessage: {
+      // 传递给致远的参数
       type: [Object, Function],
       default: {}
     },
     bpmSubmitBtn: {
+      // 配置了保存服务的按钮；例如 a->b->c
       type: [String],
       default: ''
     },
     bpmActions: {
       type: [Object],
-      default: {}
+      default: {
+        // [SUBMIT_TYPE.SEND]: {
+        //   formAction, // 提交为GET_FORM_DATA 时候的 动作
+        //   postMessageData, // 传递的参数
+        //   successAction // 提交为PROCESS_ACTION_SUCCESS 时候的 动作
+        // }
+      }
     },
     bpmConfigs: {
       type: Object,
-      default: {}
+      default: {
+        // getDetailReq, // 保存成功之后获取详情传递的数据
+        // customValidate, // 提交的时候需要的 额外的校验
+        // saveValidate, // 保存 时候的校验
+        // saveAfter // 保存成功之后的回调
+      }
     },
     bpmBtns: {
       type: Array,

package/src/theme/element/components/collapse.scss

@@ -127,6 +127,19 @@
   margin-bottom: 16px;
 }
 
+.CustomComponentCollapse.is-card:has(+ .CustomComponentCard.is-card) {
+  margin-bottom: 16px;
+}
+
+.CustomComponentCard.is-card:has(+ .CustomComponentCollapse.is-card) {
+  margin-bottom: 16px;
+}
+
+
+.CustomComponentCard.is-card:has(+ .CustomComponentCard.is-card) {
+  margin-bottom: 16px;
+}
+
 // 加权
 .CustomComponentCollapse.CustomComponentCollapse.CustomComponentCollapse:last-child {
   margin-bottom: 0;

package/src/theme/element/components/select.scss

@@ -1,6 +1,6 @@
 
 // select样式调整
-.el-select__icon {
+.el-select__icon, .el-input__icon {
   color: #646A73;
   font-size: 18px;
 }
@@ -10,6 +10,65 @@
     margin-left: 0;
   }
 }
+.el-select-dropdown {
+  .el-select-dropdown__item.is-selected::after {
+    content: "";
+    position: absolute;
+    top: 50%;
+    right: 4px;
+    border-top: none;
+    border-right: none;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-color: var(--el-color-primary);
+    mask: url("data:image/svg+xml;utf8,%3Csvg class='icon' width='200' height='200' viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='currentColor' d='M406.656 706.944L195.84 496.256a32 32 0 10-45.248 45.248l256 256 512-512a32 32 0 00-45.248-45.248L406.592 706.944z'%3E%3C/path%3E%3C/svg%3E") no-repeat;
+    mask-size: 100% 100%;
+    transform: translateY(-50%);
+    width: 16px;
+    height: 16px;
+  }
+  &.is-multiple {
+    .el-select-dropdown__item.is-selected::after {
+      display: none;
+    }
+    .el-select-dropdown__item {
+      .box-not-checked {
+        display: block;
+      }
+      .box-checked {
+        display: none;
+      }
+      &.is-selected {
+        .box-checked {
+          display: block;
+        }
+        .box-not-checked {
+          display: none;
+        }
+      }
+    }
+  }
+  .el-select-dropdown__list {
+    padding: 6px 4px;
+    & > div {
+      position: relative;
+    }
+    .el-select-dropdown__item {
+      border-radius: 4px;
+      padding: 0 32px 0 4px;
+      height: 32px;
+      line-height: 32px;
+      &:hover {
+        background: #EFF0F1;
+      }
+      &:active {
+        background: #DEE0E3;
+      }
+    }
+  }
+}
+  
+
 
 /* 覆盖下拉选中文字的样式 */
 .el-select-dropdown__item.is-selected {

package/src/theme/element/components/tabs.scss

@@ -22,7 +22,6 @@
 
 .el-tabs {
   --el-text-color-primary: #1F2329;
-  
   // display: block;
   border-radius: 4px;
   overflow: hidden;
@@ -30,10 +29,19 @@
     padding: var(--prmary-marign-second) var(--prmary-marign) var(--prmary-marign) var(--prmary-marign);
   }
 }
+.el-tabs__active-bar {
+  bottom: 1px;
+  height: 3px;
+  border-radius: 2px;
+}
 .el-tabs__item {
   padding: 0 16px;
   min-height: var(--el-tabs-header-height);
   height: unset;
+  font-weight: 400;
+  &.is-active {
+    font-weight: 500;
+  }
 }
 .el-tabs__header {
   margin: 0 0 16px;

package/src/utils/defaultVal.js

@@ -13,26 +13,30 @@ export default function defaultVal(config) {
     let defaultVal = null
     try {
       if (typeof configDefaultVal === 'string') {
+        const trimValue = configDefaultVal.trim()
         let routeMatchs = null
-        if ( typeof configDefaultVal === 'string' && (routeMatchs = configDefaultVal.match(/^_route:(.*)$/))) {
+        if (routeMatchs = trimValue.match(/^_route:(.*)$/)) {
           const queryKey = routeMatchs[1]
           const routeQuery = config?.route?.query
           defaultVal = routeQuery?.[queryKey]
-        } else if ( typeof configDefaultVal === 'string' && (/^_lang$/.test(configDefaultVal))) {
+        } else if (routeMatchs = trimValue.match(/^_native:(.*)$/)) {
+          const val = routeMatchs[1]
+          defaultVal = val
+        } else if (/^_lang$/.test(trimValue)) {
           defaultVal = config?._lang
-        } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
-          defaultVal = JSON.parse(configDefaultVal)
+        } else if (/^{[\w\W]*}$/.test(trimValue) || /^\[[\w\W]*\]$/.test(trimValue)) {
+          defaultVal = JSON.parse(trimValue)
         } else {
-          if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate' || configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
-            if (configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
+          if (trimValue === ARG_FLAGS.CURRENT_DATE || trimValue === 'currentDate' || trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
+            if (trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
             } else {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
             }
-          } else if (['true', 'false'].includes(configDefaultVal)) {
-            defaultVal = configDefaultVal == 'true' ? true : false
+          } else if (['true', 'false'].includes(trimValue)) {
+            defaultVal = trimValue == 'true' ? true : false
           } else {
-            defaultVal = configDefaultVal
+            defaultVal = trimValue
           }
         }
       } else {