resolver-egretimp-plus 0.0.283 → 0.0.285

package/package.json

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

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

@@ -229,7 +229,7 @@ export default {
     const normalColumnConfig = (config) => {
       return {
         ...config,
-        labelWidth: '0px'
+        labelHidden: '1'
       }
     }
 

package/src/utils/render.jsx

@@ -787,7 +787,7 @@ function getFormItemExtendProps(config, lang, params) {
     class: {
       [`vertical-${config['label-vertical'] || config['labelVertical'] || 'center'}`]: true,
       'content-right': config.contentRight,
-      'hidden-label': (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && !config.showLabel,
+      'hidden-label': (config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1') && config.showLabel != '1',
       [`label-position-${config['label-position'] || config['labelPosition'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
     style,
@@ -959,7 +959,7 @@ function normalLabelTipContent(content = '') {
 function createFormLable(config, lang = 'zh') {
   const ElTooltip = resolveComponent('el-tooltip')
   const elIcon = resolveComponent('el-icon')
-  const required = config.requiredFlag === '1'
+  const required = config.requiredFlag === '1' && config.hiddenRequiredFlag != '1'
   const slots = {}
   slots.default = () => {
     return <span class="label-tip"><elIcon size="17">
@@ -973,7 +973,7 @@ function createFormLable(config, lang = 'zh') {
     <div title={lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)} class="custom-label">
       <span class="custom-label-content" style={config.labelStyle} onClick={() => config.onLabelClick && config.onLabelClick?.(config)}>
         {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null}
-        <span>{lang.indexOf('zh') > -1 ? config.metaNameZh : config.metaNameEn}</span>
+        <span>{lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}</span>
       </span>
       {
         config.hintFlag == '1' ? (