resolver-egretimp-plus 0.1.36 → 0.1.38

package/package.json

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

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

@@ -1,7 +1,7 @@
 <template>
   <component :is="component" class="standard-wrap" v-bind="{...attrs, ...componentProps}">
     <ElCollapse v-bind="{...collapseProps}" :class="collapseClass" v-model="activeNames">
-      <ElCollapseItem v-bind="collapseItemProps" :class="{'no-collpase': noCollpase, 'hidden-head': hiddenHead}">
+      <ElCollapseItem v-bind="collapseItemProps" :class="collapseItemClass">
         <template #title>
           <div class="collapge-slot-title">
             <ElRow align="middle" :class="{'hidden-head-flag': hiddenHeadFlag}">
@@ -36,6 +36,10 @@ const props = defineProps({
   ...ElCollapse.props,
   ...ElCollapseItem.props,
   ...commonPropsType,
+  showSegment: {
+    type: String,
+    default: '0'
+  }
 })
 // debugger
 
@@ -62,6 +66,10 @@ const hiddenHead = computed(() => {
 const hiddenHeadFlag = computed(() => {
   return props?.config?.hiddenHeadFlag == '1'
 })
+// 是否显示头分割线
+const showSegment = computed(() => {
+  return props?.showSegment == '1'
+})
 
 const collapseClass = computed(() => {
   return {
@@ -70,6 +78,14 @@ const collapseClass = computed(() => {
   }
 })
 
+const collapseItemClass = computed(() => {
+  return {
+    'no-collpase': noCollpase.value,
+    'hidden-head': hiddenHead.value,
+    'show-segment': showSegment.value
+  }
+})
+
 const collapseItemProps = computed(() => {
   const propsObj = Object.keys(ElCollapseItem.props).reduce((ret, key) => {
     ret[key] = props[key]

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

@@ -4,7 +4,7 @@ import ElTable, { ElTableColumn } from '../table'
 import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive } from 'vue'
 import { commonPropsType, TABLE_COLUMN_NOT_RENDER_META_TYPE, DISPLAY_SHOW, compareComponet, isPlainObject, hasOwn, cloneDeep, isPromise, isPlainColumn, generateUniqueId, calcDisable, camelize, capitalize, DISPLAY_HIDDEN, definePrivatelyProp } from '../../utils/index.js'
-import '../styles/CustomComponenTable.scss'
+// import '../styles/CustomComponenTable.scss'
 
 export default {
   inheritAttrs: false,

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

@@ -92,6 +92,24 @@
       display: none;
     }
   }
+
+  .show-segment {
+    & > .el-collapse-item__header {
+      position: relative;
+      &::after {
+        display: block;
+        content: '';
+        position: absolute;
+        width: calc(100% + 32px);
+        border-bottom: 1px solid #DEE0E3;
+        left: -16px;
+        bottom: 0px;
+      }
+    }
+    & > .el-collapse-item__wrap {
+      margin-top: 16px;
+    }
+  }
 }
 
 .CustomComponentCollapse:has(+ .CustomComponentCollapse) {

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

@@ -9,3 +9,145 @@
 .el-table .cell {
   padding: 0 16px;
 }
+
+.error-tip-block {
+  & + .el-form-item__error {
+    position: relative;
+  }
+}
+.custom-component-table {
+  --boder-radius: 4px;
+  border-radius: var(--boder-radius);
+  // width: 100%;
+  .el-table, &.el-table {
+    --el-table-header-bg-color: #f5f6f7;
+    --el-table-header-text-color: #646a73;
+  }
+  .el-table--border {
+    border: 1px solid var(--el-table-border-color);
+    border-radius: var(--boder-radius);
+    &::before {
+      width: 0px;
+      // border-left: 1px solid var(--el-table-border-color);
+      // border-radius: var(--boder-radius);
+      // background-color: transparent;
+    }
+    &::after {
+      width: 0px;
+      // border-right: 1px solid var(--el-table-border-color);
+      // border-radius: var(--boder-radius);
+      // background-color: transparent;
+    }
+    .el-table__inner-wrapper {
+      &::before {
+        height: 0px;
+        // border-bottom: 1px solid var(--el-table-border-color);
+        // border-radius: var(--boder-radius);
+        // background-color: transparent;
+      }
+      &::after {
+        height: 0px;
+        // border-top: 1px solid var(--el-table-border-color);
+        // border-radius: var(--boder-radius);
+        // background-color: transparent;
+      }
+      .el-table__border-left-patch {
+        display: none;
+      }
+    }
+    .el-table__cell:last-of-type {
+      border-right: none;
+    }
+    .el-table__body {
+      tbody {
+        tr:last-of-type {
+          .el-table__cell {
+            border-bottom: none;
+          }
+        }
+      }
+    }
+  }
+  .el-table .el-table__cell {
+    padding: 4px 0;
+  }
+  .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+  }
+  thead th {
+    font-weight: 400;
+    height: 40px;
+    .head-span {
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+  }
+  th.el-table__cell.is-leaf {
+    border-bottom: none;
+  }
+  td.el-table__cell {
+    color: var(--el-input-text-color,var(--el-text-color-regular));
+  }
+  .el-table__cell {
+    height: 40px;
+    .el-date-editor, .el-date-editor--date{
+      .el-input__wrapper{
+        padding: 0 8px;
+      }
+    }
+    .el-input {
+      display: flex;
+    }
+    .el-input {
+      --el-input-height: 24px;
+    }
+    .el-form-item__label {
+      height: 24px;
+    }
+    .el-form-item__content {
+      min-height: 24px;
+    }
+    .el-select__wrapper, .el-input__wrapper {
+      box-shadow: none;
+      border-bottom: 1px solid var(--el-border-color);
+      padding: 0;
+      border-radius: 0;
+      background-color: transparent;
+      min-height: 24px;
+      &.is-focused {
+        border-color: var(--el-color-primary);
+      }
+      &.is-focus {
+        border-color: var(--el-color-primary);
+      }
+    }
+    .is-error {
+      .el-select__wrapper, .el-input__wrapper {
+        box-shadow: none;
+        border-bottom: 1px solid var(--el-color-danger);
+      }
+    }
+  }
+  .cell {
+    // line-height: 16px;
+  }
+  .pagination-wrap {
+    display: flex;
+  }
+  .hidden-column {
+    border: none;
+    overflow: hidden;
+    // display: none;
+  }
+  .hidden-column + .el-table__cell {
+    // border: none;
+  }
+  .next-hidden-column.end-show-column {
+    border: none;
+  }
+  .clear-index {
+    z-index: unset;
+  }
+}

package/src/utils/const.js

@@ -7,6 +7,7 @@ export const MODE = {
 }
 export const ARG_FLAGS = {
   CURRENT_DATE: '_currentDate',
+  CURRENT_DATE_TIME: '_currentDateTime',
   REF_VAL: '_refVal'
 }
 export const VALUE_TYPES = {

package/src/utils/defaultVal.js

@@ -19,8 +19,12 @@ export default function defaultVal(config) {
         } else if (/^{[\w\W]*}$/.test(configDefaultVal) || /^\[[\w\W]*\]$/.test(configDefaultVal)) {
           defaultVal = JSON.parse(configDefaultVal)
         } else {
-          if (configDefaultVal === ARG_FLAGS.CURRENT_DATE || configDefaultVal === 'currentDate') {
-            defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
+          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 if (['true', 'false'].includes(configDefaultVal)) {
             defaultVal = configDefaultVal == 'true' ? true : false
           } else {