resolver-egretimp-plus 0.1.39 → 0.1.40

package/package.json

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

package/src/components/packages-H5/CustomComponentTabPaneH5.vue

@@ -9,9 +9,13 @@ const props = defineProps({
 const attrs = useAttrs()
 const tabProps = computed(() => {
   return {
-    label: lang.value.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
+    label: props?.config?.hidden == '1' ?
+      '' :
+      lang.value.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     name: props.config?.metaCode,
-    disabled: props.config?.editFlag == '0'
+    disabled: props?.config?.hidden == '1' ?
+      true :
+      props.config?.editFlag == '0'
   }
 })
 const modelValue = defineModel()
@@ -22,7 +26,7 @@ const pmPageMetaList = computed(() => {
 </script>
 
 <template>
-  <cmi-tab-content  v-bind="{...attrs, ...tabProps}" :style="props.config?.style">
+  <cmi-tab-content v-bind="{...attrs, ...tabProps}" :style="props.config?.style">
     <slot>
       <Renderer :config="pmPageMetaList" v-model="modelValue"></Renderer>
     </slot>

package/src/components/packages-H5/CustomComponentTabsH5.vue

@@ -19,26 +19,36 @@ const activeNames = computed({
   get() {
     const currentTab = tabpanes.value.find(tab => tab.defaultShowFlag == '1')
     const currentCycleTab = tabpanes.value.find(tab => tab.currentCode)
-    return (currentTab && currentTab.metaCode)
-      || (currentCycleTab && currentCycleTab.currentCode)
-      || (tabpanes.value[0] && (tabpanes.value[0].metaType === 'CustomComponentTabPaneH5' && tabpanes.value[0].metaCode) || (tabpanes.value[0].metaType === 'CustomComponentCycleTabPaneH5' && `${tabpanes.value[0].metaCode}-0`))
+    if (currentTab) {
+      return currentTab?.isCycle == '1' ? `${currentTab.metaCode}-0` : currentTab.metaCode
+    }
+    if (currentCycleTab) {
+      return currentCycleTab.currentCode
+    }
+    if (tabpanes.value[0]) {
+      if (assertMetaType(tabpanes.value[0], 'CustomComponentCycleTabPaneH5') || tabpanes.value[0]?.isCycle == '1') {
+        return `${tabpanes.value[0].metaCode}-0`
+      } else {
+        return tabpanes.value[0].metaCode
+      }
+    }
   },
   set(val) {
     tabpanes.value.forEach(tab => {
-      if (tab.metaType === 'CustomComponentTabPane') {
+      if (assertMetaType(tab, 'CustomComponentCycleTabPaneH5') || tab?.isCycle == '1') {
+        if (/^cycleTabpane-(\d+)$/.test(val)) {
+          tab.currentCode = val
+        } else {
+          tab.currentCode = ''
+        }
+      } else if (tab.metaType === 'CustomComponentTabPaneH5') {
         if (tab.metaCode === val) {
           tab.defaultShowFlag = '1'
         } else {
           tab.defaultShowFlag = '0'
         }
       }
-      if (tab.metaType === 'CustomComponentCycleTabPane') {
-        if (new RegExp(`^${tab.metaCode}-(\d+)$`).test(val)) {
-          tab.currentCode = val
-        } else {
-          tab.currentCode = ''
-        }
-      }
+      
     })
   }
 })
@@ -77,11 +87,14 @@ const customClass = computed(() => {
   }
 })
 
+function assertMetaType(config, metaType) {
+  return config.renderby === metaType || config.metaType === metaType
+}
 </script>
 
 <template>
   <cmi-tabs :class="customClass" v-bind="{...attrs, ...tabProps}">
-    <CustomComponentTabPaneH5 
+    <CustomComponentTabPaneH5
       v-for="tabpane in tabpanes" :config="tabpane" :key="tabpane.metaId"
     >
       <Renderer :config="tabpane?.pmPageMetaList || []" :additionConfigs="[tabpane]" :modelValue="getValue(tabpane.metaCode)" @update:modelValue="(val) => { onUpdateModelValue(val, tabpane.metaCode) }"></Renderer>

package/src/rules/parseCondition.js

@@ -229,7 +229,6 @@ export function parseCondition(rule) {
         formatRefVal = Number(refVal)
         formatTargetVal = Number(targetVal)
       }
-
       switch (condition.symbol) {
         case 1:
           return formatRefVal > formatTargetVal

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

@@ -87,4 +87,11 @@
     margin-bottom: var(--prmary-marign);
     margin-right: var(--prmary-marign);
   }
+
+  .polyfill-form-item_error {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 }

package/src/utils/render.jsx

@@ -710,7 +710,9 @@ function generateFormItemPc (config, lang, compProps, params,) {
       }
     }
     
-    const slots = {}
+    const slots = {
+      error: (info) => createFormLabelErrorTip(info, config, lang)
+    }
     slots[slotName] = () => node
     if (isFormItem && slotName !== 'label') {
       slots.label = () => createFormLable(config, lang)
@@ -987,6 +989,11 @@ function createFormLable(config, lang = 'zh') {
     </div>
   )
 }
+function createFormLabelErrorTip(info, config, lang='zh') {
+  return (
+    <span title={info.error} class="el-form-item__error polyfill-form-item_error">{info.error}</span>
+  )
+}
 
 export function getComponentPropsKeys(comp, config) {
   let propsKeys = []