resolver-egretimp-plus 0.1.138 → 0.1.140

package/index.js

@@ -2,7 +2,6 @@ export { default as Renderer} from './src/renderer.jsx'
 import { normalPageConfigs } from './src/components/helper/resolver.js'
 import { commonPropsType } from './src/utils/index.js'
 
-
 const componentPropsType = Object.keys(commonPropsType).reduce((ret, key) => {
   ret[key] = {
     ...commonPropsType[key]

package/package.json

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

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

@@ -40,6 +40,7 @@ import { commonPropsType, cloneDeep, definePrivatelyProp } from '../../utils/ind
 import { TabPane } from '../tabs'
 import { h } from 'vue'
 import { useAttrs } from 'vue'
+import { normalRecoverCb } from '../../rules/rulesDriver.js'
 
 defineOptions({
   inheritAttrs: false
@@ -107,6 +108,7 @@ if (!OPEN_DATA_RULES) {
         if (rowCgs) {
           rowCgs.forEach(config => {
             config.rowIndex = idx
+            normalRecoverCb(config, idx)
           })
           return rowCgs
         } else {

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

@@ -1,11 +1,12 @@
   
-import { ElAutoResizer, ElPagination, ElTableV2, formContextKey } from 'element-plus'
+import { ElAutoResizer, ElPagination, ElRadio, ElTableV2, formContextKey } from 'element-plus'
 import ElTable, { ElTableColumn } from '../table'
 import Renderer from '../../renderer.jsx'
 import { computed, inject, watch, h, ref, reactive, onMounted, unref } 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, isArray, eleIsOverflow } from '../../utils/index.js'
 import { getCustomerTableProps, tableValidate } from '../helper/table'
 import { OPEN_TABLE_DEFAULT_PAGINATION } from '../../config'
+import { normalRecoverCb } from '../../rules/rulesDriver'
 // import '../styles/CustomComponenTable.scss'
 
 export default {
@@ -408,6 +409,7 @@ export default {
             if (columnsCgs) {
               columnsCgs.forEach(config => {
                 config.rowIndex = idx
+                normalRecoverCb(config, idx)
               })
               return columnsCgs
             } else {
@@ -494,7 +496,7 @@ export default {
         return []
       }
       // 进行统计的计算
-      const row = (tableData.value || []).reduce((total, row) => {
+      const row = (modelValue.value || []).reduce((total, row) => {
         normalTotalCodes.value.forEach(codeInfo => {
           const { code, totalFn } = codeInfo
           total[code] = totalFn(total[code], row[code], row)
@@ -661,6 +663,7 @@ export default {
       toopTip.triggerRef = null
     }
 
+    // 计算表头文字内容的宽度（百分比占位）
     function calcHeadContextWidth(config) {
       let jianPX = 0
       if (config.requiredFlag == '1') {
@@ -674,8 +677,33 @@ export default {
       }
       return '100%'
     }
+    // 计算表头容器内容的宽度（百分比占位）
+    function calcHeadWrapWidth(config, columnProps) {
+      let jianPX = 0
+      if (columnProps.sortable) {
+        jianPX += 24
+      }
+      if (jianPX) {
+        return `calc(100% - ${jianPX}px)`
+      }
+      return '100%'
+    }
 
-    function generateCellSolts(columnConfg, configIdx) {
+    function generateSingleSelectColumn() {
+      const hasSelectionCol = tableColumnConfigs.value?.some(config => config.type === 'selection' && config.displayType != DISPLAY_HIDDEN)
+      return hasSelectionCol ? null : (
+        <ElTableColumn width="50px" className="signle-select-wrap">
+          <span className="selected-radio">
+            <ElRadio modelValue="1" value="1"></ElRadio>
+          </span>
+          <span className="not-selected-radio">
+            <ElRadio modelValue="" value="1"></ElRadio>
+          </span>
+        </ElTableColumn>
+      )
+    }
+
+    function generateCellSolts(columnConfg, configIdx, columnProps) {
       let headerKey = 'header'
       let cellKey = 'default'
       if (isVirtualized.value) {
@@ -685,7 +713,7 @@ export default {
       return {
         [headerKey]: () => {
           let retVnode = (
-            <div className='head-span-new'>
+            <div className='head-span-new' style={{width: calcHeadWrapWidth(columnConfg, columnProps)}}>
               { columnConfg.requiredFlag == '1' ? <span style="color: rgb(245, 34, 45); margin-right: 3px;">*</span> : '' }
               <div className='head-span-text' style={{maxWidth: calcHeadContextWidth(columnConfg)}} onMouseenter={(e) => cellMouseEnenter(e)} onMouseleave={(e) => cellMouseout(e)}>
                 { columnConfg.headerRender ? columnConfg.headerRender(h, { props, config: columnConfg, lang, rootValue, selects })
@@ -800,11 +828,18 @@ export default {
           onSelectionChange={handleSelectionChange}
           onSortChange={onSortChange}
         >
+          {
+            selectable.value || tableProps.value?.highlightCurrentRow ? generateSingleSelectColumn() : null
+          }
           {
             tableColumnConfigs.value.map((columnConfg, configIdx) => {
-              return columnConfg.displayType == DISPLAY_HIDDEN ? null : (
-                <ElTableColumn key={columnConfg.requiredFlag + columnConfg.metaCode} {...getTableColumnProps(columnConfg, configIdx)}>
-                  {generateCellSolts(columnConfg, configIdx)}
+              if (columnConfg.displayType == DISPLAY_HIDDEN) {
+                return null
+              }
+              const propObj = getTableColumnProps(columnConfg, configIdx)
+              return (
+                <ElTableColumn key={columnConfg.requiredFlag + columnConfg.metaCode} {...propObj}>
+                  {generateCellSolts(columnConfg, configIdx, propObj)}
                 </ElTableColumn>
               )
             })

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

@@ -1,7 +1,7 @@
 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'
+import OptionsDefault from '../options/OptionsDefault.vue'
 
 export default {
   inheritAttrs: false,

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

@@ -97,7 +97,7 @@
       white-space: nowrap;
     }
     .head-span-new {
-      width: 100%;
+      display: inline-block;
       .head-span-text {
         display: inline-block;
         vertical-align:bottom;
@@ -220,6 +220,26 @@
     flex-grow: 1 !important;
   }
 
+
+  .signle-select-wrap {
+    .selected-radio {
+      display: none
+    }
+    .not-selected-radio {
+      display: block
+    }
+  }
+  .current-row {
+    .signle-select-wrap {
+      .selected-radio {
+        display: block
+      }
+      .not-selected-radio {
+        display: none
+      }
+    }
+  }
+
   @include hiddenColumn;
   
   .clear-index {

package/src/utils/render.jsx

@@ -1029,7 +1029,8 @@ function generateFormItemPc (config, lang, compProps, params,) {
   let isFormItem = false
   let props = {}
   let propsKeys
-  let slotName = 'default'
+  let formContentSlot = 'default'
+  let formLabelSlot = 'label'
   let formItemComp = resolveComponent('el-form-item')
   if (formItemComp) {
     isFormItem = true
@@ -1044,7 +1045,10 @@ function generateFormItemPc (config, lang, compProps, params,) {
   }
   if (isFormItem) {
     if (config.formItemSlot === 'label') {
-      slotName = 'label'
+      formContentSlot = 'label'
+    }
+    if (config.formItemLabelSlot === 'content' || config.formItemLabelSlot === 'default') {
+      formLabelSlot = 'default'
     }
     props = {
       ...props,
@@ -1098,9 +1102,11 @@ function generateFormItemPc (config, lang, compProps, params,) {
     const slots = {
       error: (info) => createFormLabelErrorTip(info, config, lang)
     }
-    slots[slotName] = () => node
-    if (isFormItem && slotName !== 'label') {
-      slots.label = () => createFormLable(config, lang)
+    slots[formContentSlot] = () => node
+    if (isFormItem) {
+      if (formContentSlot !== 'label' || formLabelSlot !== 'label') {
+        slots[formLabelSlot] = () => createFormLable(config, lang)
+      }
     }
 
     return (