resolver-egretimp-plus 0.1.37 → 0.1.39

package/package.json

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

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

@@ -38,7 +38,7 @@ const props = defineProps({
   ...commonPropsType,
   showSegment: {
     type: String,
-    default: '1'
+    default: '0'
   }
 })
 // debugger
@@ -46,6 +46,14 @@ const props = defineProps({
 const attrs = useAttrs()
 
 const lang = inject('lang')
+const activeNames = computed({
+  get() {
+    return props.config.defaultOpenFlag == '1' ? [props.config.metaCode] : []
+  },
+  set(val) {
+    props.config.defaultOpenFlag = val.length > 0 ? '1' : '0'
+  }
+})
 
 const collapseProps = computed(() => {
   return Object.keys(ElCollapse.props).reduce((ret, key) => {
@@ -82,7 +90,7 @@ const collapseItemClass = computed(() => {
   return {
     'no-collpase': noCollpase.value,
     'hidden-head': hiddenHead.value,
-    'show-segment': showSegment.value
+    'show-segment': showSegment.value && (activeNames.value?.length > 0)
   }
 })
 
@@ -122,14 +130,6 @@ const componentProps = computed(() => {
     shadow: 'never'
   } : {}
 })
-const activeNames = computed({
-  get() {
-    return props.config.defaultOpenFlag == '1' ? [props.config.metaCode] : []
-  },
-  set(val) {
-    props.config.defaultOpenFlag = val.length > 0 ? '1' : '0'
-  }
-})
 
 </script>
 <style lang="scss" scoped>

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

@@ -53,7 +53,10 @@ const value = computed({
     if (isNaN(Number(modeValue.value))) {
       return modeValue.value
     } else {
-      return Number(modeValue.value)
+      if (datePickerProps.valueFormat === 'timestamp') {
+        return Number(modeValue.value)
+      }
+      return modeValue.value
     }
   },
   set(val) {

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

@@ -152,8 +152,20 @@ export default {
     }
 
     const getRenderSlots = function () {
+      const optionsSlotKeys = {
+        optionDefault: 'default'
+      }
+      const optionsSlots = {}
+      const selectSlots = {}
+      Object.keys(slots).forEach(key => {
+        if (Object.keys(optionsSlotKeys).includes(key)) {
+          optionsSlots[optionsSlotKeys[key]] = slots[key]
+        } else {
+          selectSlots[key] = slots[key]
+        }
+      })
       return {
-        ...slots,
+        ...selectSlots,
         default: () => options.value?.map(option => {
           return (
             <ElOption
@@ -161,7 +173,11 @@ export default {
               label={lang?.value?.indexOf('zh') > -1 ? option.columnDesc_zh : option.columnDesc}
               value={option.columnValue}
               disabled={option.columnStatus == '0' || option.columnStatus == '2'}
-            />
+            >
+              {
+                optionsSlots?.default?.(option)
+              }
+            </ElOption>
           )
         })
       }

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

@@ -94,7 +94,7 @@
   }
 
   .show-segment {
-    .el-collapse-item__header {
+    & > .el-collapse-item__header {
       position: relative;
       &::after {
         display: block;
@@ -106,7 +106,7 @@
         bottom: 0px;
       }
     }
-    .el-collapse-item__wrap {
+    & > .el-collapse-item__wrap {
       margin-top: 16px;
     }
   }

package/src/utils/defaultVal.js

@@ -21,9 +21,9 @@ export default function defaultVal(config) {
         } else {
           if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate' || configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
             if (configDefaultVal === ARG_FLAGS.CURRENT_DATE_TIME) {
-              defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
-            } else {
               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