resolver-egretimp-plus 0.1.139 → 0.1.141

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.139",
+  "version": "0.1.141",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

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

@@ -169,6 +169,13 @@ onMounted(() => {
 </script>
 
 <style lang="scss">
+.el-form-item.is-error {
+  .select-employees {
+    xm-select {
+      box-shadow: 0 0 0 1px var(--el-color-danger) inset;
+    }
+  }
+}
 .select-employees {
   position: relative;
   width: 100%;

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

@@ -496,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)

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/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 (